[jhbuild] 3.6: Move gstreamer 1.0 modules to core-deps

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

commit 480615853d83fa37306ce8aae579d833cb445e8c
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Jul 16 03:34:33 2012 +0900

    3.6: Move gstreamer 1.0 modules to core-deps
    
    As some modules have been started to depend on them

 modulesets/gnome-suites-core-deps-3.6.modules |   68 +++++++++++++++++++++++++
 modulesets/gnome-world-3.6.modules            |   58 ---------------------
 2 files changed, 68 insertions(+), 58 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 0593845..372c069 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -445,6 +445,74 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gstreamer-master"
+             autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gstreamer"
+            checkoutdir="gstreamer-master"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-base-master"
+             autogenargs="--with-gtk=3.0 --disable-gnome_vfs"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-base"
+            checkoutdir="gst-plugins-base-master"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gtk+"/>
+      <dep package="liboil"/>
+    </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-good-master"
+             autogenargs="--with-gtk=3.0"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            module="gst-plugins-good"
+            checkoutdir="gst-plugins-good-master"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
+    </dependencies>
+    <suggests>
+      <dep package="pulseaudio"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gst-plugins-ugly-master"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-ugly-master"
+            module="gst-plugins-ugly"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-bad-master"
+             supports-non-srcdir-builds="no">
+    <branch repo="gstreamer.freedesktop.org"
+            checkoutdir="gst-plugins-bad-master"
+            module="gst-plugins-bad"/>
+    <dependencies>
+      <dep package="gstreamer-master"/>
+      <dep package="gst-plugins-base-master"/>
+    </dependencies>
+  </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" revision="0.10"/>
     <dependencies>
diff --git a/modulesets/gnome-world-3.6.modules b/modulesets/gnome-world-3.6.modules
index 2aa9787..0e317cd 100644
--- a/modulesets/gnome-world-3.6.modules
+++ b/modulesets/gnome-world-3.6.modules
@@ -2252,53 +2252,6 @@
     </dependencies>
   </autotools>
 
-
-  <autotools id="gstreamer-master"
-             autogenargs="--disable-tests"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gstreamer"
-            checkoutdir="gstreamer-master"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gst-plugins-base-master"
-             autogenargs="--with-gtk=3.0 --disable-gnome_vfs"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-base"
-            checkoutdir="gst-plugins-base-master"/>
-    <dependencies>
-      <dep package="gstreamer-master"/>
-      <dep package="gtk+"/>
-      <dep package="liboil"/>
-    </dependencies>
-    <suggests>
-      <dep package="gudev"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gst-plugins-good-master"
-             autogenargs="--with-gtk=3.0"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-good"
-            checkoutdir="gst-plugins-good-master"/>
-    <dependencies>
-      <dep package="gstreamer-master"/>
-      <dep package="gst-plugins-base-master"/>
-    </dependencies>
-    <suggests>
-      <dep package="pulseaudio"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gudev"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gst-plugins-ugly-master"
              supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
@@ -2310,15 +2263,4 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-bad-master"
-             supports-non-srcdir-builds="no">
-    <branch repo="gstreamer.freedesktop.org"
-            checkoutdir="gst-plugins-bad-master"
-            module="gst-plugins-bad"/>
-    <dependencies>
-      <dep package="gstreamer-master"/>
-      <dep package="gst-plugins-base-master"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>