From bb9af0ed5c62961e0dc495d98057f6b92acbdc6e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 23 Mar 2024 01:15:56 +0000
Subject: [PATCH] extra/gstreamer to 1.24.1-1
---
extra/gstreamer/.SRCINFO | 57 ++++++++++---------
...0001-HACK-meson-Disable-broken-tests.patch | 6 +-
extra/gstreamer/PKGBUILD | 19 +++----
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/extra/gstreamer/.SRCINFO b/extra/gstreamer/.SRCINFO
index a9f7c100b..3c4aadbe8 100644
--- a/extra/gstreamer/.SRCINFO
+++ b/extra/gstreamer/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gstreamer
pkgdesc = Multimedia graph framework
- pkgver = 1.24.0
- pkgrel = 3
+ pkgver = 1.24.1
+ pkgrel = 1
url = https://gstreamer.freedesktop.org/
arch = x86_64
license = LGPL-2.1-or-later
@@ -15,6 +15,7 @@ pkgbase = gstreamer
makedepends = libelf
makedepends = libunwind
makedepends = python
+ makedepends = python-packaging
makedepends = rust
makedepends = valgrind
makedepends = alsa-lib
@@ -134,15 +135,15 @@ pkgbase = gstreamer
makedepends = ffmpeg
makedepends = libxrandr
makedepends = python-gobject
- source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.0
- source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.0.tar.xz
- source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.0.tar.xz.asc
+ source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.1
+ source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.1.tar.xz
+ source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.1.tar.xz.asc
source = 0001-HACK-meson-Disable-broken-tests.patch
validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
- b2sums = dcd85b0b2e6a785fba6fd44bdab3bbf42a5a64ecb55d978d09d57a4a79e895396444eae0bc29771d48fa9a3947b445c33ede496b558150b685985d0aa481c498
- b2sums = 506088437f614f17a24402f70605d0a3831a597bec27c486763418d1ddce7dfa2370eac95e83dd82e1e2e856aaf0050ccf4b4e06a78a2664627236df762bde74
+ b2sums = a91e46cf3757a825a060f75fcfd974ec65fcb0d24c96039ce79b481b1ea93e82a6e226f45fd0fae6421ccd2eb356871db670c93b32b3df2cba8b105d4e00cf19
+ b2sums = 08cd34a70aa2b7afa43ab29b272d7b51f8074fc994e0c9b85b0674e38e08b451d2f2d65c89cbda311ce646ff26274fb5cd296dbf15da7fd6a89f9990d13fe4f2
b2sums = SKIP
- b2sums = afe47af956fe50ab2d77dba5d1e84649f63443a816ad7a0d0c0a37f2f46e1da3473472bd1183843b37dd3c0c61ee496b3d246df5de35e5df960a09bcac7eb48f
+ b2sums = c32a423b7675881f795d3858b12d90bc87da42ddc03773d113f692cc0c0dfbd502c28b89bd90fbaec5a352cbd96baa3605fac1542a32dd71d20102987bb37a2c
pkgname = gstreamer
pkgdesc = Multimedia graph framework - core
@@ -156,7 +157,7 @@ pkgname = gstreamer
pkgname = gst-plugins-bad-libs
pkgdesc = Multimedia graph framework - bad
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = libdrm
depends = libgudev
depends = libnice
@@ -170,7 +171,7 @@ pkgname = gst-plugins-bad-libs
pkgname = gst-plugins-base-libs
pkgdesc = Multimedia graph framework - base
- depends = gstreamer=1.24.0
+ depends = gstreamer=1.24.1
depends = iso-codes
depends = libdrm
depends = libgl
@@ -183,7 +184,7 @@ pkgname = gst-plugins-base-libs
pkgname = gst-plugins-base
pkgdesc = Multimedia graph framework - base plugins
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = alsa-lib
depends = cdparanoia
depends = graphene
@@ -196,7 +197,7 @@ pkgname = gst-plugins-base
pkgname = gst-plugins-good
pkgdesc = Multimedia graph framework - good plugins
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = aalib
depends = cairo
depends = flac
@@ -226,7 +227,7 @@ pkgname = gst-plugins-good
pkgname = gst-plugins-bad
pkgdesc = Multimedia graph framework - bad plugins
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
depends = aom
depends = bzip2
depends = chromaprint
@@ -288,50 +289,50 @@ pkgname = gst-plugins-bad
pkgname = gst-plugin-gtk
pkgdesc = Multimedia graph framework - gtk plugin
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
depends = gtk3
pkgname = gst-plugin-msdk
pkgdesc = Multimedia graph framework - msdk plugin
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
depends = libvpl
pkgname = gst-plugin-opencv
pkgdesc = Multimedia graph framework - opencv plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = opencv
pkgname = gst-plugin-qml6
pkgdesc = Multimedia graph framework - qml6 plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = qt6-declarative
depends = qt6-wayland
pkgname = gst-plugin-qmlgl
pkgdesc = Multimedia graph framework - qmlgl plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = qt5-declarative
depends = qt5-wayland
depends = qt5-x11extras
pkgname = gst-plugin-qsv
pkgdesc = Multimedia graph framework - qsv plugin
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
optdepends = intel-media-sdk: runtime for legacy Intel GPUs
optdepends = onevpl-intel-gpu: runtime for Tiger Lake and newer GPUs
pkgname = gst-plugin-va
pkgdesc = Multimedia graph framework - va plugin
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
pkgname = gst-plugin-wpe
pkgdesc = Multimedia graph framework - wpe plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = wpewebkit
pkgname = gst-plugins-ugly
pkgdesc = Multimedia graph framework - ugly plugins
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = a52dec
depends = libcdio
depends = libdvdread
@@ -340,28 +341,28 @@ pkgname = gst-plugins-ugly
pkgname = gst-libav
pkgdesc = Multimedia graph framework - libav plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = bzip2
depends = ffmpeg
- provides = gst-ffmpeg=1.24.0
+ provides = gst-ffmpeg=1.24.1
pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = python
pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin
- depends = gst-plugins-bad-libs=1.24.0
+ depends = gst-plugins-bad-libs=1.24.1
depends = libxrandr
pkgname = gst-python
pkgdesc = Multimedia graph framework - python plugin
- depends = gst-plugins-base-libs=1.24.0
+ depends = gst-plugins-base-libs=1.24.1
depends = python-gobject
pkgname = gstreamer-docs
diff --git a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
index a3f5741b5..6f226ab2c 100644
--- a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
+++ b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch
@@ -14,7 +14,7 @@ Subject: [PATCH] HACK: meson: Disable broken tests
7 files changed, 8 deletions(-)
diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
-index 968671934c4e..9741838d67b9 100644
+index 11c3aed9279b..2ce1f78b677e 100644
--- a/subprojects/gst-editing-services/meson.build
+++ b/subprojects/gst-editing-services/meson.build
@@ -295,7 +295,6 @@ subdir('ges')
@@ -62,7 +62,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/gst-python/meson.build b/subprojects/gst-python/meson.build
-index d2b994288d4a..00df444f18fa 100644
+index d40c1c2ae8a7..89e537a1f3de 100644
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@@ -132,5 +132,4 @@ if not get_option('plugin').disabled()
@@ -87,7 +87,7 @@ index 2112da396235..1cbcb861dcf4 100644
'gst/token',
'gst/onvif',
diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
-index e5b03a30b98e..0044bc4ad979 100644
+index 145f67ae443b..d13ca08819e1 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 57dd172fb..f59cf023d 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -33,8 +33,8 @@ pkgname=(
gst-python
gstreamer-docs
)
-pkgver=1.24.0
-pkgrel=3
+pkgver=1.24.1
+pkgrel=1
pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/"
arch=(x86_64)
@@ -45,8 +45,8 @@ makedepends=(
git meson
# gstreamer
- bash-completion gobject-introspection gtk3 libcap libelf libunwind python rust
- valgrind
+ bash-completion gobject-introspection gtk3 libcap libelf libunwind python
+ python-packaging rust valgrind
# gst-plugins-base
alsa-lib cdparanoia graphene libdrm libglvnd libgudev libjpeg libpng libtheora
@@ -86,10 +86,10 @@ source=(
"https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc}
0001-HACK-meson-Disable-broken-tests.patch
)
-b2sums=('dcd85b0b2e6a785fba6fd44bdab3bbf42a5a64ecb55d978d09d57a4a79e895396444eae0bc29771d48fa9a3947b445c33ede496b558150b685985d0aa481c498'
- '506088437f614f17a24402f70605d0a3831a597bec27c486763418d1ddce7dfa2370eac95e83dd82e1e2e856aaf0050ccf4b4e06a78a2664627236df762bde74'
+b2sums=('a91e46cf3757a825a060f75fcfd974ec65fcb0d24c96039ce79b481b1ea93e82a6e226f45fd0fae6421ccd2eb356871db670c93b32b3df2cba8b105d4e00cf19'
+ '08cd34a70aa2b7afa43ab29b272d7b51f8074fc994e0c9b85b0674e38e08b451d2f2d65c89cbda311ce646ff26274fb5cd296dbf15da7fd6a89f9990d13fe4f2'
'SKIP'
- 'afe47af956fe50ab2d77dba5d1e84649f63443a816ad7a0d0c0a37f2f46e1da3473472bd1183843b37dd3c0c61ee496b3d246df5de35e5df960a09bcac7eb48f')
+ 'c32a423b7675881f795d3858b12d90bc87da42ddc03773d113f692cc0c0dfbd502c28b89bd90fbaec5a352cbd96baa3605fac1542a32dd71d20102987bb37a2c')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
)
@@ -97,10 +97,6 @@ validpgpkeys=(
prepare() {
cd gstreamer
- # https://gitlab.archlinux.org/archlinux/packaging/packages/gst-plugins-base/-/issues/1
- # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6384
- git cherry-pick -n 93255efece907fdec28366aea6f474af051a1ed0
-
# Disable broken tests
git apply -3 ../0001-HACK-meson-Disable-broken-tests.patch
}
@@ -202,7 +198,6 @@ package_gstreamer() {
usr/lib/gstreamer-1.0/gst-{completion,ptp}-helper
usr/lib/gstreamer-1.0/gst-{hotdoc-plugins,plugin}-scanner
usr/lib/gstreamer-1.0/gst-plugins-doc-cache-generator
- usr/lib/gstreamer-1.0/gst-ptp-helper-test
usr/lib/gstreamer-1.0/libgstcoreelements.so
usr/lib/gstreamer-1.0/libgstcoretracers.so