gentoo auto-resync : 21:03:2024 - 07:00:13

3 files changed, 301 insertions, 1 deletions

diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 20b5c16150e8..6145a91839fc 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,10 +1,11 @@
 AUX pulseaudio-16.1-memfd-cleanup.patch 988 BLAKE2B cbb25ef86099e1c13bd07c33c871b38d2d21015759569f6ed51c7f04a4997e85e3926ea573e76699d3615744ebfa3fd7cab20e3cb0a6a53f11975c0cd3314ef1 SHA512 62029ff446d005fb0d47b3c88694e0d4497321a8967802de2e915b5a885f596354310e6f5f5805cb352dbdf8a9339beca67377447a69b64c1916b4c3e6f14e31
 AUX pulseaudio-16.1-proplist-util-without-gdkx.patch 1486 BLAKE2B 74b6ed59dff2ab4c62bab9e218874ff4da1d651f8ff80d715965b7be61323d77436851f6f2ffb9f8667c9ee918d6eca315fea3f6fe2670798f1ef6ed58728a3c SHA512 a5b5ac40083237ea0cd916506eb490891937affc1d69f81399a6a1f8f0782ebe9654641463ab33931add749282880ab415dbf0f89bd1a1d6a0f88f2845886d13
 AUX pulseaudio-16.99.1-memfd-compat.patch 971 BLAKE2B 6228f8b01cd8799221d5e121a8c1bc2f3635acebf2c75f1538abf88f2f717da93c3d90ebee038a5fb3bfe8d015c6d3a4f5d6e20026eb44b889fde3d45f6c6769 SHA512 498f86291cb5837494a6b698ea7590ae778edf58ca9b82d58b2d93e30f5e424b93f3ecf8a0a203817eba7bcea7702bf3f1a6cdd346b02088f1748cd1231787bf
+AUX pulseaudio-17.0-backport-pr807.patch 10732 BLAKE2B a1a3129ff5d95c190f15dc0a32c21185e7c1c5e0784b565bc00d994b41202a4a609db92d8b67a77f9d55d6f9e7df2decdf58dbe2affc81c7dfe4009d80af33a8 SHA512 a03b46640c76ae2029374ee18cbb485a7d7866412b974c34f65a760525fc2346b39186fd0ac8ed905754547a775d7419844d07304aa36de73c29f9f4fd11acb7
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2
 DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97
 EBUILD libpulse-16.1-r2.ebuild 5882 BLAKE2B 82a1b54af068c843e675d0c1e1caae6b658aed9ba84cf47813a404509eabcd10fa76cc571c3c8f1a47849b0afacb5e77bf6f8302efa1b251ab390471b0a17906 SHA512 d5ea7bdc3720b275ddc637f7ed5e60da10386cfb92bc124369d24a35cf334a0da3784cc7cd9ae6c5792bca1d2c0f83bdf4afa642cb0b88aa8c5c48410f8439cb
 EBUILD libpulse-16.99.1.ebuild 6149 BLAKE2B 37a350786d2d957805df97a41692a7eb013c45700ff82bbf7b8e9a79cde0c53af7d8088f24e6c7ec4b783b87dc715c2b8fa1b8e0c10b77d72e5d5a00712aafe2 SHA512 292d971ae96757462068c1b7c83b2bff54a27ecbdac0c7dd8740c47d83318a8bf84e09ca710c1acec9d46fb88088936b3e6fb7a6c585cf4ead5fc7ec5adc28fd
-EBUILD libpulse-17.0.ebuild 5840 BLAKE2B 19d0ee3e1a8f161c047dc0baf568f232eb9ad8236a4f00c57809700f4ba36dbd3c8f5bd71d150c4d1d60dd2a982dd7897842b4673d33810e46390a21792a036c SHA512 0b27f550770ecc736ee4bf237ff7350e181e8823a45c4516b636386a4bb2b5e99d0ed7ab4b519e4a80adf80fcd2b960a7303d1147307a9c50204bb2ea3e3d89c
+EBUILD libpulse-17.0.ebuild 5892 BLAKE2B 3cd9a55afd278b601e765a33c28c37553dad380a6b73874cb4ed587797d73a63659b3a086309aaf987c098b06ab0f7d361601dc770dd513b4319d99d9f1773f1 SHA512 81e30acfdb2a4383efded76fbfb87e253d3a26fc0674493897870d25ca1b012b435ad125a4c95a2b35c15e2bc2b207603d000090d8a3b61f1d5feb4fc29e5cb6
 MISC metadata.xml 961 BLAKE2B 0aea6824645ccb54d4da477c5f65728abe5100176c5bb05f30c30704b0209f83dccda23380de7231a5fc0a5ffb31650c96d024b4d0511ced9806fc5652f51f9f SHA512 408206d9da60312898a87c2b400292178bd20b57b7a17b74e768c154ec3fc95f9ec9412ba497a03b32558e8ffaa21e8a50b0478c8908930f90ecd9b6aa81548e
