summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2005-05-13 13:52:03 +0000
committerChristian Schaller <uraeus@gnome.org>2005-05-13 13:52:03 +0000
commitb807f1ff30a8f14b7ee3db309c749be306b6c126 (patch)
treed307e296bb713e06eeb433a8f7e0cbd223e34c4f
parentf79a89bda29101d79de54913390135c12b6ab485 (diff)
downloadgst-plugins-bad-b807f1ff30a8f14b7ee3db309c749be306b6c126.tar.gz
gst-plugins-bad-b807f1ff30a8f14b7ee3db309c749be306b6c126.tar.bz2
gst-plugins-bad-b807f1ff30a8f14b7ee3db309c749be306b6c126.zip
add rtsp and esd files to spec and fix some disting issues
Original commit message from CVS: add rtsp and esd files to spec and fix some disting issues
-rw-r--r--ChangeLog8
-rw-r--r--ext/Makefile.am13
-rw-r--r--gst-plugins.spec.in31
3 files changed, 33 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 103b4c15..6df95b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-13 Christian Schaller <uraeus@gnome.org>
+
+ * ext/Makefile.am: dist esd directory
+ * gst-plugins.spec.in: add rtp plugins and esd plugin
+ * gst/effectv/Makefile.am: fix videofilter linking
+ * gst/rtp/Makefile.am: add missing headers
+ * gst/rtsp/Makefile.am: add missing headers
+
2005-05-12 Wim Taymans <wim@fluendo.com>
* configure.ac:
diff --git a/ext/Makefile.am b/ext/Makefile.am
index aaffd83b..57be128a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -226,11 +226,11 @@ endif
# LIBMMS_DIR=
# endif
-if USE_MAD
-MAD_DIR=mad
-else
-MAD_DIR=
-endif
+# if USE_MAD
+# MAD_DIR=mad
+# else
+# MAD_DIR=
+# endif
# if USE_MIKMOD
# MIKMOD_DIR=mikmod
@@ -447,4 +447,5 @@ DIST_SUBDIRS=\
shout2 \
sidplay \
aalib \
- libcaca
+ libcaca \
+ esd
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index a005db39..87f4e357 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -40,12 +40,12 @@ BuildRequires: XFree86-devel
# @USE_AUDIOFILE_TRUE@BuildRequires: audiofile-devel >= 0.2.1
# @USE_CDPARANOIA_TRUE@Requires: cdparanoia-libs >= alpha9.7
# @USE_CDPARANOIA_TRUE@BuildRequires: cdparanoia-devel >= alpha9.7
-# @USE_ESD_TRUE@Requires: esound >= 0.2.8
-# @USE_ESD_TRUE@BuildRequires: esound-devel >= 0.2.8
-# @USE_ESD_TRUE@Obsoletes: gstreamer-esd
-# @USE_ESD_TRUE@
-# @USE_ESD_TRUE@Provides: gstreamer-audiosrc
-# @USE_ESD_TRUE@Provides: gstreamer-audiosink
+@USE_ESD_TRUE@Requires: esound >= 0.2.8
+@USE_ESD_TRUE@BuildRequires: esound-devel >= 0.2.8
+@USE_ESD_TRUE@Obsoletes: gstreamer-esd
+@USE_ESD_TRUE@
+@USE_ESD_TRUE@Provides: gstreamer-audiosrc
+@USE_ESD_TRUE@Provides: gstreamer-audiosink
# @USE_FLAC_TRUE@Requires: flac >= 1.0.3
# @USE_FLAC_TRUE@BuildRequires: flac-devel >= 1.0.3
# @USE_GCONF_TRUE@Requires: GConf2
@@ -125,15 +125,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstalaw.so
%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
%{_libdir}/gstreamer-%{majorminor}/libgstmulaw.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideofilter.so
%{_libdir}/gstreamer-%{majorminor}/libgstsmpte.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtsp.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttcp.so
+%{_libdir}/gstreamer-%{majorminor}/libgstudp.so
# gstreamer-plugins with external dependencies but in the main package
# @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so
# @USE_ARTSC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstartsdsink.so
# @USE_AUDIOFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaudiofile.so
# @USE_CDPARANOIA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so
-# @USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesd.so
+@USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesd.so
# @USE_POLYP_TRUE@%{_libdir}/gstreamer-%{majorminor}/libpolypaudio.so
# @USE_FLAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
# @USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so
@@ -153,12 +156,14 @@ rm -rf $RPM_BUILD_ROOT
# @USE_PANGO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttextoverlay.so
# @USE_PANGO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttimeoverlay.so
# @USE_SPEEX_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstspeex.so
-# @USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
+@USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
# @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so
# @USE_XVIDEO_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so
# @USE_SNDFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
# @USE_MUSICBRAINZ_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
+## Libraries
+%{_libdir}/libgstvideofilter-%{majorminor}.*
%post
# @USE_GCONF_TRUE@export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -208,8 +213,8 @@ Group: Applications/Multimedia
# @USE_FAAD_TRUE@BuildRequires: faad2-devel >= 2.0
# @USE_GSM_TRUE@BuildRequires: gsm-devel >= 1.0.10
# @USE_LAME_TRUE@BuildRequires: lame-devel >= 3.89
-@USE_MAD_TRUE@BuildRequires: libid3tag-devel >= 0.15.0
-@USE_MAD_TRUE@BuildRequires: libmad-devel >= 0.15.0
+# @USE_MAD_TRUE@BuildRequires: libid3tag-devel >= 0.15.0
+# @USE_MAD_TRUE@BuildRequires: libmad-devel >= 0.15.0
Requires: gstreamer09-plugins >= %{gstp_minver}
Requires(pre): %{_bindir}/gst-register-%{majorminor}
@@ -237,7 +242,7 @@ This package contains extra audio plugins for GStreamer, including
# @USE_FAAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
# @USE_GSM_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
# @USE_LAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlame.so
-@USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
+# @USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
%package extra-dvd
Summary: DVD plugins for GStreamer
@@ -299,7 +304,7 @@ This package contains additional video plugins for GStreamer, including
@USE_AALIB_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
# @USE_LIBDV_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdvdec.so
# @USE_DV1394_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
-# @USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
+@USE_LIBCACA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
# @USE_DIRAC_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
# @USE_OPENGL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstglimagesink.so