diff options
| author | Christian Schaller <uraeus@gnome.org> | 2002-11-28 12:58:38 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2002-11-28 12:58:38 +0000 |
| commit | f4dbdcb51c410357fa87fbe3172693fb6beb4cf9 (patch) | |
| tree | 5efafca00c2d70289cbead0de2ae6c1f00ca9981 | |
| parent | 489731248b749290a8a85a8d46343b60c7482b61 (diff) | |
| download | gstreamer-plugins-bad-f4dbdcb51c410357fa87fbe3172693fb6beb4cf9.tar.gz | |
fix some disting and rpm building issues
Original commit message from CVS:
fix some disting and rpm building issues
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 8 |
4 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 030896980..bb63a3d71 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,6 +1074,7 @@ gst-libs/gst/video/Makefile examples/dynparams/Makefile examples/capsfilter/Makefile examples/seeking/Makefile +examples/indexing/Makefile examples/Makefile testsuite/autoplug/Makefile testsuite/spider/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index de3c7c439..6c582d9e5 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -11,4 +11,4 @@ GTK_SUBDIRS= endif SUBDIRS=$(GTK_SUBDIRS) -DIST_SUBDIRS=capsfilter dynparams seeking +DIST_SUBDIRS=capsfilter dynparams seeking indexing diff --git a/ext/Makefile.am b/ext/Makefile.am index bc3c15e19..d31f7fe61 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -244,6 +244,12 @@ else XMMS_DIR= endif +if USE_LIBPNG +SNAPSHOT_DIR=snapshot +else +SNAPSHOT_DIR= +endif + SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) \ @@ -256,7 +262,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ - $(VORBIS_DIR) $(XMMS_DIR) + $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) DIST_SUBDIRS=\ a52dec aalib alsa \ diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in index 6c10d5655..9ed4a3dbb 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.spec.in @@ -88,6 +88,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_includedir}/gst-plugins-%{version}/gst/media-info/media-info.h +rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info.so.0.0.0 %clean @@ -1119,6 +1121,7 @@ Plug-ins for playback of AVI format media files. Summary: GStreamer audio effects plug-in. Group: Libraries/Multimedia Requires: gstreamer-plugins = %{version} +@USE_LIBPNG_TRUE@Requires: libpng Obsoletes: gstreamer-misc %description -n gstreamer-audio-effects @@ -1149,6 +1152,7 @@ integer to float conversion, LAW conversion and level detection plug-ins. %{_libdir}/gst/libgstcutter.so %{_libdir}/gst/libgstfilter.so %{_libdir}/gst/libmixmatrix.so +@USE_LIBPNG_TRUE@%{_libdir}/gst/libgstpng.so %post -n gstreamer-audio-effects %{_bindir}/gst-register --gst-mask=0 > /dev/null 2> /dev/null @@ -1502,6 +1506,10 @@ This package contains a basic audio and video playback library. /sbin/ldconfig %changelog +* Thu Nov 28 2002 Christian Schaller <Uraeus@linuxrising.org> +- Put in libgstpng plugin +- rm the libgstmedia-info stuff until thomas think they are ready + * Fri Nov 01 2002 Thomas Vander Stichele <thomas at apestaart dot org> - don't use compprep until ABI issues can be fixed |