[jhbuild] core-deps: Switch gst-libav to meson and drop duplicate in world



commit 17a61e6286a55306fb689b2a4297fc45ac511251
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Oct 16 16:02:13 2019 +0200

    core-deps: Switch gst-libav to meson and drop duplicate in world

 modulesets/gnome-suites-core-deps-latest.modules |  4 ++--
 modulesets/gnome-world.modules                   | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index fa819a08..81eb7e61 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -863,7 +863,7 @@
     </suggests>
   </meson>
 
-  <autotools id="gst-libav">
+  <meson id="gst-libav">
     <branch repo="gitlab.freedesktop.org"
             checkoutdir="gst-libav"
             module="gstreamer/gst-libav.git"/>
@@ -873,7 +873,7 @@
     <suggests>
       <dep package="yasm"/>
     </suggests>
-  </autotools>
+  </meson>
 
   <meson id="gtk+" mesonargs="-Dbroadway-backend=true">
     <if condition-set="x11">
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index f6b3a25b..726a1803 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -654,18 +654,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-libav"
-             autogenargs="--disable-fatal-warnings">
-    <branch repo="gitlab.freedesktop.org"
-            revision="1.10"
-            module="gstreamer/gst-libav.git"
-            checkoutdir="gst-libav"/>
-    <dependencies>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gst-python" autogenargs="PYTHON=python3">
     <branch repo="gitlab.freedesktop.org"
             module="gstreamer/gst-python.git"


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