gentoo auto-resync : 09:06:2023 - 15:48:36

3 files changed, 78 insertions, 2 deletions

diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index d7fdf042c461..86a571ef4239 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,3 +1,4 @@
+AUX gst-plugins-base-1.20.6-libs_allocators.patch 2382 BLAKE2B b332ff3ad81b99da5447193615eda91c532335d789d2244b1288a16cac2239bb3585f8c803efb3eabd318780717b8bce517954274a6dc65c395738eb2cddac00 SHA512 8e791c901884f7eb3dfb67c1d5ffdcd62997fc68dd950a53a0ad9f16544c99d6b46eb822710badbe81b41522340a219412d767dd945c38b60d5ec2a6d061c8a0
 DIST gst-plugins-base-1.20.3.tar.xz 3299976 BLAKE2B b397867561df763d5e762069c6ad20298857d4a30727a18a60e8df9a53658e52f6a189c3426d0f51a16e7cee1834b402470ecb0284aca65ecaa0300dc79d0c8a SHA512 258294291cb9b406c17dfe4e5c1ca9061580d0789293355c9b43d558630d360097b6867287edf1688f3edaf50b5900cdd177c1429c122a0415c56da8b0f21ed1
 DIST gst-plugins-base-1.20.4.tar.xz 3307224 BLAKE2B f6e9bd3366a4a8213c1447433f13a8e432d749df250216fed37453ac291c35340114edf8113fb790d9c947793ac97185e44dd5f130be1cfc699800214e87dd87 SHA512 4a5d8ce8b2a530065e65842f7a0c7b6b63744e584baff0e795863d9967beb43c086a1d5f551702a9f1ac20e0ed4ce9bc4cf4e811a949c459c258ae5eee1426c9
 DIST gst-plugins-base-1.20.5.tar.xz 3312340 BLAKE2B 299ecef5ee872a3ed9904faede8fa81eb25fd78912a66106787c5f0c64c25880ed606593276cb08717a2b4637a70c1815956bafb0139747ea6f2cef7abbefb76 SHA512 63710fd44b26c026d8c6a572df369593809adbe5484ae12774208efb3d335e9b79c512a324464a4b76607a7503b4b89fca7f10bbb07843b7c69d559fb760b550
@@ -6,6 +7,6 @@ DIST gst-plugins-base-1.22.3.tar.xz 2353512 BLAKE2B 77b6b09b2a295a6f68b19c3e5ed2
 EBUILD gst-plugins-base-1.20.3.ebuild 5568 BLAKE2B a429af2eb73851f77393282ceea58b0d4b574df79fb7a4a8588476e39e1652375b4fe23963d0caef3b4b653d2b068c5549c4a42b527840f23586b1deba8a5204 SHA512 4a2ed8de621c4cc8365df59c2926cceec6f060b3bebd923363949f45e9c1159602069ac89a502c26e3258c61bd258b54a062948d42a10af787bb1824163d1254
 EBUILD gst-plugins-base-1.20.4.ebuild 5728 BLAKE2B 87ec089d447b7365061d7d2324b2bb45988d605126f56316c75ff743d0ed721083162326f27fa8a2421e95a444e397a3e2db6f42a1b6726f99ddd86f4ff8bef8 SHA512 cbe3a93a1f04ad3aa2d73616bf3dfc1d8bdc9066bb793383baf3b04c1ae6061f76e30c1d12f58854d94765e8f04cd91a9912bce906a7a20a04d1bad1aed8ddeb
 EBUILD gst-plugins-base-1.20.5.ebuild 5734 BLAKE2B 9d68a2d4dacac44a8abc9183e867f3457d7a3c1d262261b881c00e90d9a5843b0175caeab1a6926dafba2ee60f648872b85e79cf22a1a3f7f667674d6eed92d6 SHA512 fb133b1bd7f0df056985f7d144e6d880ea71d700106bc94faffb3c95a5196d0537763a331530537a48aeadded8249d38fa1f84537a4db2e908a93ca3cd3d5c82
