diff --git a/extra/gstreamer/.SRCINFO b/extra/gstreamer/.SRCINFO index 61357e68e..7bc8a1a11 100644 --- a/extra/gstreamer/.SRCINFO +++ b/extra/gstreamer/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = gstreamer pkgdesc = Multimedia graph framework - pkgver = 1.24.1 + pkgver = 1.24.2 pkgrel = 2 url = https://gstreamer.freedesktop.org/ arch = x86_64 @@ -133,17 +133,19 @@ pkgbase = gstreamer makedepends = libmpeg2 makedepends = x264 makedepends = ffmpeg + makedepends = opentimelineio makedepends = libxrandr makedepends = python-gobject - 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 + makedepends = python-setuptools + source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.2 + source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.2.tar.xz + source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.2.tar.xz.asc source = 0001-HACK-meson-Disable-broken-tests.patch validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C - b2sums = a91e46cf3757a825a060f75fcfd974ec65fcb0d24c96039ce79b481b1ea93e82a6e226f45fd0fae6421ccd2eb356871db670c93b32b3df2cba8b105d4e00cf19 - b2sums = 08cd34a70aa2b7afa43ab29b272d7b51f8074fc994e0c9b85b0674e38e08b451d2f2d65c89cbda311ce646ff26274fb5cd296dbf15da7fd6a89f9990d13fe4f2 + b2sums = b701d3804d955d217ffefb393488eecdca96e3e1275d7c6997e9bd8ec9155a2aea60faa459e40490b77a16c9031c4f89dd95e5bbb7d7ec4f4e105e090673c0ba + b2sums = b67e5d8c6fb52a794e2307a3944338342ed560895f8fac6876a92d1f81326c751ff5c6f7d6a11e2dde480d981db024fdc0ee4a1638c2af763b10a119887ace95 b2sums = SKIP - b2sums = 747019db064311d364696f747008c5d85bb0dc5120e837b1647fe2a3c4fe459eadcc818cf90de8e613b57a1d356204b8c356865df562b79972622b4c16b7de4b + b2sums = e7c59c828883a3bb3aa47684d83b57cd4d463e1f8cffc0383f779fa60ecbe37bfa30c8a0f40e6b2a01f6e0edfbefc5b7041340837e0018741e5963671945a1f2 pkgname = gstreamer pkgdesc = Multimedia graph framework - core @@ -157,7 +159,7 @@ pkgname = gstreamer pkgname = gst-plugins-bad-libs pkgdesc = Multimedia graph framework - bad - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = libdrm depends = libgudev depends = libnice @@ -171,7 +173,7 @@ pkgname = gst-plugins-bad-libs pkgname = gst-plugins-base-libs pkgdesc = Multimedia graph framework - base - depends = gstreamer=1.24.1 + depends = gstreamer=1.24.2 depends = iso-codes depends = libdrm depends = libgl @@ -184,7 +186,7 @@ pkgname = gst-plugins-base-libs pkgname = gst-plugins-base pkgdesc = Multimedia graph framework - base plugins - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = alsa-lib depends = cdparanoia depends = graphene @@ -197,7 +199,7 @@ pkgname = gst-plugins-base pkgname = gst-plugins-good pkgdesc = Multimedia graph framework - good plugins - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = aalib depends = cairo depends = flac @@ -227,7 +229,7 @@ pkgname = gst-plugins-good pkgname = gst-plugins-bad pkgdesc = Multimedia graph framework - bad plugins - depends = gst-plugins-bad-libs=1.24.1 + depends = gst-plugins-bad-libs=1.24.2 depends = aom depends = bzip2 depends = chromaprint @@ -289,50 +291,50 @@ pkgname = gst-plugins-bad pkgname = gst-plugin-gtk pkgdesc = Multimedia graph framework - gtk plugin - depends = gst-plugins-bad-libs=1.24.1 + depends = gst-plugins-bad-libs=1.24.2 depends = gtk3 pkgname = gst-plugin-msdk pkgdesc = Multimedia graph framework - msdk plugin - depends = gst-plugins-bad-libs=1.24.1 + depends = gst-plugins-bad-libs=1.24.2 depends = libvpl pkgname = gst-plugin-opencv pkgdesc = Multimedia graph framework - opencv plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = opencv pkgname = gst-plugin-qml6 pkgdesc = Multimedia graph framework - qml6 plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = qt6-declarative depends = qt6-wayland pkgname = gst-plugin-qmlgl pkgdesc = Multimedia graph framework - qmlgl plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 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.1 + depends = gst-plugins-bad-libs=1.24.2 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.1 + depends = gst-plugins-bad-libs=1.24.2 pkgname = gst-plugin-wpe pkgdesc = Multimedia graph framework - wpe plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = wpewebkit pkgname = gst-plugins-ugly pkgdesc = Multimedia graph framework - ugly plugins - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = a52dec depends = libcdio depends = libdvdread @@ -341,28 +343,43 @@ pkgname = gst-plugins-ugly pkgname = gst-libav pkgdesc = Multimedia graph framework - libav plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = bzip2 depends = ffmpeg - provides = gst-ffmpeg=1.24.1 + provides = gst-ffmpeg=1.24.2 + +pkgname = gst-devtools-libs + pkgdesc = Multimedia graph framework - development and debugging libraries + depends = gst-plugins-base-libs=1.24.2 + depends = json-glib + +pkgname = gst-devtools + pkgdesc = Multimedia graph framework - development and debugging tools + depends = gst-devtools-libs=1.24.2 + depends = gst-plugins-bad-libs=1.24.2 + depends = gst-rtsp-server=1.24.2 + depends = gtk3 + depends = python-gobject pkgname = gst-rtsp-server pkgdesc = Multimedia graph framework - rtsp server - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 pkgname = gst-editing-services pkgdesc = Multimedia graph framework - editing services - depends = gst-plugins-base-libs=1.24.1 - depends = python + depends = gst-devtools-libs=1.24.2 + depends = gst-plugins-base-libs=1.24.2 + depends = gst-python=1.24.2 + optdepends = opentimelineio: Support for the OpenTimelineIO format pkgname = gstreamer-vaapi pkgdesc = Multimedia graph framework - vaapi plugin - depends = gst-plugins-bad-libs=1.24.1 + depends = gst-plugins-bad-libs=1.24.2 depends = libxrandr pkgname = gst-python pkgdesc = Multimedia graph framework - python plugin - depends = gst-plugins-base-libs=1.24.1 + depends = gst-plugins-base-libs=1.24.2 depends = python-gobject pkgname = gstreamer-docs @@ -372,3 +389,5 @@ pkgname = gstreamer-docs license = LGPL-2.1-or-later license = MIT license = OPUBL-1.0 + options = !debug + options = !strip diff --git a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch index 97698ec48..26be422ae 100644 --- a/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch +++ b/extra/gstreamer/0001-HACK-meson-Disable-broken-tests.patch @@ -4,28 +4,29 @@ Date: Mon, 6 Jun 2022 00:30:08 +0200 Subject: [PATCH] HACK: meson: Disable broken tests --- - subprojects/gst-editing-services/meson.build | 1 - + subprojects/gst-editing-services/tests/check/meson.build | 2 -- subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c | 1 - subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c | 1 - + subprojects/gst-plugins-bad/tests/check/elements/lc3.c | 3 --- subprojects/gst-plugins-bad/tests/check/meson.build | 1 - + subprojects/gst-plugins-bad/tests/validate/meson.build | 3 --- + subprojects/gst-plugins-base/tests/validate/meson.build | 1 - subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 - - subprojects/gst-python/meson.build | 1 - - subprojects/gst-rtsp-server/tests/check/meson.build | 2 -- subprojects/gstreamer-vaapi/meson.build | 1 - - 8 files changed, 9 deletions(-) + 9 files changed, 14 deletions(-) -diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build -index 11c3aed9279b..2ce1f78b677e 100644 ---- a/subprojects/gst-editing-services/meson.build -+++ b/subprojects/gst-editing-services/meson.build -@@ -295,7 +295,6 @@ subdir('ges') - subdir('plugins') - subdir('tools') - --subdir('tests') - subdir('examples') - subdir('docs') +diff --git a/subprojects/gst-editing-services/tests/check/meson.build b/subprojects/gst-editing-services/tests/check/meson.build +index 784c592ba6f1..bbf9a2491a86 100644 +--- a/subprojects/gst-editing-services/tests/check/meson.build ++++ b/subprojects/gst-editing-services/tests/check/meson.build +@@ -144,7 +144,5 @@ if build_gir + env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs) + env.set('GI_TYPELIB_PATH', meson.current_build_dir() / '..' / '..' / 'ges') +- test('pythontests', runtests, args: ['--pyunittest-dir', meson.current_source_dir(), 'pyunittest', '--dump-on-failure'], +- env: env) + endif + endif diff --git a/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c b/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c index d0901d5b23df..62b3bba4b614 100644 --- a/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c @@ -50,11 +51,25 @@ index 1d347b0a54ea..1ee4babf36ae 100644 /* tests checking the MPD management * (eg. setting active streams, obtaining attributes values) +diff --git a/subprojects/gst-plugins-bad/tests/check/elements/lc3.c b/subprojects/gst-plugins-bad/tests/check/elements/lc3.c +index 5ee2ca1efaac..a6a692ee26a1 100644 +--- a/subprojects/gst-plugins-bad/tests/check/elements/lc3.c ++++ b/subprojects/gst-plugins-bad/tests/check/elements/lc3.c +@@ -429,9 +429,6 @@ lc3_suite (void) + TCase *tc_chain = tcase_create ("general"); + + suite_add_tcase (s, tc_chain); +- tcase_add_test (tc_chain, test_48k_8ch_10000us); +- tcase_add_test (tc_chain, test_48k_8ch_7500us); +- tcase_add_test (tc_chain, test_24k_4ch_10000us); + tcase_add_test (tc_chain, test_dec_plc); + + return s; diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build -index c21887d99ed1..4da79603f5bc 100644 +index 3c64a3641aa7..dc00f8d81b0a 100644 --- a/subprojects/gst-plugins-bad/tests/check/meson.build +++ b/subprojects/gst-plugins-bad/tests/check/meson.build -@@ -145,7 +145,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')], @@ -62,6 +77,38 @@ index c21887d99ed1..4da79603f5bc 100644 [['elements/shm.c'], not shm_enabled, shm_deps], [['elements/unixfd.c'], not gio_unix_dep.found()], [['elements/voaacenc.c'], +diff --git a/subprojects/gst-plugins-bad/tests/validate/meson.build b/subprojects/gst-plugins-bad/tests/validate/meson.build +index c09772a657f4..6dd292ea670a 100644 +--- a/subprojects/gst-plugins-bad/tests/validate/meson.build ++++ b/subprojects/gst-plugins-bad/tests/validate/meson.build +@@ -4,15 +4,12 @@ if not gst_tester.found() + endif + + tests = [ +- {'path': 'opencv/cvtracker'}, + {'path': 'testsrcbin/caps_spec'}, + {'path': 'codectimestamper/h264_propagate_caps'}, +- {'path': 'wpe/load_bytes_first', 'skip': not building_wpe}, + {'path': 'vtenc/vtenc_h264', 'skip': not applemedia_found_deps}, + {'path': 'vtenc/vtenc_h264_b_frames', 'skip': not applemedia_found_deps}, + {'path': 'vtenc/vtenc_h265', 'skip': not applemedia_found_deps}, + {'path': 'vtenc/vtenc_h265_b_frames', 'skip': not applemedia_found_deps}, +- {'path': 'autovideoconvert/renegotiate'}, + ] + + env = environment() +diff --git a/subprojects/gst-plugins-base/tests/validate/meson.build b/subprojects/gst-plugins-base/tests/validate/meson.build +index f732daae44c5..bc89d8caa676 100644 +--- a/subprojects/gst-plugins-base/tests/validate/meson.build ++++ b/subprojects/gst-plugins-base/tests/validate/meson.build +@@ -20,7 +20,6 @@ tests = [ + 'videorate/duplicate_on_eos', + 'videorate/duplicate_on_eos_disbaled', + 'videorate/duplicate_on_eos_half_sec', +- 'videorate/fill_segment_after_caps_changed_before_eos', + 'videorate/drop_out_of_segment', + 'compositor/renogotiate_failing_unsupported_src_format', + 'giosrc/read-growing-file', diff --git a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c b/subprojects/gst-plugins-good/tests/check/elements/flvmux.c index 6efa928fb09b..1f1950ef323d 100644 --- a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c @@ -74,33 +121,8 @@ index 6efa928fb09b..1f1950ef323d 100644 tcase_add_test (tc_chain, test_audio_caps_change_streamable); 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 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() - endif - endif - if not get_option('tests').disabled() -- subdir('testsuite') - endif -diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build -index 2112da396235..1cbcb861dcf4 100644 ---- a/subprojects/gst-rtsp-server/tests/check/meson.build -+++ b/subprojects/gst-rtsp-server/tests/check/meson.build -@@ -28,10 +28,8 @@ rtsp_server_tests = [ - 'gst/mediafactory', - 'gst/media', - 'gst/permissions', -- 'gst/rtspserver', - 'gst/sessionmedia', - 'gst/sessionpool', -- 'gst/stream', - 'gst/threadpool', - 'gst/token', - 'gst/onvif', diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build -index 145f67ae443b..d13ca08819e1 100644 +index c470158893f3..cee44f2e7480 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 c145181b3..8228ffee9 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -27,13 +27,15 @@ pkgname=( gst-plugin-wpe gst-plugins-ugly gst-libav + gst-devtools-libs + gst-devtools gst-rtsp-server gst-editing-services gstreamer-vaapi gst-python gstreamer-docs ) -pkgver=1.24.1 +pkgver=1.24.2 pkgrel=2 pkgdesc="Multimedia graph framework" url="https://gstreamer.freedesktop.org/" @@ -74,11 +76,14 @@ makedepends=( # gst-libav ffmpeg + # gst-editing-services + opentimelineio + # gstreamer-vaapi libxrandr # gst-python - python-gobject + python-gobject python-setuptools ) checkdepends=(xorg-server-xvfb) source=( @@ -86,10 +91,10 @@ source=( "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc} 0001-HACK-meson-Disable-broken-tests.patch ) -b2sums=('a91e46cf3757a825a060f75fcfd974ec65fcb0d24c96039ce79b481b1ea93e82a6e226f45fd0fae6421ccd2eb356871db670c93b32b3df2cba8b105d4e00cf19' - '08cd34a70aa2b7afa43ab29b272d7b51f8074fc994e0c9b85b0674e38e08b451d2f2d65c89cbda311ce646ff26274fb5cd296dbf15da7fd6a89f9990d13fe4f2' +b2sums=('b701d3804d955d217ffefb393488eecdca96e3e1275d7c6997e9bd8ec9155a2aea60faa459e40490b77a16c9031c4f89dd95e5bbb7d7ec4f4e105e090673c0ba' + 'b67e5d8c6fb52a794e2307a3944338342ed560895f8fac6876a92d1f81326c751ff5c6f7d6a11e2dde480d981db024fdc0ee4a1638c2af763b10a119887ace95' 'SKIP' - '747019db064311d364696f747008c5d85bb0dc5120e837b1647fe2a3c4fe459eadcc818cf90de8e613b57a1d356204b8c356865df562b79972622b4c16b7de4b') + 'e7c59c828883a3bb3aa47684d83b57cd4d463e1f8cffc0383f779fa60ecbe37bfa30c8a0f40e6b2a01f6e0edfbefc5b7041340837e0018741e5963671945a1f2') validpgpkeys=( D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller ) @@ -104,7 +109,6 @@ prepare() { build() { local meson_options=( # Superproject options - -D devtools=disabled -D examples=disabled -D gobject-cast-checks=disabled -D gpl=enabled @@ -149,7 +153,7 @@ build() { -D gst-plugins-bad:wic=disabled -D gst-plugins-bad:win32ipc=disabled -D gst-plugins-ugly:sidplay=disabled - -D gst-editing-services:validate=disabled + -D gst-devtools:debug_viewer=enabled ) # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3197 @@ -164,6 +168,8 @@ check() ( export XDG_RUNTIME_DIR="$PWD/runtime-dir" mkdir -p -m 700 "$XDG_RUNTIME_DIR" + export NO_AT_BRIDGE=1 GTK_A11Y=none + # Flaky due to timeouts xvfb-run -s '-nolisten local' \ meson test -C build --print-errorlogs -t 5 @@ -681,6 +687,47 @@ package_gst-libav() { ); _install } +package_gst-devtools-libs() { + pkgdesc+=" - development and debugging libraries" + depends=( + "gst-plugins-base-libs=$pkgver" + json-glib + ) + + cd root; local files=( + usr/include/gstreamer-1.0/gst/validate + usr/lib/libgstvalidate-* + usr/lib/pkgconfig/gstreamer-validate-1.0.pc + usr/lib/girepository-1.0/GstValidate-1.0.typelib + usr/share/gir-1.0/GstValidate-1.0.gir + ); _install +} + +package_gst-devtools() { + pkgdesc+=" - development and debugging tools" + depends=( + "gst-devtools-libs=$pkgver" + "gst-plugins-bad-libs=$pkgver" + "gst-rtsp-server=$pkgver" + gtk3 python-gobject + ) + + cd root; local files=( + usr/bin/gst-validate-* + usr/lib/gst-validate-launcher + usr/lib/gstreamer-1.0/libgstvalidatetracer.so + usr/lib/gstreamer-1.0/validate + usr/share/gstreamer-1.0/validate + + usr/bin/gst-debug-viewer + usr/lib/python*/site-packages/GstDebugViewer + usr/share/applications/org.freedesktop.GstDebugViewer.desktop + usr/share/gst-debug-viewer + usr/share/icons/hicolor/*/apps/gst-debug-viewer.* + usr/share/metainfo/org.freedesktop.GstDebugViewer.appdata.xml + ); _install +} + package_gst-rtsp-server() { pkgdesc+=" - rtsp server" depends=("gst-plugins-base-libs=$pkgver") @@ -699,8 +746,12 @@ package_gst-rtsp-server() { package_gst-editing-services() { pkgdesc+=" - editing services" depends=( + "gst-devtools-libs=$pkgver" "gst-plugins-base-libs=$pkgver" - python + "gst-python=$pkgver" + ) + optdepends=( + 'opentimelineio: Support for the OpenTimelineIO format' ) cd root; local files=( @@ -757,6 +808,10 @@ package_gstreamer-docs() { MIT OPUBL-1.0 ) + options=( + !debug + !strip + ) # make sure there are no files left to install find root -depth ! -type d