From e497235c4f2e1e818215c5cbcb6d57982858f0ee Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 20 Sep 2024 00:59:01 +0000
Subject: [PATCH] extra/gstreamer to 1.24.8-1

---
 extra/gstreamer/.SRCINFO                      | 128 +++++++++---------
 ...0001-HACK-meson-Disable-broken-tests.patch |   2 +-
 extra/gstreamer/PKGBUILD                      |  13 +-
 3 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/extra/gstreamer/.SRCINFO b/extra/gstreamer/.SRCINFO
index a612d4547..63ff8913d 100644
--- a/extra/gstreamer/.SRCINFO
+++ b/extra/gstreamer/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gstreamer
 	pkgdesc = Multimedia graph framework
-	pkgver = 1.24.7
+	pkgver = 1.24.8
 	pkgrel = 1
 	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
@@ -150,15 +150,17 @@ pkgbase = gstreamer
 	makedepends = zlib
 	makedepends = zvbi
 	makedepends = zxing-cpp
-	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.7
-	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.7.tar.xz
-	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.7.tar.xz.asc
+	source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.8
+	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.8.tar.xz
+	source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.8.tar.xz.asc
 	source = 0001-HACK-meson-Disable-broken-tests.patch
+	source = 0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
 	validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
-	b2sums = 9b51eb240356ad3cfc229505cd6e7eab1508411cd12fea7db1ecc613f36c4f17de106b667ed37366b04d6be8788ba1e9902ba5ce115824822b72fb6da66cc8e3
-	b2sums = b41545f687156eb14b5199736dc39b6c80903a2e85cf2935b27ac680d04ac68c18a11acf2420af34801b6a0d21677b4b18a10aa66910ac1c87dcb2dc767da8d1
+	b2sums = ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96
+	b2sums = 5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a
 	b2sums = SKIP
-	b2sums = 05be85b333b83a9ffb3ba7e1554027a0398a44adeef2ab7f088ae93d9301291d6d19b4033d236edefdc95e79a27da7c1f5d29b32c565a932661e43e07518e276
+	b2sums = 9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317
+	b2sums = ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05
 
 pkgname = gstreamer
 	pkgdesc = Multimedia graph framework - core
@@ -173,8 +175,8 @@ pkgname = gstreamer
 
 pkgname = gst-plugins-bad-libs
 	pkgdesc = Multimedia graph framework - bad
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -196,7 +198,7 @@ pkgname = gst-plugins-bad-libs
 
 pkgname = gst-plugins-base-libs
 	pkgdesc = Multimedia graph framework - base
-	depends = gstreamer=1.24.7-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = iso-codes
@@ -215,8 +217,8 @@ pkgname = gst-plugins-base-libs
 
 pkgname = gst-plugins-base
 	pkgdesc = Multimedia graph framework - base plugins
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = alsa-lib
 	depends = cairo
 	depends = cdparanoia
@@ -234,8 +236,8 @@ pkgname = gst-plugins-base
 
 pkgname = gst-plugins-good
 	pkgdesc = Multimedia graph framework - good plugins
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = aalib
 	depends = bzip2
 	depends = cairo
@@ -277,9 +279,9 @@ pkgname = gst-plugins-good
 
 pkgname = gst-plugins-bad
 	pkgdesc = Multimedia graph framework - bad plugins
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = aom
 	depends = bzip2
 	depends = cairo
@@ -347,9 +349,9 @@ pkgname = gst-plugins-bad
 
 pkgname = gst-plugin-gtk
 	pkgdesc = Multimedia graph framework - gtk plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = cairo
 	depends = glib2
 	depends = glibc
@@ -358,9 +360,9 @@ pkgname = gst-plugin-gtk
 
 pkgname = gst-plugin-msdk
 	pkgdesc = Multimedia graph framework - msdk plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = libdrm
@@ -370,9 +372,9 @@ pkgname = gst-plugin-msdk
 
 pkgname = gst-plugin-onnx
 	pkgdesc = Multimedia graph framework - onnx plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -380,8 +382,8 @@ pkgname = gst-plugin-onnx
 
 pkgname = gst-plugin-opencv
 	pkgdesc = Multimedia graph framework - opencv plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -389,8 +391,8 @@ pkgname = gst-plugin-opencv
 
 pkgname = gst-plugin-qml6
 	pkgdesc = Multimedia graph framework - qml6 plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -401,8 +403,8 @@ pkgname = gst-plugin-qml6
 
 pkgname = gst-plugin-qmlgl
 	pkgdesc = Multimedia graph framework - qmlgl plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -414,9 +416,9 @@ pkgname = gst-plugin-qmlgl
 
 pkgname = gst-plugin-qsv
 	pkgdesc = Multimedia graph framework - qsv plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -425,9 +427,9 @@ pkgname = gst-plugin-qsv
 
 pkgname = gst-plugin-va
 	pkgdesc = Multimedia graph framework - va plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = libgudev
