[jhbuild] world-3.6: Update GStreamer 1.0 components dependencies

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

commit aafa7808d5f5b4d40aef8c27d441c21ec64272a3
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Jul 1 01:49:57 2012 +0900

    world-3.6: Update GStreamer 1.0 components dependencies

 modulesets/gnome-world-3.6.modules |   37 +++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-world-3.6.modules b/modulesets/gnome-world-3.6.modules
index 0930238..b165144 100644
--- a/modulesets/gnome-world-3.6.modules
+++ b/modulesets/gnome-world-3.6.modules
@@ -383,16 +383,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-bad-master"
-             autogenargs="-- --disable-tests"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org" module="gst-plugins-bad"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gst-plugins-gl" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gst-plugins-gl"/>
     <dependencies>
@@ -2252,7 +2242,7 @@
   <autotools id="gst-plugins-base-master" 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"/>
     <dependencies>
-      <dep package="gstreamer"/>
+      <dep package="gstreamer-master"/>
       <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
@@ -2264,8 +2254,8 @@
   <autotools id="gst-plugins-good-master" 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"/>
     <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
     </dependencies>
     <suggests>
       <dep package="pulseaudio"/>
@@ -2274,4 +2264,25 @@
     </suggests>
   </autotools>
 
+  <autotools id="gst-plugins-ugly-master"
+             autogenargs="--disable-tests" supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-ugly"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-bad-master"
+             autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-bad"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>