[gtk-osx] Split unstable GStreamer into 0.10 & 1.0

[John Ralls <jralls src gnome org>]

commit af09c0e9b19ac29dd5e94e550b6e5f4ba6fb0156
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 5 23:30:58 2014 -0700

    Split unstable GStreamer into 0.10 & 1.0
    
    This moves all previous GStreamer modules in modulesets-unstable to the
    0.10 branch, and adds new 1.0 modules, and a new 1.0 metamodule, so that
    all the packages and metamodules refer to the same thing across the three
    module sets.

 modulesets-unstable/gtk-osx-gstreamer.modules |   92 +++++++++++++++++++++++--
 1 files changed, 85 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 6424927..168d896 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -22,6 +22,10 @@
     </branch>
   </autotools>
 
+  <autotools id="liborc">
+    <branch repo="gstreamer" module="orc"/>
+  </autotools>
+
   <autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
     <branch repo="sourceforge" version="2.7"
@@ -33,7 +37,17 @@
   <autotools id="gstreamer" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" >
-    <branch />
+    <branch revision="0.10"/>
+    <after>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+    </after>
+  </autotools>
+
+   <autotools id="gstreamer-1.0" autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no"
+             makeargs="ERROR_CFLAGS=">
+    <branch module="gstreamer" checkoutdir="gstreamer-1.0"/>
     <after>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -43,40 +57,70 @@
   <autotools id="gst-plugins-base" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvideo"
              makeargs="ERROR_CFLAGS=" >
-    <branch />
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <!--dep package="gtk+"/-->
       <dep package="liboil"/>
     </dependencies>
     <after>
     </after>
   </autotools>
 
+  <autotools id="gst-plugins-base-1.0" supports-non-srcdir-builds="no"
+             autogenargs="--disable-tests --disable-x --disable-xvideo"
+             makeargs="ERROR_CFLAGS=">
+    <branch module="gst-plugins-base" checkoutdir="gst-plugins-base-1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="liborc"/>
+    </dependencies>
+    <after>
+    </after>
+  </autotools>
+
   <autotools id="gst-plugins-good" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
              makeargs="ERROR_CFLAGS=" >
-    <branch />
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-good-1.0" supports-non-srcdir-builds="no"
+             autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
+             makeargs="ERROR_CFLAGS=">
+    <branch module="gst-plugins-good" checkoutdir="gst-plugins-good-1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" >
-    <branch />
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-ugly-1.0" autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=">
+    <branch module="gst-plugins-ugly" checkoutdir="gst-plugins-ugly-1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gst-plugins-bad" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvid"
     makeargs="ERROR_CFLAGS=" >
-    <branch />
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -84,15 +128,38 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gst-plugins-bad-1.0" supports-non-srcdir-builds="no"
+             autogenargs="--disable-tests --disable-x --disable-xvid"
+             makeargs="ERROR_CFLAGS=">
+    <branch module="gst-plugins-bad" checkoutdir="gst-plugins-bad-1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+      <dep package="faad2"/>
+    </dependencies>
+  </autotools>
+
+  <!-- gst-libav was named gst-ffmpeg before 1.0 -->
   <autotools id="gst-ffmpeg" autogenargs="--disable-tests --disable-mmx"
              supports-non-srcdir-builds="no" >
-    <branch />
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
+  <!-- disable-yasm: gst-libav's version of libav requires yasm 0.8.0 or nasm
+  2.0.3; OSX 10.9 has nasm 0.98.40 -->
+  <autotools id="gst-libav" supports-non-srcdir-builds="no"
+             autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
+    <branch module="gst-libav"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+    </dependencies>
+  </autotools>
+
   <metamodule id="meta-gstreamer">
     <dependencies>
       <dep package="gstreamer"/>
@@ -104,4 +171,15 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gstreamer-1.0">
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+      <dep package="gst-plugins-good-1.0"/>
+      <!--dep package="gst-plugins-ugly-1.0"/-->
+      <dep package="gst-plugins-bad-1.0"/>
+      <dep package="gst-libav"/>
+    </dependencies>
+  </metamodule>
+
 </moduleset>