-EBUILD gst-plugins-base-1.20.6.ebuild 5734 BLAKE2B 9d68a2d4dacac44a8abc9183e867f3457d7a3c1d262261b881c00e90d9a5843b0175caeab1a6926dafba2ee60f648872b85e79cf22a1a3f7f667674d6eed92d6 SHA512 fb133b1bd7f0df056985f7d144e6d880ea71d700106bc94faffb3c95a5196d0537763a331530537a48aeadded8249d38fa1f84537a4db2e908a93ca3cd3d5c82
+EBUILD gst-plugins-base-1.20.6.ebuild 5721 BLAKE2B fd0f77d89e0ac868432abe1cbaeb69df7f5b673bd90819225081e6eca967d0b00de7e65fc19c5472348b56030c15523d5244963e81cb7ed0bb3a9a6e5e35fd0d SHA512 66cac198158de89824a7842f3cbc5c3e0ba51f45c4056d9d07365bca24cf336a50e61a4475494c80d029d22e544856a50022f4599358cbe8e1a17d71dca6bfe2
 EBUILD gst-plugins-base-1.22.3.ebuild 5574 BLAKE2B d25488ca77653ad749739081d173a5f10c6c2958a4a257cf204d2fa4f4a0a07ad83c3366c77755045c0e61f1c47b7fe003b4d7494e79c6a280585590bc85309f SHA512 b0afe1060fa1e441a84f9220bb0f8560b4c4ef7694e71f898103a7240b6aa8bfe37a580a24ba3b681d74701adb1fb077e9aeb8168bde2953ec61413e5741580b
 MISC metadata.xml 1066 BLAKE2B 1d67f7f75e3f44459adfce03a6ab85a8c7d6a0b24ae83ef48d6b80c1d64845edb1ec5e7cbbb002585eb91663210025707887f5eff66eee41b14e0afcbdc0b4fd SHA512 227960f7c740d5131c1006854273d4b1047a3ceba07d5eda3d60c0f5baba4e8ed9926fab1737e1f97c5745f87f80fcddbdc7e239f5f2942902c92f8053074931
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch
new file mode 100644
index 000000000000..44e4c1d388a7
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.20.6-libs_allocators.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/907415
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2487
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2480
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4422
+
+From a299399f5c93737bf963e34543578dba098b2f50 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Mon, 10 Apr 2023 16:06:19 +0200
+Subject: [PATCH] tests: allocators: Fix fdmem test with recent GLib
+
+The test failed with recent GLib, where `g_close` emits a critical
+warning on EBADF. Remove the `g_close` check from `test_fdmem` and add
+another version that tests `GST_FD_MEMORY_FLAG_DONT_CLOSE`.
+
+We will depend on the Valgrind test run to warn us about leaked FDs.
+
+Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2480
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4422>
+--- a/tests/check/libs/allocators.c
++++ b/tests/check/libs/allocators.c
+@@ -95,7 +95,43 @@ GST_START_TEST (test_fdmem)
+   gst_memory_unmap (mem, &info);
+ 
+   gst_memory_unref (mem);
+-  fail_unless (g_close (fd, NULL) == 0);
++  gst_object_unref (alloc);
++}
++
++GST_END_TEST;
++
++GST_START_TEST (test_fdmem_dont_close)
++{
++  GstAllocator *alloc;
++  GstMemory *mem;
++  GstMapInfo info;
++  GError *error = NULL;
++  int fd;
++  const char *data = "0123456789";
++
++  fd = g_file_open_tmp (NULL, NULL, &error);
++  fail_if (error);
++  fail_unless (write (fd, data, 10) == 10);
++
++  alloc = gst_fd_allocator_new ();
++  fail_unless (alloc);
++  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));
+   gst_object_unref (alloc);
+ }
+ 
+@@ -110,6 +146,7 @@ allocators_suite (void)
+   suite_add_tcase (s, tc_chain);
+   tcase_add_test (tc_chain, test_dmabuf);
+   tcase_add_test (tc_chain, test_fdmem);
++  tcase_add_test (tc_chain, test_fdmem_dont_close);
+ 
+   return s;
+ }
+-- 
+GitLab
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
index b0cc01a91253..385496ed679e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.6.ebuild
@@ -93,8 +93,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README.md RELEASE )
 
-# Fixes backported to 1.20.1, to be removed in 1.20.2+
 PATCHES=(
+	"${FILESDIR}"/${P}-libs_allocators.patch
 )
 
 multilib_src_configure() {