[jhbuild/5101cb1c609b4077654b68d453d979acf3159958: 2/3] Revert "core-deps-3.26: build gstreamer and plugins with meson"



commit ef3f8fc42ca16ba54b25f60c526a0137f8e226f5
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Mar 27 15:47:21 2017 +0200

    Revert "core-deps-3.26: build gstreamer and plugins with meson"
    
    This reverts commit a18b6909c0cadd310c56bf1872445b150b684184.

 modulesets/gnome-suites-core-deps-3.26.modules |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 9e535d3..952e0e8 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -698,7 +698,9 @@
     </suggests>
   </autotools>
 
-  <meson id="gstreamer">
+  <autotools id="gstreamer"
+         autogenargs="--disable-tests --disable-fatal-warnings"
+         supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gstreamer"
             checkoutdir="gstreamer"/>
@@ -707,7 +709,7 @@
       <dep package="libxml2"/>
       <dep package="gobject-introspection"/>
     </dependencies>
-  </meson>
+  </autotools>
 
   <meson id="graphene">
     <branch repo="github.com" checkoutdir="graphene" module="ebassi/graphene.git"/>
@@ -717,7 +719,9 @@
     </dependencies>
   </meson>
 
-  <meson id="gst-plugins-bad">
+  <autotools id="gst-plugins-bad"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             checkoutdir="gst-plugins-bad"
             module="gst-plugins-bad"/>
@@ -728,9 +732,11 @@
     <suggests>
       <dep package="graphene"/>
     </suggests>
-  </meson>
+  </autotools>
 
-  <meson id="gst-plugins-base">
+  <autotools id="gst-plugins-base"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-base"
             checkoutdir="gst-plugins-base"/>
@@ -744,9 +750,11 @@
         <dep package="gudev"/>
       </if>
     </suggests>
-  </meson>
+  </autotools>
 
-  <meson id="gst-plugins-good">
+  <autotools id="gst-plugins-good"
+             autogenargs="--disable-fatal-warnings"
+             supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org"
             module="gst-plugins-good"
             checkoutdir="gst-plugins-good"/>
@@ -768,7 +776,7 @@
         <dep package="gudev"/>
       </if>
     </suggests>
-  </meson>
+  </autotools>
 
   <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
     <if condition-set="x11">


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