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-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index 97ce306..d884dbc 100644 (file)
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -191,12 +191,15 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
     GST_PLAY_MAKE_OR_ERROR (identity, "identity", "identity", error);
     g_hash_table_insert (play->priv->elements, "identity", identity);
 
-    identity_cs = gst_element_factory_make ("ffcolorspace", "identity_cs");
+    identity_cs = gst_element_factory_make ("ffmpegcolorspace", "identity_cs");
     if (!GST_IS_ELEMENT (identity_cs)) {
-      identity_cs = gst_element_factory_make ("colorspace", "identity_cs");
+      identity_cs = gst_element_factory_make ("ffcolorspace", "identity_cs");
       if (!GST_IS_ELEMENT (identity_cs)) {
-       gst_play_error_plugin ("colorspace", error);
-       return FALSE;
+       identity_cs = gst_element_factory_make ("colorspace", "identity_cs");
+       if (!GST_IS_ELEMENT (identity_cs)) {
+         gst_play_error_plugin ("colorspace", error);
+         return FALSE;
+       }
       }
     }
     g_hash_table_insert (play->priv->elements, "identity_cs", identity_cs);
@@ -224,12 +227,15 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
     g_hash_table_insert (play->priv->elements, "vis_element", vis_element);
 
     /* Colorspace conversion */
-    vis_cs = gst_element_factory_make ("ffcolorspace", "vis_cs");
+    vis_cs = gst_element_factory_make ("ffmpegcolorspace", "vis_cs");
     if (!GST_IS_ELEMENT (vis_cs)) {
-      vis_cs = gst_element_factory_make ("colorspace", "vis_cs");
+      vis_cs = gst_element_factory_make ("ffcolorspace", "vis_cs");
       if (!GST_IS_ELEMENT (vis_cs)) {
-       gst_play_error_plugin ("colorspace", error);
-       return FALSE;
+       vis_cs = gst_element_factory_make ("colorspace", "vis_cs");
+       if (!GST_IS_ELEMENT (vis_cs)) {
+         gst_play_error_plugin ("colorspace", error);
+         return FALSE;
+       }
       }
     }
 
@@ -256,12 +262,15 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
     g_hash_table_insert (play->priv->elements, "video_switch", video_switch);
 
     /* Colorspace conversion */
-    video_cs = gst_element_factory_make ("ffcolorspace", "video_cs");
+    video_cs = gst_element_factory_make ("ffmpegcolorspace", "video_cs");
     if (!GST_IS_ELEMENT (video_cs)) {
-      video_cs = gst_element_factory_make ("colorspace", "video_cs");
+      video_cs = gst_element_factory_make ("ffcolorspace", "video_cs");
       if (!GST_IS_ELEMENT (video_cs)) {
-       gst_play_error_plugin ("colorspace", error);
-       return FALSE;
+       video_cs = gst_element_factory_make ("colorspace", "video_cs");
+       if (!GST_IS_ELEMENT (video_cs)) {
+         gst_play_error_plugin ("colorspace", error);
+         return FALSE;
+       }
       }
     }
     g_hash_table_insert (play->priv->elements, "video_cs", video_cs);
@@ -272,12 +281,15 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
     g_hash_table_insert (play->priv->elements, "video_balance", video_balance);
 
     /* Colorspace conversion */
-    balance_cs = gst_element_factory_make ("ffcolorspace", "balance_cs");
+    balance_cs = gst_element_factory_make ("ffmpegcolorspace", "balance_cs");
     if (!GST_IS_ELEMENT (balance_cs)) {
-      balance_cs = gst_element_factory_make ("colorspace", "balance_cs");
+      balance_cs = gst_element_factory_make ("ffcolorspace", "balance_cs");
       if (!GST_IS_ELEMENT (balance_cs)) {
-       gst_play_error_plugin ("colorspace", error);
-       return FALSE;
+       balance_cs = gst_element_factory_make ("colorspace", "balance_cs");
+       if (!GST_IS_ELEMENT (balance_cs)) {
+         gst_play_error_plugin ("colorspace", error);
+         return FALSE;
+       }
       }
     }
     g_hash_table_insert (play->priv->elements, "balance_cs", balance_cs);

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
 

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index cad9e26..bd93f27 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -7,36 +7,38 @@ GCONF_PC_UNINSTALLED=
 endif
 
 ### all of the standard pc files we need to generate
-pcfiles =  \
+pcverfiles =  \
        $(GCONF_PC) \
+       gstreamer-interfaces-@GST_MAJORMINOR@.pc \
        gstreamer-libs-@GST_MAJORMINOR@.pc \
-       gstreamer-play-@GST_MAJORMINOR@.pc \
-       gstreamer-interfaces-@GST_MAJORMINOR@.pc
-pcfiles_uninstalled = \
+       gstreamer-media-info-@GST_MAJORMINOR@.pc \
+       gstreamer-play-@GST_MAJORMINOR@.pc
+pcverfiles_uninstalled = \
        $(GCONF_PC_UNINSTALLED) \
+       gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc \
        gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
-       gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc \
-       gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-media-info-@GST_MAJORMINOR@-uninstalled.pc \
+       gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
 
-pcfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
-all-local: $(pcfiles) $(pcfiles_uninstalled)
+pcverfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
+all-local: $(pcverfiles) $(pcverfiles_uninstalled)
 
-### how to generate pc files from .pc files in this dir
-$(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc
+### how to generate versioned .pc files from .pc files in this dir
+$(pcverfiles): %-@GST_MAJORMINOR@.pc: %.pc
        cp $< $@
-$(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+$(pcverfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
        cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-       $(GCONF_PC) \
-       gstreamer-libs-@GST_MAJORMINOR@.pc \
-       gstreamer-play-@GST_MAJORMINOR@.pc \
-       gstreamer-interfaces-@GST_MAJORMINOR@.pc
+pkgconfig_DATA = $(pcverfiles)
 
-CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)
-EXTRA_DIST= \
+CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled)
+pcinfiles = \
            gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in \
            gstreamer-interfaces.pc.in gstreamer-interfaces-uninstalled.pc.in \
            gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
+           gstreamer-media-info.pc.in gstreamer-media-info-uninstalled.pc.in \
            gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in
+
+DISTCLEANFILES = $(pcinfiles:.in=)
+EXTRA_DIST = $(pcinfiles)

diff --git a/pkgconfig/gstreamer-media-info-uninstalled.pc.in b/pkgconfig/gstreamer-media-info-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..3cdd941
--- /dev/null
+++ b/pkgconfig/gstreamer-media-info-uninstalled.pc.in
@@ -0,0 +1,12 @@
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/../gst-libs/gst/media-info
+includedir=${pcfiledir}/../gst-libs
+
+Name: GStreamer Media Info Library, uninstalled
+Description: Streaming-media framework, media info libraries, not installed
+Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Version: @VERSION@
+
+Libs: ${libdir}/libgstmedia-info-@GST_MAJORMINOR@.la
+Cflags: -I${includedir}

diff --git a/pkgconfig/gstreamer-media-info.pc.in b/pkgconfig/gstreamer-media-info.pc.in
new file mode 100644 (file)
index 0000000..bbcfada
--- /dev/null
+++ b/pkgconfig/gstreamer-media-info.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+
+Name: GStreamer Media Info Library
+Description: Streaming-media framework, media info libraries
+Requires: gstreamer-@GST_MAJORMINOR@
+
+Libs: -L${libdir} -lgstmedia-info-@GST_MAJORMINOR@
+Cflags: -I${includedir}