[gnome-modulesets] gstreamer has been branched

[Javier JardÃn <jjardon src gnome org>]

commit f79cf802c60778b882ee52ac79ed4b058605159e
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Apr 12 18:51:47 2012 +0100

    gstreamer has been branched
    
    0.11/1 is planned for 3.6
    
    Keep 0.10 versions to easy the porting effort

 gnome-apps.modules             |   54 ++++++++++++++++++++--------------------
 gnome-suites-core-deps.modules |   50 +++++++++++++++++++++++++++++++++---
 gnome-suites-core.modules      |   22 ++++++++--------
 3 files changed, 83 insertions(+), 43 deletions(-)
---
diff --git a/gnome-apps.modules b/gnome-apps.modules
index 0584d16..3c874e5 100644
--- a/gnome-apps.modules
+++ b/gnome-apps.modules
@@ -133,8 +133,8 @@
       <dep package="gnome-panel"/>
       <dep package="libgtop"/>
       <dep package="libgnomekbd"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="gucharmap"/>
       <dep package="libgweather"/>
       <dep package="gdk-pixbuf"/>
@@ -253,11 +253,11 @@
     <dependencies>
       <dep package="libxml2"/>
       <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
     <suggests>
-      <dep package="gst-plugins-good"/>
+      <dep package="gst-plugins-good-0.10"/>
     </suggests>
  </autotools>
 
@@ -553,9 +553,9 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gconf"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="mono"/>
       <dep package="gtk-sharp"/>
       <dep package="taglib-sharp"/>
@@ -596,7 +596,7 @@
     <dependencies>
       <dep package="clutter"/>
       <dep package="glib"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="gtk+"/>
       <dep package="libgnome-keyring"/>
       <dep package="librsvg"/>
@@ -646,8 +646,8 @@
       <dep package="gconf"/>
       <dep package="libcanberra"/>
       <dep package="libxml2"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libgnome-media-profiles"/>
     </dependencies>
   </autotools>
@@ -711,15 +711,15 @@
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gconf"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
   </autotools>
 
   <autotools id="monkey-bubble">
     <branch/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libxml2"/>
       <dep package="gconf"/>
       <dep package="librsvg"/>
@@ -782,7 +782,7 @@
       <dep package="gupnp"/>
       <dep package="gupnp-av"/>
       <dep package="gupnp-dlna"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="libgee-0.6"/>
     </dependencies>
   </autotools>
@@ -849,9 +849,9 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="gudev"/>
       <dep package="clutter-gst" />
       <dep package="clutter-gtk"/>
@@ -886,8 +886,8 @@
       <dep package="dbus-glib"/>
       <dep package="avahi"/>
       <dep package="libsoup"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </suggests>
   </autotools>
 
@@ -900,7 +900,7 @@
       <dep package="gnome-doc-utils"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-online-accounts"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="gtk+"/>
       <dep package="gtkhtml"/>
       <dep package="intltool"/>
@@ -1049,7 +1049,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gudev"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libgnome-media-profiles"/>
       <dep package="totem-pl-parser"/>
       <dep package="gnome-doc-utils"/>
@@ -1089,8 +1089,8 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="gudev"/>
       <dep package="libgee-0.6"/>
       <dep package="libsoup"/>
@@ -1109,9 +1109,9 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="libgnome-media-profiles"/>
       <dep package="brasero"/>
       <dep package="libmusicbrainz"/>
diff --git a/gnome-suites-core-deps.modules b/gnome-suites-core-deps.modules
index d92c38e..b29b6f9 100644
--- a/gnome-suites-core-deps.modules
+++ b/gnome-suites-core-deps.modules
@@ -287,8 +287,8 @@
     <branch/>
     <dependencies>
       <dep package="clutter"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
@@ -362,7 +362,7 @@
   <autotools id="gnome-video-effects">
     <branch/>
     <dependencies>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
     </dependencies>
   </autotools>
 
@@ -404,6 +404,46 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gstreamer-0.10" autogenargs="-- --disable-tests" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gstreamer"
+            revision="0.10"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-gnome_vfs" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-base"
+            revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gtk+"/>
+      <dep package="liboil"/>
+    </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-good-0.10" autogenargs="--with-gtk=3.0 --disable-tests --disable-examples" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS= ERROR_CXXFLAGS=" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-good"
+            revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gstreamer" autogenargs="-- --disable-tests" makeargs="GLIB_EXTRA_CFLAGS=-UG_DISABLE_DEPRECATED ERROR_CFLAGS=" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
     <dependencies>
@@ -853,7 +893,7 @@
     </dependencies>
     <suggests>
       <dep package="libgnome-keyring"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="nautilus"/>
       <dep package="NetworkManager"/>
       <dep package="evolution"/>
@@ -873,7 +913,7 @@
   </autotools>
 
   <autotools id="WebKit" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --enable-webkit2">
+             autogenargs="--enable-introspection --enable-webkit2 --with-gstreamer=0.11">
     <pkg-config>webkitgtk-3.0.pc</pkg-config>
     <branch repo="webkitgtk.org"
             module="webkit-1.8.0.tar.xz"
diff --git a/gnome-suites-core.modules b/gnome-suites-core.modules
index e93149c..bf81b24 100644
--- a/gnome-suites-core.modules
+++ b/gnome-suites-core.modules
@@ -146,7 +146,7 @@
     <suggests>
       <!-- <dep package="cups"/> -->
       <dep package="accountsservice"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="NetworkManager"/>
     </suggests>
   </autotools>
@@ -299,7 +299,7 @@
     </dependencies>
     <suggests>
       <!-- <dep package="cups"/> -->
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
     </suggests>
   </autotools>
 
@@ -335,8 +335,8 @@
       <dep package="gcr"/>
     </dependencies>
     <suggests>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
     </suggests>
     <after>
       <dep package="librsvg"/>
@@ -525,7 +525,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gtk+"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
       <dep package="libxml2"/>
@@ -554,7 +554,7 @@
       <dep package="gnome-online-accounts"/>
       <dep package="gnutls"/>
       <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-0.10"/>
       <dep package="gtk+"/>
       <dep package="libcanberra"/>
       <dep package="libsoup"/>
@@ -791,8 +791,8 @@
       <dep package="clutter-gst"/>
       <dep package="gtksourceview"/>
       <dep package="WebKit"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
@@ -802,9 +802,9 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="gstreamer-0.10"/>
+      <dep package="gst-plugins-base-0.10"/>
+      <dep package="gst-plugins-good-0.10"/>
       <dep package="iso-codes"/>
       <dep package="totem-pl-parser"/>
       <dep package="libpeas"/>