[gtk-osx] Give gstreamer-1.0 modules separate checkoutdirs



commit 656f5ad7f9643d8044fb3255a4d7f3d149728b66
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 5 23:22:16 2014 -0700

    Give gstreamer-1.0 modules separate checkoutdirs
    
    This is so that you can build both gstreamer 0.10 and 1.0 APIs in
    parallel.

 modulesets/gtk-osx-gstreamer.modules |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 949e92d..802287e 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -49,7 +49,7 @@
    <autotools id="gstreamer-1.0" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no"
             makeargs="ERROR_CFLAGS=" >
-    <branch module="gstreamer" revision="1.0">
+    <branch module="gstreamer" revision="1.0" checkoutdir="gstreamer-1.0">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gstreamer-fix-includes-in-gstdatetime.patch"; 
strip="1"/>
     </branch>
     <after>
@@ -73,7 +73,8 @@
   <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" revision="1.0"/>
+    <branch module="gst-plugins-base" revision="1.0"
+            checkoutdir="gst-plugins-base-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="liborc"/>
@@ -95,7 +96,8 @@
   <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" revision="1.0"/>
+    <branch module="gst-plugins-good" revision="1.0"
+            checkoutdir="gst-plugins-good-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="gst-plugins-base-1.0"/>
@@ -113,7 +115,8 @@
 
   <autotools id="gst-plugins-ugly-1.0" autogenargs="--disable-tests"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-ugly" revision="1.0"/>
+    <branch module="gst-plugins-ugly" revision="1.0"
+            checkoutdir="gst-plugins-ugly-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="gst-plugins-base-1.0"/>
@@ -132,7 +135,8 @@
 
   <autotools id="gst-plugins-bad-1.0" autogenargs="--disable-tests --disable-x --disable-xvid"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch module="gst-plugins-bad" revision="1.0"/>
+    <branch module="gst-plugins-bad" revision="1.0"
+            checkoutdir="gst-plugins-bad-1.0"/>
     <dependencies>
       <dep package="gstreamer-1.0"/>
       <dep package="gst-plugins-base-1.0"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]