diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | docs/Makefile.am | 6 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-alsa.xml | 7 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-audioresample.xml | 19 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-ffmpegcolorspace.xml | 19 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-ogg.xml | 7 | ||||
| -rw-r--r-- | docs/plugins/tmpl/element-gnomevfssink.sgml | 2 | ||||
| -rw-r--r-- | docs/plugins/tmpl/element-multifdsink.sgml | 2 | ||||
| -rw-r--r-- | docs/plugins/tmpl/element-tcpserversink.sgml | 2 | ||||
| -rw-r--r-- | docs/plugins/tmpl/element-vorbisenc.sgml | 2 | ||||
| -rw-r--r-- | gst-plugins-base.spec.in | 71 |
15 files changed, 120 insertions, 48 deletions
@@ -1,3 +1,21 @@ +2005-09-03 Thomas Vander Stichele <thomas at apestaart dot org> + + * Makefile.am: + * autogen.sh: + * common/gst-xmlinspect.py: + * configure.ac: + * docs/Makefile.am: + * docs/plugins/inspect/plugin-alsa.xml: + * docs/plugins/inspect/plugin-audioresample.xml: + * docs/plugins/inspect/plugin-ffmpegcolorspace.xml: + * docs/plugins/inspect/plugin-ogg.xml: + * docs/plugins/tmpl/element-gnomevfssink.sgml: + * docs/plugins/tmpl/element-multifdsink.sgml: + * docs/plugins/tmpl/element-tcpserversink.sgml: + * docs/plugins/tmpl/element-vorbisenc.sgml: + * gst-plugins-base.spec.in: + various doc-related updates + 2005-08-31 Wim Taymans <wim@fluendo.com> * gst-libs/gst/audio/gstbaseaudiosink.c: diff --git a/Makefile.am b/Makefile.am index 89de23c3..9276a189 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +DISTCHECK_CONFIGURE_OPTIONS = --enable-gtk-doc + if BUILD_EXTERNAL SUBDIRS_EXT = ext else @@ -25,7 +25,7 @@ then fi . common/gst-autogen.sh -CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG --enable-gtk-doc' +CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc' autogen_options $@ diff --git a/common b/common -Subproject 6fa4feccd5953a16dcf78f4c2bb3eca8040114b +Subproject ddbcaa275c5f41f19d5665f0c52de1f9edcb468 diff --git a/configure.ac b/configure.ac index e70b3eab..acd61052 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ dnl - library source changed -> increment REVISION dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 -dnl for 0.8.3 release, gst_play_get_all_by_interface was added, so update AS_LIBTOOL(GST_PLUGINS, 1, 0, 1) AS_LIBTOOL_TAGS([]) AM_PROG_LIBTOOL @@ -175,7 +174,6 @@ AC_ARG_WITH(pkg-config-path, AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]), [export PKG_CONFIG_PATH=${withval}]) -GST_DOC() dnl check architecture GST_ARCH() @@ -728,11 +726,12 @@ if test "x$USE_DEBUG" = xyes; then GST_CFLAGS="$GST_CFLAGS -g" fi -dnl ###################### -dnl # Checks for gtk-doc # -dnl ###################### +dnl ############################ +dnl # Checks for documentation # +dnl ############################ GTK_DOC_CHECK([1.3]) +AS_PATH_PYTHON([2.1]) dnl ############################# dnl # Set automake conditionals # diff --git a/docs/Makefile.am b/docs/Makefile.am index f28283ef..b8ec7177 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_GTK_DOC -GTK_DOC_DIRS = libs # plugins +GTK_DOC_DIRS = libs plugins else GTK_DOC_DIRS = endif @@ -11,5 +11,5 @@ EXTRA_DIST = \ upload.mak \ version.entities.in -#upload: -# @if test "x$(SUBDIRS_DOCS)" != x; then for a in $(SUBDIRS_DOCS); do cd $$a; make upload; cd ..; done; fi +upload: + @if test "x$(SUBDIRS_DOCS)" != x; then for a in $(SUBDIRS_DOCS); do cd $$a; make upload; cd ..; done; fi diff --git a/docs/plugins/inspect/plugin-alsa.xml b/docs/plugins/inspect/plugin-alsa.xml index 07ee9bb1..8989e788 100644 --- a/docs/plugins/inspect/plugin-alsa.xml +++ b/docs/plugins/inspect/plugin-alsa.xml @@ -9,6 +9,13 @@ <origin>http://gstreamer.freedesktop.org/</origin> <elements> <element> + <name>alsamixer</name> + <longname>Alsa Mixer</longname> + <class>Generic/Audio</class> + <description>Control sound input and output levels with ALSA</description> + <author>Leif Johnson <leif@ambient.2y.net></author> + </element> + <element> <name>alsasink</name> <longname>Audio Sink (ALSA)</longname> <class>Sink/Audio</class> diff --git a/docs/plugins/inspect/plugin-audioresample.xml b/docs/plugins/inspect/plugin-audioresample.xml new file mode 100644 index 00000000..51a7a126 --- /dev/null +++ b/docs/plugins/inspect/plugin-audioresample.xml @@ -0,0 +1,19 @@ +<plugin> + <name>audioresample</name> + <description>Resamples audio</description> + <filename>../../gst/audioresample/.libs/libgstaudioresample.so</filename> + <basename>libgstaudioresample.so</basename> + <version>0.9.1.1</version> + <license>LGPL</license> + <package>GStreamer CVS/prerelease</package> + <origin>http://gstreamer.freedesktop.org/</origin> + <elements> + <element> + <name>audioresample</name> + <longname>Audio scaler</longname> + <class>Filter/Converter/Audio</class> + <description>Resample audio</description> + <author>David Schleef <ds@schleef.org></author> + </element> + </elements> +</plugin>
\ No newline at end of file diff --git a/docs/plugins/inspect/plugin-ffmpegcolorspace.xml b/docs/plugins/inspect/plugin-ffmpegcolorspace.xml new file mode 100644 index 00000000..f81cad6d --- /dev/null +++ b/docs/plugins/inspect/plugin-ffmpegcolorspace.xml @@ -0,0 +1,19 @@ +<plugin> + <name>ffmpegcolorspace</name> + <description>colorspace conversion copied from FFMpeg</description> + <filename>../../gst/ffmpegcolorspace/.libs/libgstffmpegcolorspace.so</filename> + <basename>libgstffmpegcolorspace.so</basename> + <version>0.4.9-pre1</version> + <license>LGPL</license> + <package>FFMpeg</package> + <origin>http://ffmpeg.sourceforge.net/</origin> + <elements> + <element> + <name>ffmpegcolorspace</name> + <longname>FFMPEG Colorspace converter</longname> + <class>Filter/Converter/Video</class> + <description>Converts video from one colorspace to another</description> + <author>Ronald Bultje <rbultje@ronald.bitfreak.net></author> + </element> + </elements> +</plugin>
\ No newline at end of file diff --git a/docs/plugins/inspect/plugin-ogg.xml b/docs/plugins/inspect/plugin-ogg.xml index 41367418..f6fb7bd8 100644 --- a/docs/plugins/inspect/plugin-ogg.xml +++ b/docs/plugins/inspect/plugin-ogg.xml @@ -23,6 +23,13 @@ <author>Wim Taymans <wim@fluendo.com></author> </element> <element> + <name>oggparse</name> + <longname>ogg parser</longname> + <class>Codec/Parser</class> + <description>parse ogg streams into pages (info about ogg: http://xiph.org)</description> + <author>Michael Smith <msmith@fluendo.com></author> + </element> + <element> <name>ogmaudioparse</name> <longname>OGM audio stream parser</longname> <class>Codec/Decoder/Audio</class> diff --git a/docs/plugins/tmpl/element-gnomevfssink.sgml b/docs/plugins/tmpl/element-gnomevfssink.sgml index 26941209..480d4e4c 100644 --- a/docs/plugins/tmpl/element-gnomevfssink.sgml +++ b/docs/plugins/tmpl/element-gnomevfssink.sgml @@ -9,12 +9,12 @@ gnomevfssink <para> </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/plugins/tmpl/element-multifdsink.sgml b/docs/plugins/tmpl/element-multifdsink.sgml index 018a5bfd..6769cf1c 100644 --- a/docs/plugins/tmpl/element-multifdsink.sgml +++ b/docs/plugins/tmpl/element-multifdsink.sgml @@ -9,12 +9,12 @@ Send data to multiple filedescriptors <para> </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/plugins/tmpl/element-tcpserversink.sgml b/docs/plugins/tmpl/element-tcpserversink.sgml index 8a69a60c..a3434fc8 100644 --- a/docs/plugins/tmpl/element-tcpserversink.sgml +++ b/docs/plugins/tmpl/element-tcpserversink.sgml @@ -9,6 +9,8 @@ Send data as a server over the network via TCP <para> </para> + + <!-- ##### SECTION See_Also ##### --> <para> diff --git a/docs/plugins/tmpl/element-vorbisenc.sgml b/docs/plugins/tmpl/element-vorbisenc.sgml index dcca2a7f..0bfc0e66 100644 --- a/docs/plugins/tmpl/element-vorbisenc.sgml +++ b/docs/plugins/tmpl/element-vorbisenc.sgml @@ -9,12 +9,12 @@ Encodes audio in Vorbis format <para> </para> + <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/gst-plugins-base.spec.in b/gst-plugins-base.spec.in index 14970459..77f825d3 100644 --- a/gst-plugins-base.spec.in +++ b/gst-plugins-base.spec.in @@ -23,6 +23,7 @@ Requires(post): %{gstregister} Requires(postun): %{gstregister} BuildRequires: gcc-c++ +BuildRequires: gtk-doc >= 1.3 BuildRequires: XFree86-devel @USE_GNOME_VFS_TRUE@Requires: gnome-vfs2 > 1.9.4.00 @@ -46,8 +47,7 @@ plug-ins. %setup -q -n gst-plugins-base-%{version} %build %configure \ - --enable-debug \ - --enable-DEBUG + --enable-gtk-doc make %{?_smp_mflags} @@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgstnet-%{majorminor}.so.* %{_libdir}/libgstrtp-%{majorminor}.so.* -# non-core plugins without external dependencies +# base plugins without external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstadder.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioconvert.so %{_libdir}/gstreamer-%{majorminor}/libgstffmpegcolorspace.so @@ -111,13 +111,38 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so +# Here are packages not in the base plugins package but not dependant +# on an external lib + +### VIDEO 4 LINUX 2 ### +# @USE_GST_V4L2_TRUE@%package -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@Summary: GStreamer Video for Linux 2 plug-in +# @USE_GST_V4L2_TRUE@Group: Applications/Multimedia +# @USE_GST_V4L2_TRUE@Requires: gstreamer-plugins09 = %{version} +# @USE_GST_V4L2_TRUE@BuildRequires: glibc-devel +# @USE_GST_V4L2_TRUE@Obsoletes: gstreamer-v4l2 +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%description -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@Plug-in for accessing Video for Linux devices. +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%files -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%defattr(-, root, root) +# @USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%post -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%{register} +# @USE_GST_V4L2_TRUE@ +# @USE_GST_V4L2_TRUE@%postun -n gstreamer-plugins-v4l2 +# @USE_GST_V4L2_TRUE@%{register} + +# base plugins with dependencies +@USE_ALSA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstalsa.so @USE_THEORA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttheora.so @USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so @USE_VORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so @USE_VORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstogg.so @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstximage.so @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so - %package devel Summary: GStreamer Plugin Library Headers @@ -156,13 +181,13 @@ GStreamer Plugins Base library development and header files. %{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertpdepayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbuffer.h - -# plugin interface headers %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioclock.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosink.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosink.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstringbuffer.h %{_includedir}/gstreamer-%{majorminor}/gst/net/gstnetbuffer.h +%{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h + %{_libdir}/libgstaudio-%{majorminor}.so %{_libdir}/libgstaudiofilter-%{majorminor}.so %{_libdir}/libgstriff-%{majorminor}.so @@ -170,40 +195,14 @@ GStreamer Plugins Base library development and header files. %{_libdir}/libgstvideo-%{majorminor}.so %{_libdir}/libgstnet-%{majorminor}.so %{_libdir}/libgstrtp-%{majorminor}.so +%{_libdir}/libgstinterfaces-%{majorminor}.so - -# library headers -%{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h # pkg-config files %{_libdir}/pkgconfig/gstreamer-plugins-base-%{majorminor}.pc -# .so files -%{_libdir}/libgstinterfaces-%{majorminor}.so -@USE_ALSA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstalsa.so - -# Here are packages not in the base plugins package but not dependant -# on an external lib - -### VIDEO 4 LINUX 2 ### -# @USE_GST_V4L2_TRUE@%package -n gstreamer-plugins-v4l2 -# @USE_GST_V4L2_TRUE@Summary: GStreamer Video for Linux 2 plug-in -# @USE_GST_V4L2_TRUE@Group: Applications/Multimedia -# @USE_GST_V4L2_TRUE@Requires: gstreamer-plugins09 = %{version} -# @USE_GST_V4L2_TRUE@BuildRequires: glibc-devel -# @USE_GST_V4L2_TRUE@Obsoletes: gstreamer-v4l2 -# @USE_GST_V4L2_TRUE@ -# @USE_GST_V4L2_TRUE@%description -n gstreamer-plugins-v4l2 -# @USE_GST_V4L2_TRUE@Plug-in for accessing Video for Linux devices. -# @USE_GST_V4L2_TRUE@ -# @USE_GST_V4L2_TRUE@%files -n gstreamer-plugins-v4l2 -# @USE_GST_V4L2_TRUE@%defattr(-, root, root) -# @USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so -# @USE_GST_V4L2_TRUE@ -# @USE_GST_V4L2_TRUE@%post -n gstreamer-plugins-v4l2 -# @USE_GST_V4L2_TRUE@%{register} -# @USE_GST_V4L2_TRUE@ -# @USE_GST_V4L2_TRUE@%postun -n gstreamer-plugins-v4l2 -# @USE_GST_V4L2_TRUE@%{register} +# gtk-doc documentation +%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor} +%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog * Fri Sep 02 2005 Thomas Vander Stichele <thomas at apestaart dot org> |