diff --git a/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
new file mode 100644
index 000000000000..0506e6b05577
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
@@ -0,0 +1,298 @@
+https://bugs.gentoo.org/918447
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807
+
+From 26ccd1167a6188fb28745f3f5c9940657f64343c Mon Sep 17 00:00:00 2001
+From: matoro <75928-matoro1@users.noreply.gitlab.freedesktop.org>
+Date: Wed, 24 Jan 2024 12:08:28 -0500
+Subject: [PATCH] tests: remove check2 timeouts in favor of meson
+
+Meson already handles timeouts, configurable on the command line with
+--timeout-multiplier.  They are set to 300s for all tests.
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807>
+---
+ src/tests/alsa-mixer-path-test.c | 1 -
+ src/tests/connect-stress.c       | 1 -
+ src/tests/cpu-mix-test.c         | 1 -
+ src/tests/cpu-remap-test.c       | 2 --
+ src/tests/cpu-sconv-test.c       | 1 -
+ src/tests/cpu-volume-test.c      | 1 -
+ src/tests/extended-test.c        | 1 -
+ src/tests/interpol-test.c        | 1 -
+ src/tests/lfe-filter-test.c      | 1 -
+ src/tests/lo-latency-test.c      | 1 -
+ src/tests/lock-autospawn-test.c  | 4 ----
+ src/tests/meson.build            | 1 +
+ src/tests/mult-s16-test.c        | 1 -
+ src/tests/once-test.c            | 4 ----
+ src/tests/passthrough-test.c     | 1 -
+ src/tests/rtpoll-test.c          | 4 ----
+ src/tests/sync-playback.c        | 1 -
+ src/tests/thread-mainloop-test.c | 4 ----
+ src/tests/thread-test.c          | 1 -
+ src/tests/volume-test.c          | 1 -
+ 20 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
+index 63b4a4cacb..208d75d475 100644
+--- a/src/tests/alsa-mixer-path-test.c
++++ b/src/tests/alsa-mixer-path-test.c
+@@ -107,7 +107,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Alsa-mixer-path");
+     tc = tcase_create("alsa-mixer-path");
+     tcase_add_test(tc, mixer_path_test);
+-    tcase_set_timeout(tc, 30);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/connect-stress.c b/src/tests/connect-stress.c
+index a243df9ea1..35f8ea9c4a 100644
+--- a/src/tests/connect-stress.c
++++ b/src/tests/connect-stress.c
+@@ -223,7 +223,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Connect Stress");
+     tc = tcase_create("connectstress");
+     tcase_add_test(tc, connect_stress_test);
+-    tcase_set_timeout(tc, 20 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
+index 6b5b8e37a6..2190ea4bdf 100644
+--- a/src/tests/cpu-mix-test.c
++++ b/src/tests/cpu-mix-test.c
+@@ -212,7 +212,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, mix_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
+index 2554688927..21fc5dc9dc 100644
+--- a/src/tests/cpu-remap-test.c
++++ b/src/tests/cpu-remap-test.c
+@@ -524,7 +524,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, remap_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     tc = tcase_create("rearrange");
+@@ -532,7 +531,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, rearrange_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-sconv-test.c b/src/tests/cpu-sconv-test.c
+index 6a84722fd8..5ae939d45b 100644
+--- a/src/tests/cpu-sconv-test.c
++++ b/src/tests/cpu-sconv-test.c
+@@ -251,7 +251,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, sconv_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
+index 5de8c83045..c7d73be04b 100644
+--- a/src/tests/cpu-volume-test.c
++++ b/src/tests/cpu-volume-test.c
+@@ -235,7 +235,6 @@ int main(int argc, char *argv[]) {
+     tcase_add_test(tc, svolume_arm_test);
+ #endif
+     tcase_add_test(tc, svolume_orc_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c
+index e855c7746a..33c08eef4c 100644
+--- a/src/tests/extended-test.c
++++ b/src/tests/extended-test.c
+@@ -211,7 +211,6 @@ int main(int argc, char *argv[]) {
+     tc = tcase_create("extended");
+     tcase_add_test(tc, extended_test);
+     /* 4s of audio, 0.5s grace time */
+-    tcase_set_timeout(tc, 4.5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
+index bb69e52537..e0e467bf53 100644
+--- a/src/tests/interpol-test.c
++++ b/src/tests/interpol-test.c
+@@ -282,7 +282,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Interpol");
+     tc = tcase_create("interpol");
+     tcase_add_test(tc, interpol_test);
+-    tcase_set_timeout(tc, 5 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
+index d779e05a4f..c5fdeb304f 100644
+--- a/src/tests/lfe-filter-test.c
++++ b/src/tests/lfe-filter-test.c
+@@ -184,7 +184,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("lfe-filter");
+     tc = tcase_create("lfe-filter");
+     tcase_add_test(tc, lfe_filter_test);
+-    tcase_set_timeout(tc, 10);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lo-latency-test.c b/src/tests/lo-latency-test.c
+index 813b337697..3f985a5c63 100644
+--- a/src/tests/lo-latency-test.c
++++ b/src/tests/lo-latency-test.c
+@@ -175,7 +175,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Loopback latency");
+     tc = tcase_create("loopback latency");
+     tcase_add_test(tc, loopback_test);
+-    tcase_set_timeout(tc, 5 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
+index d475d2dcd6..13a3e40d01 100644
+--- a/src/tests/lock-autospawn-test.c
++++ b/src/tests/lock-autospawn-test.c
+@@ -114,10 +114,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Lock Auto Spawn");
+     tc = tcase_create("lockautospawn");
+     tcase_add_test(tc, lockautospawn_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index dceca55c7e..bbdd231300 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -208,6 +208,7 @@ endif
+ 
+ test_env = environment()
+ test_env.set('MAKE_CHECK', '1')
++test_env.set('CK_DEFAULT_TIMEOUT', '0')
+ 
+ foreach t : default_tests + norun_tests
+   name = t[0]
+diff --git a/src/tests/mult-s16-test.c b/src/tests/mult-s16-test.c
+index 91740c2fe9..b222c18114 100644
+--- a/src/tests/mult-s16-test.c
++++ b/src/tests/mult-s16-test.c
+@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Mult-s16");
+     tc = tcase_create("mult-s16");
+     tcase_add_test(tc, mult_s16_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/once-test.c b/src/tests/once-test.c
+index c4d4b4be6c..f14d2edc6b 100644
+--- a/src/tests/once-test.c
++++ b/src/tests/once-test.c
+@@ -132,10 +132,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Once");
+     tc = tcase_create("once");
+     tcase_add_test(tc, once_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/passthrough-test.c b/src/tests/passthrough-test.c
+index 4a1ef783e9..cbeedd03ab 100644
+--- a/src/tests/passthrough-test.c
++++ b/src/tests/passthrough-test.c
+@@ -335,7 +335,6 @@ int main(int argc, char *argv[]) {
+     tcase_add_test(tc, passthrough_playback_test);
+     sink_num++;
+     tcase_add_test(tc, passthrough_volume_test);
+-    tcase_set_timeout(tc, 5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
+index aab637be1d..48dcdd1205 100644
+--- a/src/tests/rtpoll-test.c
++++ b/src/tests/rtpoll-test.c
+@@ -91,10 +91,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("RT Poll");
+     tc = tcase_create("rtpoll");
+     tcase_add_test(tc, rtpoll_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
+index 18afa180b2..3c356a7508 100644
+--- a/src/tests/sync-playback.c
++++ b/src/tests/sync-playback.c
+@@ -208,7 +208,6 @@ int main(int argc, char *argv[]) {
+     tc = tcase_create("syncplayback");
+     tcase_add_test(tc, sync_playback_test);
+     /* 4s of audio, 0.5s grace time */
+-    tcase_set_timeout(tc, 4.5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
+index 5f6952cdec..8ee14da57d 100644
+--- a/src/tests/thread-mainloop-test.c
++++ b/src/tests/thread-mainloop-test.c
+@@ -102,10 +102,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Thread MainLoop");
+     tc = tcase_create("threadmainloop");
+     tcase_add_test(tc, thread_mainloop_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/thread-test.c b/src/tests/thread-test.c
+index 4fcbfd4d3c..0c83e67e07 100644
+--- a/src/tests/thread-test.c
++++ b/src/tests/thread-test.c
+@@ -153,7 +153,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Thread");
+     tc = tcase_create("thread");
+     tcase_add_test(tc, thread_test);
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c
+index 55486f6427..dc5b90d0d7 100644
+--- a/src/tests/volume-test.c
++++ b/src/tests/volume-test.c
+@@ -161,7 +161,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Volume");
+     tc = tcase_create("volume");
+     tcase_add_test(tc, volume_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+-- 
+GitLab
+
diff --git a/media-libs/libpulse/libpulse-17.0.ebuild b/media-libs/libpulse/libpulse-17.0.ebuild
index 1e6c94b43613..43965de41571 100644
--- a/media-libs/libpulse/libpulse-17.0.ebuild
+++ b/media-libs/libpulse/libpulse-17.0.ebuild
@@ -75,6 +75,7 @@ DOCS=( NEWS README )
 
 # patches merged upstream, to be removed with 17.1 or later bump
 PATCHES=(
+	"${FILESDIR}/pulseaudio-17.0-backport-pr807.patch"
 )
 
 src_prepare() {