* update gstreamer to 1.24.10-2

This commit is contained in:
Alexander Baldeck 2024-12-11 11:57:33 +01:00
parent de258bb694
commit 09c6048a05
5 changed files with 100 additions and 102 deletions

View File

@ -1,7 +1,7 @@
pkgbase = gstreamer
pkgdesc = Multimedia graph framework
pkgver = 1.24.8
pkgrel = 3
pkgver = 1.24.10
pkgrel = 2
url = https://gstreamer.freedesktop.org/
arch = x86_64
arch = powerpc64le
@ -172,19 +172,19 @@ pkgbase = gstreamer
makedepends = zlib
makedepends = zvbi
makedepends = zxing-cpp
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 = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.10
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.10.tar.xz
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.10.tar.xz.asc
source = 0001-HACK-meson-Disable-broken-tests.patch
source = 0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
source = 0003-x265enc-Unbreak-build-with-x265-4.0.patch
source = 0002-x265enc-Unbreak-build-with-x265-4.0.patch
source = 0003-meson-Drop-max-version-bound-from-neon.patch
validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
b2sums = ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96
b2sums = 5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a
b2sums = ce6bbb96c8e087c00a1a5cd2770bc92914aee0ecaf381117646e69f5010a40ecfc01bbc37ef5ca20596daddc179e369f4438bc7e64c78f7b7a1a51d475872db5
b2sums = 3b836b8cc3def12bf3aaf24a8432ab91de6946defe123adcc2f921d97055eee7c5b33920fa610195a8f8c8d5e036894f719202e107eddca3c2a5c4619ddec815
b2sums = SKIP
b2sums = 9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317
b2sums = ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05
b2sums = 23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44
b2sums = 94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348
b2sums = 9d6aee40cc1302a12c4db64a4eec216852bef009887fd5eccdb911a9b4daa99d038bed6bec020b3d7786ae51126f68d136a1f7bc5f28d32015caf8c6cd2f43a5
makedepends_x86_64 = libvpl
makedepends_x86_64 = nasm
makedepends_x86_64 = onnxruntime
@ -203,8 +203,8 @@ pkgname = gstreamer
pkgname = gst-plugins-bad-libs
pkgdesc = Multimedia graph framework - bad
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = gcc-libs
depends = glib2
depends = glibc
@ -226,7 +226,7 @@ pkgname = gst-plugins-bad-libs
pkgname = gst-plugins-base-libs
pkgdesc = Multimedia graph framework - base
depends = gstreamer=1.24.8-3
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = iso-codes
@ -245,8 +245,8 @@ pkgname = gst-plugins-base-libs
pkgname = gst-plugins-base
pkgdesc = Multimedia graph framework - base plugins
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = alsa-lib
depends = cairo
depends = cdparanoia
@ -264,8 +264,8 @@ pkgname = gst-plugins-base
pkgname = gst-plugins-good
pkgdesc = Multimedia graph framework - good plugins
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = aalib
depends = bzip2
depends = cairo
@ -307,9 +307,9 @@ pkgname = gst-plugins-good
pkgname = gst-plugins-bad
pkgdesc = Multimedia graph framework - bad plugins
depends = gst-plugins-bad-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-bad-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = aom
depends = bzip2
depends = cairo
@ -378,8 +378,8 @@ pkgname = gst-plugins-bad
pkgname = gst-plugins-ugly
pkgdesc = Multimedia graph framework - ugly plugins
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = a52dec
depends = glib2
depends = glibc
@ -391,18 +391,18 @@ pkgname = gst-plugins-ugly
pkgname = gst-libav
pkgdesc = Multimedia graph framework - libav plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = ffmpeg
depends = glib2
depends = glibc
provides = gst-ffmpeg=1.24.8-3
provides = gst-ffmpeg=1.24.10-2
pkgname = gst-plugin-gtk
pkgdesc = Multimedia graph framework - gtk plugin
depends = gst-plugins-bad-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-bad-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = cairo
depends = glib2
depends = glibc
@ -411,8 +411,8 @@ pkgname = gst-plugin-gtk
pkgname = gst-plugin-opencv
pkgdesc = Multimedia graph framework - opencv plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = gcc-libs
depends = glib2
depends = glibc
@ -420,8 +420,8 @@ pkgname = gst-plugin-opencv
pkgname = gst-plugin-qml6
pkgdesc = Multimedia graph framework - qml6 plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = gcc-libs
depends = glib2
depends = glibc
@ -432,8 +432,8 @@ pkgname = gst-plugin-qml6
pkgname = gst-plugin-qmlgl
pkgdesc = Multimedia graph framework - qmlgl plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = gcc-libs
depends = glib2
depends = glibc
@ -445,9 +445,9 @@ pkgname = gst-plugin-qmlgl
pkgname = gst-plugin-va
pkgdesc = Multimedia graph framework - va plugin
depends = gst-plugins-bad-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-bad-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = libgudev
@ -455,8 +455,8 @@ pkgname = gst-plugin-va
pkgname = gst-plugin-wpe
pkgdesc = Multimedia graph framework - wpe plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = gcc-libs
depends = glib2
depends = glibc
@ -468,8 +468,8 @@ pkgname = gst-plugin-wpe
pkgname = gst-devtools-libs
pkgdesc = Multimedia graph framework - development and debugging libraries
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = json-glib
@ -478,11 +478,11 @@ pkgname = gst-devtools-libs
pkgname = gst-devtools
pkgdesc = Multimedia graph framework - development and debugging tools
depends = gst-devtools-libs=1.24.8-3
depends = gst-plugins-bad-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gst-rtsp-server=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-devtools-libs=1.24.10-2
depends = gst-plugins-bad-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gst-rtsp-server=1.24.10-2
depends = gstreamer=1.24.10-2
depends = cairo
depends = glib2
depends = glibc
@ -496,8 +496,8 @@ pkgname = gst-devtools
pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = orc
@ -505,10 +505,10 @@ pkgname = gst-rtsp-server
pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services
depends = gst-devtools-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gst-python=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-devtools-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gst-python=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = json-glib
@ -521,9 +521,9 @@ pkgname = gst-editing-services
pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin
depends = gst-plugins-bad-libs=1.24.8-3
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-bad-libs=1.24.10-2
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = libglvnd
@ -535,8 +535,8 @@ pkgname = gstreamer-vaapi
pkgname = gst-python
pkgdesc = Multimedia graph framework - python plugin
depends = gst-plugins-base-libs=1.24.8-3
depends = gstreamer=1.24.8-3
depends = gst-plugins-base-libs=1.24.10-2
depends = gstreamer=1.24.10-2
depends = glib2
depends = glibc
depends = python

