extra/gstreamer to 1.24.10-1

This commit is contained in:
David Beauchamp 2024-12-04 19:50:02 -05:00
parent e534aa15d1
commit 2ae2bead9a
5 changed files with 111 additions and 80 deletions

View file

@ -1,7 +1,7 @@
pkgbase = gstreamer
pkgdesc = Multimedia graph framework
pkgver = 1.24.9
pkgrel = 3
pkgver = 1.24.10
pkgrel = 1
url = https://gstreamer.freedesktop.org/
arch = x86_64
license = LGPL-2.1-or-later
@ -172,17 +172,19 @@ pkgbase = gstreamer
makedepends = zlib
makedepends = zvbi
makedepends = zxing-cpp
source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.9
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.9.tar.xz
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.9.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-x265enc-Unbreak-build-with-x265-4.0.patch
source = 0003-meson-Drop-max-version-bound-from-neon.patch
validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
b2sums = 53c72d3d88d48ab5bfe114f0d5ae8e224469811552000cba8952b8f64e8b283266bc6a397fc72586acce94439baba1a4b0ede17190e07eae83c2104ef6117461
b2sums = 45a454b6b53a16b89cf1e9bac5928f7886e666b0c82fa0cc9610a09bf35871424f291e8bdd1ae4f7fba6e18a8c98c846a2d8024b9df3ce3043e8074b912e58ff
b2sums = ce6bbb96c8e087c00a1a5cd2770bc92914aee0ecaf381117646e69f5010a40ecfc01bbc37ef5ca20596daddc179e369f4438bc7e64c78f7b7a1a51d475872db5
b2sums = 3b836b8cc3def12bf3aaf24a8432ab91de6946defe123adcc2f921d97055eee7c5b33920fa610195a8f8c8d5e036894f719202e107eddca3c2a5c4619ddec815
b2sums = SKIP
b2sums = b58019ca02e388925af02a98d6cc7b2c7f67692bb25b7d947f0759669c13027a069cbadd20c1119b98020085341199b5a7085ba32cc28777ed60bd2a2647d845
b2sums = 23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44
b2sums = e5cce5fbb667ef3008b7b762f8196c750037046f87a54529768ac5c147b69ebba729f5df53151fc05b7b311dcec95b5757ba85dc23a5f5fc2cbae2bd6d0d0ae4
b2sums = 94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348
b2sums = 9d6aee40cc1302a12c4db64a4eec216852bef009887fd5eccdb911a9b4daa99d038bed6bec020b3d7786ae51126f68d136a1f7bc5f28d32015caf8c6cd2f43a5
pkgname = gstreamer
pkgdesc = Multimedia graph framework - core
@ -197,8 +199,8 @@ pkgname = gstreamer
pkgname = gst-plugins-bad-libs
pkgdesc = Multimedia graph framework - bad
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -220,7 +222,7 @@ pkgname = gst-plugins-bad-libs
pkgname = gst-plugins-base-libs
pkgdesc = Multimedia graph framework - base
depends = gstreamer=1.24.9-3
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = iso-codes
@ -239,8 +241,8 @@ pkgname = gst-plugins-base-libs
pkgname = gst-plugins-base
pkgdesc = Multimedia graph framework - base plugins
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = alsa-lib
depends = cairo
depends = cdparanoia
@ -258,8 +260,8 @@ pkgname = gst-plugins-base
pkgname = gst-plugins-good
pkgdesc = Multimedia graph framework - good plugins
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = aalib
depends = bzip2
depends = cairo
@ -301,9 +303,9 @@ pkgname = gst-plugins-good
pkgname = gst-plugins-bad
pkgdesc = Multimedia graph framework - bad plugins
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = aom
depends = bzip2
depends = cairo
@ -372,8 +374,8 @@ pkgname = gst-plugins-bad
pkgname = gst-plugins-ugly
pkgdesc = Multimedia graph framework - ugly plugins
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = a52dec
depends = glib2
depends = glibc
@ -385,18 +387,18 @@ pkgname = gst-plugins-ugly
pkgname = gst-libav
pkgdesc = Multimedia graph framework - libav plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = ffmpeg
depends = glib2
depends = glibc
provides = gst-ffmpeg=1.24.9-3
provides = gst-ffmpeg=1.24.10-1
pkgname = gst-plugin-gtk
pkgdesc = Multimedia graph framework - gtk plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = cairo
depends = glib2
depends = glibc
@ -405,9 +407,9 @@ pkgname = gst-plugin-gtk
pkgname = gst-plugin-msdk
pkgdesc = Multimedia graph framework - msdk plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = libdrm
@ -417,9 +419,9 @@ pkgname = gst-plugin-msdk
pkgname = gst-plugin-onnx
pkgdesc = Multimedia graph framework - onnx plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -428,8 +430,8 @@ pkgname = gst-plugin-onnx
pkgname = gst-plugin-opencv
pkgdesc = Multimedia graph framework - opencv plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -437,8 +439,8 @@ pkgname = gst-plugin-opencv
pkgname = gst-plugin-qml6
pkgdesc = Multimedia graph framework - qml6 plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -449,8 +451,8 @@ pkgname = gst-plugin-qml6
pkgname = gst-plugin-qmlgl
pkgdesc = Multimedia graph framework - qmlgl plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -462,9 +464,9 @@ pkgname = gst-plugin-qmlgl
pkgname = gst-plugin-qsv
pkgdesc = Multimedia graph framework - qsv plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -473,9 +475,9 @@ pkgname = gst-plugin-qsv
pkgname = gst-plugin-va
pkgdesc = Multimedia graph framework - va plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = libgudev
@ -483,8 +485,8 @@ pkgname = gst-plugin-va
pkgname = gst-plugin-wpe
pkgdesc = Multimedia graph framework - wpe plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = gcc-libs
depends = glib2
depends = glibc
@ -496,8 +498,8 @@ pkgname = gst-plugin-wpe
pkgname = gst-devtools-libs
pkgdesc = Multimedia graph framework - development and debugging libraries
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = json-glib
@ -506,11 +508,11 @@ pkgname = gst-devtools-libs
pkgname = gst-devtools
pkgdesc = Multimedia graph framework - development and debugging tools
depends = gst-devtools-libs=1.24.9-3
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gst-rtsp-server=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-devtools-libs=1.24.10-1
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gst-rtsp-server=1.24.10-1
depends = gstreamer=1.24.10-1
depends = cairo
depends = glib2
depends = glibc
@ -524,8 +526,8 @@ pkgname = gst-devtools
pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = orc
@ -533,10 +535,10 @@ pkgname = gst-rtsp-server
pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services
depends = gst-devtools-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gst-python=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-devtools-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gst-python=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = json-glib
@ -549,9 +551,9 @@ pkgname = gst-editing-services
pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin
depends = gst-plugins-bad-libs=1.24.9-3
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-bad-libs=1.24.10-1
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = libglvnd
@ -563,8 +565,8 @@ pkgname = gstreamer-vaapi
pkgname = gst-python
pkgdesc = Multimedia graph framework - python plugin
depends = gst-plugins-base-libs=1.24.9-3
depends = gstreamer=1.24.9-3
depends = gst-plugins-base-libs=1.24.10-1
depends = gstreamer=1.24.10-1
depends = glib2
depends = glibc
depends = python

