[gtk-osx] Update gtk-osx-gstreamer.modules.

[John Ralls <jralls src gnome org>]

commit 8d5ca7e83c47e82a3e0236fe450b772a36679f76
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 5 11:34:39 2021 -0700

    Update gtk-osx-gstreamer.modules.

 modulesets-stable/gtk-osx-gstreamer.modules | 103 +++++++++++++++-------------
 1 file changed, 57 insertions(+), 46 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 1e1fddbe..966da11c 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -6,97 +6,108 @@
               href="http://gstreamer.freedesktop.org/src/"/>
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
+  <repository type="tarball" name="ffmpeg"
+              href="https://ffmpeg.org/releases/"/>
+  <repository type="tarball" name="nasm"
+              href="https://www.nasm.us/pub/nasm/releasebuilds/"/>
 
-  <autotools id="liborc" autogen-sh="configure">
-    <branch module="orc/orc-0.4.28.tar.xz" version="0.4.28"
-            hash="sha256:bfcd7c6563b05672386c4eedfc4c0d4a0a12b4b4775b74ec6deb88fc2bcd83ce"/>
-  </autotools>
+  <meson id="liborc" mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled 
-Dtests=disabled">
+    <branch module="orc/orc-0.4.32.tar.xz" version="0.4.32"
+            hash="sha256:a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0"/>
+  </meson>
 
   <autotools id="faad2" autogen-sh="autoreconf"
              autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
     <branch repo="sourceforge" version="2.8.6"
             module="faac/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz"
             hash="sha256:654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/faad2-2.7-ac-config-headers.patch"; strip="1"/>
     </branch>
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="--disable-tests" supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gstreamer/gstreamer-1.16.2.tar.xz" version="1.16.2"
-            hash="sha256:e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e">
+  <autotools id="nasm" autogen-sh="configure">
+    <branch repo="nasm" version="2.15.05"
+            module="2.15.05/nasm-2.15.05.tar.xz"
+            hash="sha256:3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f"/>
+  </autotools>
+
+  <autotools id="ffmpeg" autogen-sh="configure"
+             autogenargs="--enable-gpl --enable-version3 --enable-shared --disable-static 
--disable-runtime-cpudetect --disable-programs --disable-ffplay --disable-ffprobe --disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
+>
+    <branch repo="ffmpeg" version="4.3.2"
+            module="ffmpeg-4.3.2.tar.xz"
+            hash="sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"/>
+    <dependencies>
+      <dep package="nasm"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="gstreamer">
+    <branch module="gstreamer/gstreamer-1.18.4.tar.xz" version="1.18.4"
+            hash="sha256:9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5">
     </branch>
     <after>
       <dep package="glib"/>
     </after>
-  </autotools>
+  </meson>
 
-  <autotools id="gst-plugins-base" autogenargs="--disable-tests --disable-x --disable-xvideo 
--disable-examples" supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-base/gst-plugins-base-1.16.2.tar.xz"
-            version="1.16.2"
-            hash="sha256:b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"/>
+  <meson id="gst-plugins-base" mesonargs="-Dexamples=disabled -Ddoc=disabled">
+    <branch module="gst-plugins-base/gst-plugins-base-1.18.4.tar.xz"
+            version="1.18.4"
+            hash="sha256:29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liborc"/>
     </dependencies>
     <after>
     </after>
-  </autotools>
+  </meson>
 
-  <autotools id="gst-plugins-good" autogenargs="--disable-tests --disable-x --disable-xvideo 
--disable-osx-video --disable-vpx" supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-good/gst-plugins-good-1.16.2.tar.xz"
-            version="1.16.2"
-            hash="sha256:40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319">
+  <meson id="gst-plugins-good">
+    <branch module="gst-plugins-good/gst-plugins-good-1.18.4.tar.xz"
+            version="1.18.4"
+            hash="sha256:b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0">
     </branch>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
-             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS="
-             autogen-sh="configure">
-    <branch version="1.16.2"
-            module="gst-plugins-ugly/gst-plugins-ugly-1.16.2.tar.xz"
-            hash="sha256:5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca"/>
+  <meson id="gst-plugins-ugly">
+    <branch version="1.18.4"
+            module="gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz"
+            hash="sha256:218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="gst-plugins-bad" supports-non-srcdir-builds="no"
-             autogenargs="--disable-tests --disable-x --disable-xvid"
-             makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch version="1.16.2"
-            module="gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz"
-            hash="sha256:f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74"/>
+  <meson id="gst-plugins-bad">
+    <branch version="1.18.4"
+            module="gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz"
+            hash="sha256:74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="faad2"/>
       <dep package='openssl'/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <!-- 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"
-             autogen-sh="configure"
-             autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
-     <branch version="1.16.2"
-             module="gst-libav/gst-libav-1.16.2.tar.xz"
-             hash="sha256:c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2"/>
+  <meson id="gst-libav">
+     <branch version="1.18.4"
+             module="gst-libav/gst-libav-1.18.4.tar.xz"
+             hash="sha256:344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
+      <dep package="ffmpeg"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <metamodule id="meta-gstreamer">
+  <metamodule id="meta-gtk-osx-gstreamer">
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>