View File

@ -1,25 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Fri, 20 Sep 2024 01:44:53 +0200
Subject: [PATCH] ges: Fix name of GESFrameCompositionMeta API type
g-ir-scanner 1.82.0 failed with a fatal error due to the wrong
namespace.
---
.../gst-editing-services/ges/ges-frame-composition-meta.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c b/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c
index d8c5a5251309..1ad7b6cfe4c7 100644
--- a/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c
+++ b/subprojects/gst-editing-services/ges/ges-frame-composition-meta.c
@@ -47,7 +47,8 @@ ges_frame_composition_meta_api_get_type (void)
static const gchar *tags[] = { "video", NULL };
if (g_once_init_enter (&type)) {
- GType _type = gst_meta_api_type_register ("GstFrameCompositionApi", tags);
+ GType _type =
+ gst_meta_api_type_register ("GESFrameCompositionMetaAPI", tags);
g_once_init_leave (&type, _type);
}
return type;

View File

@ -3,23 +3,25 @@ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Sat, 5 Oct 2024 04:21:10 +0200
Subject: [PATCH] x265enc: Unbreak build with x265 4.0
Following a [similar change][1] in FFmpeg.
Following a [similar change][1] in FFmpeg. x265 also reverted the change
post-4.0 and FFmpeg [adapted again][2].
[1]: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1f801dfdb5066aadf0ade9cb5e94d620f33eacdc
[2]: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/099f88b8641dfc299f3896d17d9addc5b9ae7799
---
.../gst-plugins-bad/ext/x265/gstx265enc.c | 29 ++++++++++++++-----
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
index e6aa973ac7cc..77de727061b1 100644
index ee72389720ef..470d334b8ffb 100644
--- a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
+++ b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
@@ -1514,7 +1514,12 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
@@ -1519,7 +1519,12 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
{
GstVideoCodecFrame *frame = NULL;
GstBuffer *out_buf = NULL;
- x265_picture pic_out;
+#if (X265_BUILD >= 210)
+#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ x265_picture pics_out[MAX_SCALABLE_LAYERS], *pics_outp[MAX_SCALABLE_LAYERS];
+#else
+ x265_picture pics_out[1];
@ -28,11 +30,11 @@ index e6aa973ac7cc..77de727061b1 100644
x265_nal *nal;
int i_size, i, offset;
int encoder_return;
@@ -1549,75 +1554,83 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
@@ -1554,75 +1559,83 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
if (G_UNLIKELY (update_latency))
gst_x265_enc_set_latency (encoder);
+#if (X265_BUILD >= 210)
+#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
+ pics_outp[i] = &pics_out[i];
+

View File

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Fri, 29 Nov 2024 14:41:12 +0100
Subject: [PATCH] meson: Drop max version bound from neon
Neon 0.34.0 broke the build again, but the API+ABI has been stable since
0.27 and the library is so-versioned.
---
subprojects/gst-plugins-bad/ext/neon/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build
index 7aa5ed78d5c9..7c2696cfa106 100644
--- a/subprojects/gst-plugins-bad/ext/neon/meson.build
+++ b/subprojects/gst-plugins-bad/ext/neon/meson.build
@@ -1,5 +1,4 @@
-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.33.99'],
- required : get_option('neon'))
+neon_dep = dependency('neon', version: '>= 0.27', required: get_option('neon'))
if neon_dep.found()
gstneon = library('gstneonhttpsrc',

View File

@ -27,8 +27,8 @@ pkgname=(
gstreamer-docs
)
[ "${CARCH}" == 'x86_64' ] && pkgname+=(gst-plugin-msdk gst-plugin-qsv gst-plugin-onnx)
pkgver=1.24.8
pkgrel=3
pkgver=1.24.10
pkgrel=2
pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
@ -208,30 +208,29 @@ 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
0003-x265enc-Unbreak-build-with-x265-4.0.patch
0002-x265enc-Unbreak-build-with-x265-4.0.patch
0003-meson-Drop-max-version-bound-from-neon.patch
)
b2sums=('ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96'
'5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a'
b2sums=('ce6bbb96c8e087c00a1a5cd2770bc92914aee0ecaf381117646e69f5010a40ecfc01bbc37ef5ca20596daddc179e369f4438bc7e64c78f7b7a1a51d475872db5'
'3b836b8cc3def12bf3aaf24a8432ab91de6946defe123adcc2f921d97055eee7c5b33920fa610195a8f8c8d5e036894f719202e107eddca3c2a5c4619ddec815'
'SKIP'
'9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317'
'ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05'
'23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44')
'94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348'
'9d6aee40cc1302a12c4db64a4eec216852bef009887fd5eccdb911a9b4daa99d038bed6bec020b3d7786ae51126f68d136a1f7bc5f28d32015caf8c6cd2f43a5')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
)
prepare() {
cd gstreamer
# Disable broken tests
git apply -3 ../0001-HACK-meson-Disable-broken-tests.patch
# Fix build of GES
git apply -3 ../0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
# Fix build with x265 4.0
git apply -3 ../0003-x265enc-Unbreak-build-with-x265-4.0.patch
git apply -3 ../0002-x265enc-Unbreak-build-with-x265-4.0.patch
# Fix build with neon 0.34.0
git apply -3 ../0003-meson-Drop-max-version-bound-from-neon.patch
}
build() {