View file

@ -66,10 +66,10 @@ index ebc7f2e389fc..858e9c706c5f 100644
return s;
diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build
index 40006d09bde6..bcd667d52d97 100644
index 1e73b73dab02..d7d880d910d5 100644
--- a/subprojects/gst-plugins-bad/tests/check/meson.build
+++ b/subprojects/gst-plugins-bad/tests/check/meson.build
@@ -153,7 +153,6 @@ if host_machine.system() != 'windows'
@@ -152,7 +152,6 @@ if host_machine.system() != 'windows'
[['elements/jifmux.c'],
not exif_dep.found() or not cdata.has('HAVE_UNISTD_H'), [exif_dep]],
[['elements/jpegparse.c'], not cdata.has('HAVE_UNISTD_H')],
@ -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 1a8301f9e281..00ba3c45887a 100644
index 9ea15239f119..b0919dc01906 100644
--- a/subprojects/gstreamer-vaapi/meson.build
+++ b/subprojects/gstreamer-vaapi/meson.build
@@ -214,7 +214,6 @@ plugins = []

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

@ -37,8 +37,8 @@ pkgname=(
gst-python
gstreamer-docs
)
pkgver=1.24.9
pkgrel=3
pkgver=1.24.10
pkgrel=1
pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/"
arch=(x86_64)
@ -215,12 +215,14 @@ source=(
"https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc}
0001-HACK-meson-Disable-broken-tests.patch
0002-x265enc-Unbreak-build-with-x265-4.0.patch
0003-meson-Drop-max-version-bound-from-neon.patch
)
b2sums=('53c72d3d88d48ab5bfe114f0d5ae8e224469811552000cba8952b8f64e8b283266bc6a397fc72586acce94439baba1a4b0ede17190e07eae83c2104ef6117461'
'45a454b6b53a16b89cf1e9bac5928f7886e666b0c82fa0cc9610a09bf35871424f291e8bdd1ae4f7fba6e18a8c98c846a2d8024b9df3ce3043e8074b912e58ff'
b2sums=('ce6bbb96c8e087c00a1a5cd2770bc92914aee0ecaf381117646e69f5010a40ecfc01bbc37ef5ca20596daddc179e369f4438bc7e64c78f7b7a1a51d475872db5'
'3b836b8cc3def12bf3aaf24a8432ab91de6946defe123adcc2f921d97055eee7c5b33920fa610195a8f8c8d5e036894f719202e107eddca3c2a5c4619ddec815'
'SKIP'
'b58019ca02e388925af02a98d6cc7b2c7f67692bb25b7d947f0759669c13027a069cbadd20c1119b98020085341199b5a7085ba32cc28777ed60bd2a2647d845'
'23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44')
'e5cce5fbb667ef3008b7b762f8196c750037046f87a54529768ac5c147b69ebba729f5df53151fc05b7b311dcec95b5757ba85dc23a5f5fc2cbae2bd6d0d0ae4'
'94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348'
'9d6aee40cc1302a12c4db64a4eec216852bef009887fd5eccdb911a9b4daa99d038bed6bec020b3d7786ae51126f68d136a1f7bc5f28d32015caf8c6cd2f43a5')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
)
@ -233,6 +235,9 @@ prepare() {
# Fix build with x265 4.0
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() {