[jhbuild] modulesets: update dependencies for modules that use GStreamer

[Alberts Muktupāvels <muktupavels src gnome org>]

commit d1c531616ed84967b0557caa4f783c62a521bd7a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 3 16:26:38 2022 +0200

    modulesets: update dependencies for modules that use GStreamer
    
    Commit f7af83afe07d removed some GStreamer modules without updating
    dependencies for other modules that use GStreamer.

 modulesets/gnome-apps-latest.modules             |  2 --
 modulesets/gnome-suites-core-deps-latest.modules | 17 +-----------
 modulesets/gnome-suites-core-latest.modules      | 12 ++-------
 modulesets/gnome-world.modules                   | 34 +++---------------------
 4 files changed, 6 insertions(+), 59 deletions(-)
---
diff --git a/modulesets/gnome-apps-latest.modules b/modulesets/gnome-apps-latest.modules
index c467a6d8..b27a3ce3 100644
--- a/modulesets/gnome-apps-latest.modules
+++ b/modulesets/gnome-apps-latest.modules
@@ -399,8 +399,6 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+-3"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
     </dependencies>
   </meson>
 
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 3962e78d..d62e1643 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -245,7 +245,6 @@
       <dep package="cogl"/>
       <dep package="clutter"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
@@ -277,7 +276,6 @@
       <dep package="gtk-doc"/>
       <dep package="pango"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <if condition-unset="quartz">
         <dep package="libdrm"/>
       </if>
@@ -905,8 +903,6 @@
       <dep package="desktop-file-utils"/>
       <dep package="shared-mime-info"/>
       <!-- GStreamer is the default media backend, but it is optional -->
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
       <dep package="gstreamer"/>
     </suggests>
   </meson>
@@ -1088,11 +1084,7 @@
       <dep package="libxml2"/>
       <dep package="glib"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
-    <suggests>
-      <dep package="gst-plugins-good"/>
-    </suggests>
  </autotools>
 
   <meson id="gupnp-igd">
@@ -2167,7 +2159,6 @@
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="libgsf"/>
       <dep package="poppler"/>
       <dep package="totem-pl-parser"/>
@@ -2207,7 +2198,6 @@
     <suggests>
       <dep package="dconf"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="libgsf"/>
       <dep package="poppler"/>
       <dep package="totem-pl-parser"/>
@@ -2317,9 +2307,7 @@
       <dep package="geoclue"/>
       <dep package="gobject-introspection"/>
       <dep package="gperf"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+-3"/>
       <dep package="harfbuzz"/>
       <dep package="hyphen"/>
@@ -2354,9 +2342,6 @@
         <dep package="wpebackend-fdo"/>
       </if>
     </dependencies>
-    <suggests>
-      <dep package="gst-libav"/>
-    </suggests>
   </cmake>
 
   <cmake id="woff2">
diff --git a/modulesets/gnome-suites-core-latest.modules b/modulesets/gnome-suites-core-latest.modules
index 38af535c..be0eec09 100644
--- a/modulesets/gnome-suites-core-latest.modules
+++ b/modulesets/gnome-suites-core-latest.modules
@@ -404,7 +404,6 @@
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="libgnomekbd"/>
     </suggests>
     <after>
@@ -693,9 +692,6 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
       <dep package="clutter-gst"/>
       <dep package="clutter-gtk"/>
       <dep package="libcanberra"/>
@@ -1144,7 +1140,7 @@
       <dep package="tracker-miners"/>
       <dep package="exempi"/>
       <dep package="libexif"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </meson>
@@ -1198,7 +1194,6 @@
       <dep package="gtksourceview-4"/>
       <dep package="WebKit"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="gtk+-3"/>
     </dependencies>
   </meson>
@@ -1218,9 +1213,6 @@
       <dep package="grilo-plugins"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-plugins-bad"/>
       <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
@@ -1330,7 +1322,7 @@
       <dep package="sbc"/>
       <dep package="dbus"/>
       <dep package="libv4l"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer"/>
       <dep package="pulseaudio"/>
     </dependencies>
   </meson>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 93f212d5..2561b4a3 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -128,7 +128,6 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="libcanberra"/>
       <dep package="libnotify"/>
       <dep package="libxml2"/>
@@ -230,7 +229,7 @@
     <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
     <dependencies>
       <dep package="glib-networking"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+-3"/>
       <dep package="intltool"/>
       <dep package="json-glib"/>
@@ -560,8 +559,6 @@
     <branch repo="github.com" module="01org/gstreamer-vaapi"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-bad"/>
       <dep package="libva"/>
     </dependencies>
   </autotools>
@@ -626,7 +623,6 @@
     <dependencies>
       <dep package="pygobject"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
@@ -811,23 +807,12 @@
     <dependencies>
       <dep package="gtkmm-3"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
     <suggests>
-      <dep package="gst-plugins-good"/>
-      <dep package="gst-libav"/>
       <dep package="gst-plugins-ugly"/>
     </suggests>
   </autotools>
 
-  <autotools id="gstreamermm-plugins-good">
-    <branch/>
-    <dependencies>
-      <dep package="gst-plugins-good"/>
-      <dep package="gstreamermm"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="geglmm">
     <branch/>
     <dependencies>
@@ -1099,8 +1084,6 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-bad"/>
     </dependencies>
   </meson>
 
@@ -1111,10 +1094,6 @@
       <dep package="gobject-introspection"/>
       <dep package="gstreamer"/>
       <dep package="gst-editing-services"/>
-      <dep package="gst-libav"/>
-      <dep package="gst-plugins-bad"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
       <dep package="gst-plugins-ugly"/>
       <dep package="gst-python"/>
       <dep package="gtk+-3"/>
@@ -1733,7 +1712,6 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
   </meson>
 
@@ -1744,8 +1722,6 @@
      <dep package="gstreamer"/>
      <dep package="gst-rtsp-server"/>
      <dep package="vala"/>
-     <dep package="gst-plugins-good"/>
-     <dep package="gst-plugins-bad"/>
      <dep package="libgee"/>
      <dep package="sqlite3"/>
      <dep package="pygobject"/>
@@ -2262,7 +2238,6 @@
             module="gstreamer/gst-plugins-ugly.git"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
     </dependencies>
   </meson>
 
@@ -2922,7 +2897,7 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="grilo"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer"/>
       <dep package="gtk+-3"/>
       <dep package="json-glib"/>
       <dep package="libnotify"/>
@@ -2967,7 +2942,6 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
       <dep package="libgudev"/>
       <dep package="json-glib"/>
       <dep package="libgee"/>
@@ -2992,8 +2966,6 @@
       <dep package="gtk+-3"/>
       <dep package="yelp-tools"/>
       <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
       <dep package="brasero"/>
       <dep package="libmusicbrainz"/>
       <dep package="libcanberra"/>
@@ -3397,7 +3369,7 @@
             hash="sha256:5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gst-plugins-base"/>
+      <dep package="gstreamer"/>
       <dep package="gupnp-igd"/>
     </dependencies>
   </meson>