@@ -435,8 +437,8 @@ pkgname = gst-plugin-va
 
 pkgname = gst-plugin-wpe
 	pkgdesc = Multimedia graph framework - wpe plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = gcc-libs
 	depends = glib2
 	depends = glibc
@@ -448,8 +450,8 @@ pkgname = gst-plugin-wpe
 
 pkgname = gst-plugins-ugly
 	pkgdesc = Multimedia graph framework - ugly plugins
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = a52dec
 	depends = glib2
 	depends = glibc
@@ -461,17 +463,17 @@ pkgname = gst-plugins-ugly
 
 pkgname = gst-libav
 	pkgdesc = Multimedia graph framework - libav plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = ffmpeg
 	depends = glib2
 	depends = glibc
-	provides = gst-ffmpeg=1.24.7-1
+	provides = gst-ffmpeg=1.24.8-1
 
 pkgname = gst-devtools-libs
 	pkgdesc = Multimedia graph framework - development and debugging libraries
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = json-glib
@@ -480,11 +482,11 @@ pkgname = gst-devtools-libs
 
 pkgname = gst-devtools
 	pkgdesc = Multimedia graph framework - development and debugging tools
-	depends = gst-devtools-libs=1.24.7-1
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gst-rtsp-server=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-devtools-libs=1.24.8-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gst-rtsp-server=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = cairo
 	depends = glib2
 	depends = glibc
@@ -498,8 +500,8 @@ pkgname = gst-devtools
 
 pkgname = gst-rtsp-server
 	pkgdesc = Multimedia graph framework - rtsp server
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = orc
@@ -507,10 +509,10 @@ pkgname = gst-rtsp-server
 
 pkgname = gst-editing-services
 	pkgdesc = Multimedia graph framework - editing services
-	depends = gst-devtools-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gst-python=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-devtools-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gst-python=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = json-glib
@@ -523,9 +525,9 @@ pkgname = gst-editing-services
 
 pkgname = gstreamer-vaapi
 	pkgdesc = Multimedia graph framework - vaapi plugin
-	depends = gst-plugins-bad-libs=1.24.7-1
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-bad-libs=1.24.8-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = libglvnd
@@ -537,8 +539,8 @@ pkgname = gstreamer-vaapi
 
 pkgname = gst-python
 	pkgdesc = Multimedia graph framework - python plugin
-	depends = gst-plugins-base-libs=1.24.7-1
-	depends = gstreamer=1.24.7-1
+	depends = gst-plugins-base-libs=1.24.8-1
+	depends = gstreamer=1.24.8-1
 	depends = glib2
 	depends = glibc
 	depends = python
diff --git a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
index c9cfdca65..87c424f3d 100644
--- a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
+++ b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
@@ -122,7 +122,7 @@ index 6efa928fb09b..1f1950ef323d 100644
    tcase_add_test (tc_chain, test_video_caps_change_streamable);
    tcase_add_test (tc_chain, test_audio_caps_change_streamable_single);
 diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index b85b2150a95c..2582cde3a9bf 100644
+index 8f328d622f54..14cfbf412101 100644
 --- a/subprojects/gstreamer-vaapi/meson.build
 +++ b/subprojects/gstreamer-vaapi/meson.build
 @@ -218,7 +218,6 @@ plugins = []
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 7333d4bde..044c8e3fc 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -37,7 +37,7 @@ pkgname=(
   gst-python
   gstreamer-docs
 )
-pkgver=1.24.7
+pkgver=1.24.8
 pkgrel=1
 pkgdesc="Multimedia graph framework"
 url="https://gstreamer.freedesktop.org/"
@@ -192,11 +192,13 @@ source=(
   "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver"
   "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc}
   0001-HACK-meson-Disable-broken-tests.patch
+  0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
 )
-b2sums=('9b51eb240356ad3cfc229505cd6e7eab1508411cd12fea7db1ecc613f36c4f17de106b667ed37366b04d6be8788ba1e9902ba5ce115824822b72fb6da66cc8e3'
-        'b41545f687156eb14b5199736dc39b6c80903a2e85cf2935b27ac680d04ac68c18a11acf2420af34801b6a0d21677b4b18a10aa66910ac1c87dcb2dc767da8d1'
+b2sums=('ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96'
+        '5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a'
         'SKIP'
-        '05be85b333b83a9ffb3ba7e1554027a0398a44adeef2ab7f088ae93d9301291d6d19b4033d236edefdc95e79a27da7c1f5d29b32c565a932661e43e07518e276')
+        '9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317'
+        'ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05')
 validpgpkeys=(
   D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
 )
@@ -206,6 +208,9 @@ prepare() {
 
   # Disable broken tests
   git apply -3 ../0001-HACK-meson-Disable-broken-tests.patch
+
+  # Fix build
+  git apply -3 ../0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
 }
 
 build() {