gentoo resync : 27.10.2021

5 files changed, 156 insertions, 4 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 6cdbac926ba2..228c651285dc 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -10,6 +10,8 @@ AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa17
 AUX pipewire-0.3.38-find-readline.patch 1546 BLAKE2B c8d6a8d53e8f71792c5055dabb0a66d8a2b93641e4ade45542fbcb3269ebabb3319c1225f63433cccf8000f4585607383a903045112e9bd204f95bed4e92546e SHA512 c09d604e09552c1dca29b9709c8571a9bc1393fa885e249d8e71403a5669ef732d0e14b9a7c9f315a55b03c2dd2022bfa9f71f4430ae7f93a8d01b686f6bf246
 AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a8d2f5c4ac09ba9fd448b3c77446dc523a07d8ed090f08fec1029357c5cb67ea696f57aa3c22de1df5aa01d789c5c96cfdab5 SHA512 e35d35905da4f35b1db5c1e8a8dada24e83320dc38c4353f7c7dc4cc442c9a73aed02b4df99d66983683f36a004f85bdba9a287ff9e0e8ce71624e1703fced7b
 AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0
+AUX pipewire-0.3.39-endian-test-fix.patch 3368 BLAKE2B 1118b19aa84075a936884c638f895104cbc732199bba6e0d1101c3a0366e9f8ec93fbb7c458e11686e0884a53ad7467bcd32252906f9d5b1883d3ee35d3d03a7 SHA512 f1a83c761f3b49b3782e17190454718d15ad6e5a9c2f729c95c04a419cf5fb3f2222d86acc0df14a1467feb7381663fa639997711614ebfbfe6f5a6ada335263
+AUX pipewire-0.3.39-fix-build-some-arches.patch 1310 BLAKE2B 31e9f8030ef0f131de9c987371cd9fe62a900792de9c93ebe95ec489f7d1a20475ea128ea6a78d98807788a6ec0319ba39880033e2e8aa17c8a66119d482654a SHA512 0230f63612ff3b551e24ac9fba88df6920d4f23cc726e55a81aaa82b18293059815743b10043603010f7e42573f2f3f3344a4c7462eb8060ac9394651595fda9
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
@@ -22,6 +24,6 @@ EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d96
 EBUILD pipewire-0.3.36.ebuild 10264 BLAKE2B 4c34ce0089bf417366a1cc2eb6e5a83d84af4816db5da53fe0293504c26ddd3d0caef8e4cb48fd3c1a48cb4424720f31319e6f3d99729213595498d447ace0dd SHA512 a4ad4dfe0969fd41533e6742843e8b4332fc0122c4327e3198ae8c7a84be166f008c9ed694f14a56b56bfc129a6678651a17a168b96b13329485be2af378930d
 EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
 EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
