Date: Monday, April 10, 2023 @ 14:32:32 Author: heftig Revision: 473800
1.22.1-3: py 3.11 rebuild Added: gstreamer/trunk/0004-tests-allocators-Fix-fdmem-test.patch Modified: gstreamer/trunk/PKGBUILD --------------------------------------------+ 0004-tests-allocators-Fix-fdmem-test.patch | 42 +++++++++++++++++++++++++++ PKGBUILD | 11 +++++-- 2 files changed, 50 insertions(+), 3 deletions(-) Added: 0004-tests-allocators-Fix-fdmem-test.patch =================================================================== --- 0004-tests-allocators-Fix-fdmem-test.patch (rev 0) +++ 0004-tests-allocators-Fix-fdmem-test.patch 2023-04-10 14:32:32 UTC (rev 473800) @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Mon, 10 Apr 2023 16:06:19 +0200 +Subject: [PATCH] tests: allocators: Fix fdmem test + +Since the test wants to close the FD itself, we need to tell the FD +allocator not to. Otherwise the test will fail with recent GLib, which +emits a critical warning on EBADF. +--- + subprojects/gst-plugins-base/tests/check/libs/allocators.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/subprojects/gst-plugins-base/tests/check/libs/allocators.c b/subprojects/gst-plugins-base/tests/check/libs/allocators.c +index 6b974b2900e9..da08ae0176fc 100644 +--- a/subprojects/gst-plugins-base/tests/check/libs/allocators.c ++++ b/subprojects/gst-plugins-base/tests/check/libs/allocators.c +@@ -80,22 +80,23 @@ GST_START_TEST (test_fdmem) + + alloc = gst_fd_allocator_new (); + fail_unless (alloc); +- mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED); ++ mem = gst_fd_allocator_alloc (alloc, fd, 10, ++ GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE); + + fail_unless (gst_memory_map (mem, &info, GST_MAP_READ)); + fail_unless (info.data[5] == '5'); + gst_memory_unmap (mem, &info); + + fail_unless (gst_memory_map (mem, &info, GST_MAP_WRITE)); + info.data[5] = 'X'; + gst_memory_unmap (mem, &info); + + fail_unless (gst_memory_map (mem, &info, GST_MAP_READ)); + fail_unless (info.data[5] == 'X'); + gst_memory_unmap (mem, &info); + + gst_memory_unref (mem); +- fail_unless (g_close (fd, NULL) == 0); ++ fail_unless (g_close (fd, NULL)); + gst_object_unref (alloc); + } + Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-10 14:12:36 UTC (rev 473799) +++ PKGBUILD 2023-04-10 14:32:32 UTC (rev 473800) @@ -26,7 +26,7 @@ gstreamer-docs ) pkgver=1.22.1 -pkgrel=2 +pkgrel=3 pkgdesc="Multimedia graph framework" url="https://gstreamer.freedesktop.org/"; arch=(x86_64) @@ -76,6 +76,7 @@ 0001-HACK-meson-Disable-broken-tests.patch 0002-zxing-update-to-2.0.0-tag.patch 0003-imagesequencesrc-Properly-set-default-location.patch + 0004-tests-allocators-Fix-fdmem-test.patch ) b2sums=('SKIP' '9f8e55732a60aebc8f0f50ba41ef06a739c80290f552f19c80ce71206e1094aadec5dcc57c908a277b33770f505b8f6b6e0e196abc8237778a3d4880bcd6d89a' @@ -82,7 +83,8 @@ 'SKIP' '7fa36829d5ebfb7b673a0fc36b8606d7e8e23975158e59406e9e31c2d82a6c774221b21ae6a49ef234f109e3a352ca04bf50d15f0e66b30667dd5df8cb80bc48' '9934ab83fb55e2c8b48ede8d1d018d3757725dc869bb9fe20bd66982d04ca164f41a07968c83105be96e4262fd05d9917ed365cd7eb360259174ee9ba6d8f1ad' - 'fd5bfeaf5a08f225bfb81df1beac55c3d7332aa4ffb1ba0a3e662dccea6b5ca43eecee92578c54d2fc1e3aa2edc73eb09a02e9c0a8ac3ad2002995a6a0396fa2') + 'fd5bfeaf5a08f225bfb81df1beac55c3d7332aa4ffb1ba0a3e662dccea6b5ca43eecee92578c54d2fc1e3aa2edc73eb09a02e9c0a8ac3ad2002995a6a0396fa2' + '6ff8ca454f9b4778c62163364ecda8346516de92f28cbeaa7ccb63010232e09cdc8c6cbcaa9cec7627cf03e434d78fba29b7e9e86aaf7101ba3c80b8527d720f') validpgpkeys=(D637032E45B8C6585B9456565D2EEE6F6F349D7C) # Tim Müller <[email protected]> prepare() { @@ -96,6 +98,9 @@ # Fix crash git apply -3 ../0003-imagesequencesrc-Properly-set-default-location.patch + + # Fix fdmem test + git apply -3 ../0004-tests-allocators-Fix-fdmem-test.patch } build() { @@ -161,7 +166,7 @@ # Flaky due to timeouts xvfb-run -s '-nolisten local' \ - meson test -C build --print-errorlogs -t 3 + meson test -C build --print-errorlogs -t 3 --num-processes 4 ) _install() {
