adding media info pc files package them use ffmpegcolorspace in gstplay

Original commit message from CVS:
adding media info pc files
package them
use ffmpegcolorspace in gstplay

diff --git a/ChangeLog b/ChangeLog
index 4254c89..7f1b9d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst-libs/gst/play/play.c: (gst_play_pipeline_setup):
+          use the new ffmpegcolorspace
+       * gst-plugins.spec.in:
+          package new colorspace and media-info
+       * configure.ac:
+       * pkgconfig/Makefile.am:
+          fix some more disting issues
+       * pkgconfig/gstreamer-media-info-uninstalled.pc.in:
+       * pkgconfig/gstreamer-media-info.pc.in:
+          generate media-info pc files
+
 2004-03-15  Johan Dahlin  <johan@gnome.org>
        
        * *.h: Revert indenting

diff --git a/configure.ac b/configure.ac
index c4f7b93..fc8b285 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1578,14 +1578,6 @@ dnl #########################
 
 AC_CONFIG_FILES(
 Makefile
-pkgconfig/gstreamer-gconf.pc
-pkgconfig/gstreamer-gconf-uninstalled.pc
-pkgconfig/gstreamer-interfaces.pc
-pkgconfig/gstreamer-interfaces-uninstalled.pc
-pkgconfig/gstreamer-libs.pc
-pkgconfig/gstreamer-libs-uninstalled.pc
-pkgconfig/gstreamer-play.pc
-pkgconfig/gstreamer-play-uninstalled.pc
 gst-plugins.spec
 gst/Makefile
 gst/ac3parse/Makefile
@@ -1754,6 +1746,16 @@ tools/Makefile
 gconf/Makefile
 gconf/gstreamer.schemas
 pkgconfig/Makefile
+pkgconfig/gstreamer-gconf.pc
+pkgconfig/gstreamer-gconf-uninstalled.pc
+pkgconfig/gstreamer-interfaces.pc
+pkgconfig/gstreamer-interfaces-uninstalled.pc
+pkgconfig/gstreamer-libs.pc
+pkgconfig/gstreamer-libs-uninstalled.pc
+pkgconfig/gstreamer-media-info.pc
+pkgconfig/gstreamer-media-info-uninstalled.pc
+pkgconfig/gstreamer-play.pc
+pkgconfig/gstreamer-play-uninstalled.pc
 po/Makefile.in
 )
 AC_OUTPUT

diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index cd2fa57..6c6843c 100644 (file)
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -100,8 +100,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
 
 %clean
@@ -151,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstefence.so
 %{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
+%{_libdir}/gstreamer-%{majorminor}/libgstffmpegcolorspace.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfilter.so
 %{_libdir}/gstreamer-%{majorminor}/libgstflxdec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgamma.so
@@ -285,16 +284,19 @@ GStreamer support libraries header files.
 %{_includedir}/gstreamer-%{majorminor}/gst/xwindowlistener/xwindowlistener.h
 # library headers
 @USE_GCONF_TRUE@%{_includedir}/gstreamer-%{majorminor}/gst/gconf/gconf.h
+%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h
 %{_includedir}/gstreamer-%{majorminor}/gst/play/play.h
 %{_includedir}/gstreamer-%{majorminor}/gst/play/play-enumtypes.h
 %{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h
 # pkg-config files
+@USE_GCONF_TRUE@%{_libdir}/pkgconfig/gstreamer-gconf-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-media-info-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
-%{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc
-@USE_GCONF_TRUE@%{_libdir}/pkgconfig/gstreamer-gconf-%{majorminor}.pc
 # .so files
 @USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so
+%{_libdir}/libgstmedia-info-%{majorminor}.so
 %{_libdir}/libgstplay-%{majorminor}.so
 
 # Here are packages not in the base plugins package but not dependant
@@ -805,6 +807,10 @@ GStreamer support libraries header files.
 
 
 %changelog
+* Mon Mar 15 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- put back media-info
+- add ffmpegcolorspace plugin
+
 * Tue Mar 02 2004 Thomas Vander Stichele <thomas at apestaart dot org>
 - Libraries/Multimedia doesn't exist, remove it