-EBUILD pipewire-0.3.39-r1.ebuild 10788 BLAKE2B eb1c937ac9125b31a8f0f77931e82b17c41ab1a551fe55ba38d50ee682ba61f3e809eec30ecbd1dffdb6d0a698d59a5b3549cf8cd25ccc63b71ec1b8cd56f142 SHA512 f480f128303b013ddcf50379ce3470bc86a143cc0332c4adc7bdb31e9480edfbd0b49882d583b0a3ae9605a21381fc4fc316c9827e973c3d9f284dff37e8603b
-EBUILD pipewire-9999.ebuild 10785 BLAKE2B 7bc2d17dc8f35d6b3e3430effabc16a2435d9524464014f7bab84aa0201441fd9bc58eccb07b33d4a20be1b2cb97ea94c58c894dc08642a6a2ffa3c2a6d724a4 SHA512 2295cad63d6fe5e4b9996fee4a5d7e5d5b1b410c030b6a142e1b062d3683a917b9a3b064b854f180a1a318256a20880662e1c84e08b103e569891728deaa33bb
+EBUILD pipewire-0.3.39-r4.ebuild 10888 BLAKE2B 9a229f85583bd255a3f2ad0c432db4e8b5cd0f628a778ddca5ca7a7d97acf90f0af4cb8a22a238f7a0a4706cc268f7278a5d44406457e5026e9a00a8d76c0cee SHA512 a95610efddadb30ee1db556bd6fef7d5d090b416354f39bab80a8cf912eaed78f50c4d8333a82fb617a822c22b97c8541d83d425fbac73959fa5577c8bafc294
+EBUILD pipewire-9999.ebuild 10783 BLAKE2B 898d127277ee046d55a3d4c2f4fca5bcbfa528835d94c02c75534c76395dc22cae3617950ac2040d35d2d1a5a8fd06e312b319a370f5e2ccb3b5411563bf883a SHA512 14e179d0e485b6077f8fa276e4ae63e1a0e89e199cb4347477aee57a7b5fde892ecb7dddac63c4b669e4ef03669be17c233db928077227e8806adb4bd7bbadf5
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
new file mode 100644
index 000000000000..2687299b235d
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
@@ -0,0 +1,112 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5dfc3494dc4635918e74b9f3d717a39a74b28554.patch
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2.patch
+
+From 5dfc3494dc4635918e74b9f3d717a39a74b28554 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 25 Oct 2021 16:15:17 +0200
+Subject: [PATCH] map: use uintptr_t for the next pointer
+
+This aligns the low bits of the next field with the low bits of the
+pointer on big endian cpus.
+
+Fixes #1747
+---
+ src/pipewire/map.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pipewire/map.h b/src/pipewire/map.h
+index f47dfa6b3..1867fa4d3 100644
+--- a/src/pipewire/map.h
++++ b/src/pipewire/map.h
+@@ -74,7 +74,7 @@ extern "C" {
+  * first item to get re-used on the next insert.
+  */
+ union pw_map_item {
+-	uint32_t next;	/* next free index */
++	uintptr_t next;	/* next free index */
+ 	void *data;	/* data of this item, must be an even address */
+ };
+ 
+-- 
+GitLab
+
+From c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 25 Oct 2021 16:11:56 +0200
+Subject: [PATCH] map: make _insert_at() fail on a removed item
+
+You are only supposed to use _insert_new()/_remove() or _insert_at()
+on the map, If we detect a _insert_at() to a removed item,
+return an error because else we might corrupt the free list.
+
+Update unit test accordingly.
+---
+ src/pipewire/map.h | 15 ++-------------
+ test/test-map.c    | 17 +----------------
+ 2 files changed, 3 insertions(+), 29 deletions(-)
+
+diff --git a/src/pipewire/map.h b/src/pipewire/map.h
+index fd57f7f7c..f47dfa6b3 100644
+--- a/src/pipewire/map.h
++++ b/src/pipewire/map.h
+@@ -182,20 +182,9 @@ static inline int pw_map_insert_at(struct pw_map *map, uint32_t id, void *data)
+ 		if (item == NULL)
+ 			return -errno;
+ 	} else {
+-		if (pw_map_id_is_free(map, id)) {
+-			uint32_t *current = &map->free_list;
+-			while (*current != SPA_ID_INVALID) {
+-				uint32_t current_id = (*current) >> 1;
+-				uint32_t *next = &pw_map_get_item(map, current_id)->next;
+-
+-				if (current_id == id) {
+-					*current = *next;
+-					break;
+-				}
+-				current = next;
+-			}
+-		}
+ 		item = pw_map_get_item(map, id);
++		if (pw_map_item_is_free(item))
++			return -EINVAL;
+ 	}
+ 	item->data = data;
+ 	return 0;
+diff --git a/test/test-map.c b/test/test-map.c
+index dd1df77a8..b6d7681ce 100644
+--- a/test/test-map.c
++++ b/test/test-map.c
+@@ -188,7 +188,6 @@ PWTEST(map_insert_at_free)
+ 	int data[3] = {1, 2, 3};
+ 	int new_data = 4;
+ 	int *ptr[3] = {&data[0], &data[1], &data[3]};
+-	int *new_ptr = &new_data;
+ 	int idx[3];
+ 	int rc;
+ 
+@@ -225,21 +224,7 @@ PWTEST(map_insert_at_free)
+ 	}
+ 
+ 	rc = pw_map_insert_at(&map, item_idx, &new_data);
+-	pwtest_neg_errno_ok(rc);
+-	pwtest_ptr_eq(new_ptr, pw_map_lookup(&map, item_idx));
+-
+-	if (before_idx != SKIP && before_idx != item_idx) {
+-		rc = pw_map_insert_at(&map, before_idx, &ptr[before_idx]);
+-		pwtest_neg_errno_ok(rc);
+-		pwtest_ptr_eq(&ptr[before_idx], pw_map_lookup(&map, before_idx));
+-	}
+-
+-	if (after_idx != SKIP && after_idx != item_idx) {
+-		rc = pw_map_insert_at(&map, after_idx, &ptr[after_idx]);
+-		pwtest_neg_errno_ok(rc);
+-		pwtest_ptr_eq(&ptr[after_idx], pw_map_lookup(&map, after_idx));
+-	}
+-
++	pwtest_neg_errno(rc, -EINVAL);
+ 	pw_map_clear(&map);
+ 
+ 	return PWTEST_PASS;
+-- 
+GitLab
+
diff --git a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
new file mode 100644
index 000000000000..fe5392e29a3a
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
@@ -0,0 +1,35 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206.patch
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 21 Oct 2021 11:09:48 +0200
+Subject: [PATCH] cpu: fix compilation on some architectures
+
+--- a/spa/plugins/support/cpu.c
++++ b/spa/plugins/support/cpu.c
+@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
+ 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
+ 			this->vm_type = atoi(str);
+ 		if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL)
+-			impl_cpu_zero_denormals(this, spa_atob(str));
++			spa_cpu_zero_denormals(&this->cpu, spa_atob(str));
+ 	}
+ 
+ 	spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 25 Oct 2021 16:32:16 +0200
+Subject: [PATCH] cpu: disable VFP asm when not available
+
+Fixes #1746
+--- a/spa/plugins/support/cpu-arm.c
++++ b/spa/plugins/support/cpu-arm.c
+@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable)
+ 			"msr	fpcr, %0		\n"
+ 			"isb				\n"
+ 			: "=r"(cw)::"memory");
+-#else
++#elif (defined(__VFP_FP__) && !defined(__SOFTFP__))
+ 	uint32_t cw;
+ 	if (enable)
+ 		__asm__ __volatile__(
diff --git a/media-video/pipewire/pipewire-0.3.39-r1.ebuild b/media-video/pipewire/pipewire-0.3.39-r4.ebuild
index 3c425733a524..96a68064f996 100644
--- a/media-video/pipewire/pipewire-0.3.39-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.39-r4.ebuild
@@ -100,6 +100,9 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	# Upstream
+	"${FILESDIR}"/${P}-fix-build-some-arches.patch
+	"${FILESDIR}"/${P}-endian-test-fix.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -245,7 +248,7 @@ pkg_postinst() {
 		ewarn "PipeWire daemon startup has been moved to a launcher script!"
 		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
 		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to `{ path = \"/usr/bin/pipewire*` should be commented out)"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
 		ewarn
 		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
 		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 7dabfed1cb8b..2e84b38f88d3 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -245,7 +245,7 @@ pkg_postinst() {
 		ewarn "PipeWire daemon startup has been moved to a launcher script!"
 		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
 		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to `{ path = \"/usr/bin/pipewire*` should be commented out)"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
 		ewarn
 		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
 		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"