Date: Friday, February 17, 2023 @ 19:14:58 Author: arojas Revision: 1402280
upgpkg: lib32-gstreamer 1.22.0-1: Update to 1.22.0 Added: lib32-gstreamer/trunk/0002-HACK-meson-Disable-broken-tests.patch Modified: lib32-gstreamer/trunk/PKGBUILD Deleted: lib32-gstreamer/trunk/0001-meson-Allow-building-with-system-orc.patch lib32-gstreamer/trunk/0002-HACK-meson-Disable-broken-tests.patch lib32-gstreamer/trunk/0003-HACK-meson-Work-around-broken-detection-of-underscor.patch -----------------------------------------------------------------+ 0001-meson-Allow-building-with-system-orc.patch | 28 -- 0002-HACK-meson-Disable-broken-tests.patch | 116 +++++----- 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch | 24 -- PKGBUILD | 23 - 4 files changed, 64 insertions(+), 127 deletions(-) Deleted: 0001-meson-Allow-building-with-system-orc.patch =================================================================== --- 0001-meson-Allow-building-with-system-orc.patch 2023-02-17 18:50:04 UTC (rev 1402279) +++ 0001-meson-Allow-building-with-system-orc.patch 2023-02-17 19:14:58 UTC (rev 1402280) @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Mon, 6 Jun 2022 00:29:08 +0200 -Subject: [PATCH] meson: Allow building with system orc - ---- - meson.build | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 617ba8a41461..509565e90891 100644 ---- a/meson.build -+++ b/meson.build -@@ -112,7 +112,13 @@ elif build_system == 'darwin' - subproject('macos-bison-binary') - endif - --orc_subproject = subproject('orc', required: get_option('orc')) -+orc_subproject_required = get_option('orc') -+if orc_subproject_required.allowed() -+ # Download if possible, otherwise use system orc -+ orc_subproject_required = false -+endif -+ -+orc_subproject = subproject('orc', required: orc_subproject_required) - - foreach custom_subproj: get_option('custom_subprojects').split(',') - if custom_subproj != '' Deleted: 0002-HACK-meson-Disable-broken-tests.patch =================================================================== --- 0002-HACK-meson-Disable-broken-tests.patch 2023-02-17 18:50:04 UTC (rev 1402279) +++ 0002-HACK-meson-Disable-broken-tests.patch 2023-02-17 19:14:58 UTC (rev 1402280) @@ -1,58 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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-python/meson.build | 1 - - subprojects/gst-rtsp-server/tests/check/meson.build | 1 - - subprojects/gstreamer-vaapi/meson.build | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build -index 1a4a29b3657f..857290baf35f 100644 ---- a/subprojects/gst-editing-services/meson.build -+++ b/subprojects/gst-editing-services/meson.build -@@ -274,7 +274,6 @@ subdir('plugins') - if not get_option('tools').disabled() - subdir('tools') - endif --subdir('tests') - if not get_option('examples').disabled() - subdir('examples') - endif -diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build -index dce5982e59d7..ed51d7e88f36 100644 ---- a/subprojects/gst-python/meson.build -+++ b/subprojects/gst-python/meson.build -@@ -104,5 +104,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 229af32f8117..b9372c125d77 100644 ---- a/subprojects/gst-rtsp-server/tests/check/meson.build -+++ b/subprojects/gst-rtsp-server/tests/check/meson.build -@@ -27,7 +27,6 @@ rtsp_server_tests = [ - 'gst/mediafactory', - 'gst/media', - 'gst/permissions', -- 'gst/rtspserver', - 'gst/sessionmedia', - 'gst/sessionpool', - 'gst/stream', -diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build -index 702441cb7b5c..9fff27ce91b9 100644 ---- a/subprojects/gstreamer-vaapi/meson.build -+++ b/subprojects/gstreamer-vaapi/meson.build -@@ -202,7 +202,6 @@ plugins = [] - - subdir('gst-libs') - subdir('gst') --subdir('tests') - subdir('docs') - - # Set release date Added: 0002-HACK-meson-Disable-broken-tests.patch =================================================================== --- 0002-HACK-meson-Disable-broken-tests.patch (rev 0) +++ 0002-HACK-meson-Disable-broken-tests.patch 2023-02-17 19:14:58 UTC (rev 1402280) @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +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-python/meson.build | 1 - + subprojects/gst-rtsp-server/tests/check/meson.build | 1 - + subprojects/gstreamer-vaapi/meson.build | 1 - + 4 files changed, 4 deletions(-) + +diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build +index f97b65bfcbc4..c70d6a035355 100644 +--- a/subprojects/gst-editing-services/meson.build ++++ b/subprojects/gst-editing-services/meson.build +@@ -270,7 +270,6 @@ subdir('ges') + subdir('plugins') + subdir('tools') + +-subdir('tests') + if not get_option('examples').disabled() + subdir('examples') + endif +diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build +index d3d472fe0fdb..c1825e49f64d 100644 +--- a/subprojects/gst-python/meson.build ++++ b/subprojects/gst-python/meson.build +@@ -106,5 +106,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 229af32f8117..b9372c125d77 100644 +--- a/subprojects/gst-rtsp-server/tests/check/meson.build ++++ b/subprojects/gst-rtsp-server/tests/check/meson.build +@@ -27,7 +27,6 @@ rtsp_server_tests = [ + 'gst/mediafactory', + 'gst/media', + 'gst/permissions', +- 'gst/rtspserver', + 'gst/sessionmedia', + 'gst/sessionpool', + 'gst/stream', +diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build +index 9cd3fcf19cb7..4f8e6d27f9a3 100644 +--- a/subprojects/gstreamer-vaapi/meson.build ++++ b/subprojects/gstreamer-vaapi/meson.build +@@ -219,7 +219,6 @@ plugins = [] + + subdir('gst-libs') + subdir('gst') +-subdir('tests') + subdir('docs') + + # Set release date Deleted: 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch =================================================================== --- 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch 2023-02-17 18:50:04 UTC (rev 1402279) +++ 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch 2023-02-17 19:14:58 UTC (rev 1402280) @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Mon, 6 Jun 2022 00:30:08 +0200 -Subject: [PATCH] HACK: meson: Work around broken detection of underscore - prefixes - -See: https://github.com/mesonbuild/meson/issues/5482 ---- - subprojects/gst-plugins-good/gst/deinterlace/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/subprojects/gst-plugins-good/gst/deinterlace/meson.build b/subprojects/gst-plugins-good/gst/deinterlace/meson.build -index e86bebe613fc..96a961107ab6 100644 ---- a/subprojects/gst-plugins-good/gst/deinterlace/meson.build -+++ b/subprojects/gst-plugins-good/gst/deinterlace/meson.build -@@ -54,8 +54,6 @@ if have_nasm and host_cpu == 'x86_64' - # https://github.com/mesonbuild/meson/issues/5482 - if ['darwin', 'ios'].contains(host_system) - asm_prefix_def = '-DPREFIX' -- elif cc.symbols_have_underscore_prefix() -- asm_prefix_def = '-DPREFIX' - else - asm_prefix_def = '-UPREFIX' - endif Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-17 18:50:04 UTC (rev 1402279) +++ PKGBUILD 2023-02-17 19:14:58 UTC (rev 1402280) @@ -3,7 +3,7 @@ pkgbase=lib32-gstreamer pkgname=(lib32-gstreamer lib32-gst-plugins-base-libs lib32-gst-plugins-base lib32-gst-plugins-good) -pkgver=1.20.5 +pkgver=1.22.0 pkgrel=1 pkgdesc="Multimedia graph framework (32-bit)" url="https://gstreamer.freedesktop.org/"; @@ -14,17 +14,12 @@ lib32-aalib lib32-cairo lib32-flac lib32-gdk-pixbuf2 lib32-jack lib32-libavc1394 lib32-libcaca lib32-libdv lib32-libgudev lib32-libiec61883 lib32-libpulse lib32-libraw1394 lib32-libshout lib32-libsoup3 lib32-libvpx lib32-libxdamage lib32-mpg123 lib32-speex lib32-taglib lib32-twolame lib32-v4l-utils lib32-wavpack) checkdepends=(xorg-server-xvfb) -_commit=f7806a854aad960eae3288db4a67a574f92428fe # tags/1.20.5^0 source=( - "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git#commit=$_commit"; - 0001-meson-Allow-building-with-system-orc.patch + "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver"; 0002-HACK-meson-Disable-broken-tests.patch - 0003-HACK-meson-Work-around-broken-detection-of-underscor.patch ) sha256sums=('SKIP' - '292edebc224557db08404b0d53e2824413f0aad2a99c991de2cb8ccc6e9a7683' - '11971a978e37fda3822f95fb61b59ba3ded6487066dc59fcbde7b72a3a9cfe70' - '79d3038a0ba0c3958ffa8b5aec8431336b372906c07c0c878c3767bec0acb46f') + '9fda6342fb1cbb29dab7ac46e277eee7272b119efee770e72e7d972621fc1e7e') validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <[email protected]> pkgver() { @@ -35,15 +30,8 @@ prepare() { cd gstreamer - # Fix linking with system orc - git apply -3 ../0001-meson-Allow-building-with-system-orc.patch - # Disable broken tests git apply -3 ../0002-HACK-meson-Disable-broken-tests.patch - - # Workaround broken detection of underscore prefixes - # https://github.com/mesonbuild/meson/issues/5482 - git apply -3 ../0003-HACK-meson-Work-around-broken-detection-of-underscor.patch } build() { @@ -65,6 +53,7 @@ -D libav=disabled -D libnice=disabled -D omx=disabled + -D orc-source=system -D python=disabled -D qt5=disabled -D rs=disabled @@ -87,6 +76,7 @@ -D gst-plugins-good:lame=disabled -D gst-plugins-good:package-name="Arch Linux lib32-gst-plugins-good $pkgver-$pkgrel" -D gst-plugins-good:package-origin="https://www.archlinux.org/"; + -D gst-plugins-good:qt6=disabled -D gst-plugins-good:rpicamsrc=disabled ) @@ -166,9 +156,8 @@ usr/lib32/gstreamer-1.0/libgstsubparse.so usr/lib32/gstreamer-1.0/libgsttcp.so usr/lib32/gstreamer-1.0/libgsttypefindfunctions.so - usr/lib32/gstreamer-1.0/libgstvideoconvert.so + usr/lib32/gstreamer-1.0/libgstvideoconvertscale.so usr/lib32/gstreamer-1.0/libgstvideorate.so - usr/lib32/gstreamer-1.0/libgstvideoscale.so usr/lib32/gstreamer-1.0/libgstvideotestsrc.so usr/lib32/gstreamer-1.0/libgstvolume.so usr/lib32/gstreamer-1.0/libgstximagesink.so
