gentoo resync : 29.12.2022

9 files changed, 125 insertions, 146 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index e1993a281404..8a8c9deb0565 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -8,20 +8,19 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c
 AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
 AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407
 AUX pipewire-0.3.49-x86-cast.patch 813 BLAKE2B 11107bb9c5a4c626c2ccc4e4aa62c6370b7e0851a7c788caf51ce33151e7e23e70c7d460f19357c3a3b3fa54ac682637f954737b9445fbb67490c9f823a6280d SHA512 0b8cc44f6da29f3a91dc8a15093dfc6f14e9a2220a02d41ddbccc7ea3cadf62d92d8db12602eab0587f782478a5b2264ae0dd887179645fafda8f3ffd4843089
-AUX pipewire-0.3.50-fix-spa-header.patch 1256 BLAKE2B 728296383a96f3b1e283132d2e97c2b26f5edc676d6ae6f7d697d997ba67fad0aedcf30642ca2bfb72c8bef1ef90c7ffb27e1dda8c8d452a71719530bed03f70 SHA512 d3062ea859c3310481395b9d622ee3ada0bae14ee56e3f7d8678b5cb1f5ab4af2d38ecc718e56f5330150f3af999bbd80603048ced66a73c51723a719bf753af
-AUX pipewire-0.3.50-treewide-retain-sections-to.patch 2636 BLAKE2B 75f47ff173f3caf07347006889320c3ea5c8588ce081cfe1059383db36ddd5b0ba6492389841b2c8bfe92bbfb968b12281a701020ad92fc538f10c3a2c26b448 SHA512 7521d13afaa143fa160a3ba966239150de88cda916f961765fb7bf6a31113be4a96028f08a97e2b203875a6eaff2efb9d3501d2154efbef4c0a8afd7ed55e141
+AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3
 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
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809
-DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc SHA512 e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23
 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
+DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
 EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b
-EBUILD pipewire-0.3.49-r1.ebuild 12957 BLAKE2B dc2ceab687f47b8ef2039f52d7e95fab419146027d6c95a9c50fc94cf2caafec61f14a4a49f440e295fa6e5e8dff45eedd402909ec6eb3f5d4350cb83058d9e9 SHA512 ffd61a276c2b6112d5c7d7084a586a51ecbbff7b3704fb0ced6f6e7091232fc2c585eef2953948eced6473c96d229b9cd866bd5e6bfec10bb7cec812e2a992fd
-EBUILD pipewire-0.3.50-r3.ebuild 13058 BLAKE2B 00d3c2330778e5395953b8e9871750cb07e5c2b46056ac5a2d8841d71edb78498af99312ef9240891da008b5ccc7f54999c56b9b88c5636611564aa40797ccc5 SHA512 1c3727e58523069b6d6242c9e5444e1945d3a6327580928658f03beda40818036ca47c2355e4146951f8cea959a85ac34d523dd8b569f15f52a28d319b25e56b
-EBUILD pipewire-0.3.51-r1.ebuild 13076 BLAKE2B 664c8f09c7bbb051b9c6607783908bc21a789db9ca326f017e4f1c884602874845f00d5b8de373d0fcd14e68a5e75d45697a96157b63a5db40fc93ceab4fbe71 SHA512 2f12b8a14a89c66f7ab6b4979d93a4c7e1847fefa60602b54102a9c9443f0d9e11822e243e97d46c27d0f07e030e1669c12c03d7edb8f134ef0012e24cc8b1da
-EBUILD pipewire-9999.ebuild 12919 BLAKE2B 10e2fef609dd04de13f69aa0665977481b05b0ce6521bf962f436388a507fb3cc18c60e9a58d35d85286fb16b44431cc6526037c8a648a7801f249837b1d98ae SHA512 a680c473a25766d22762bbcc8bd51097f874da3690619199c31125fb22d664f5a454b52ca136f909676993588b9b4f7a12d581ca17258016fc86c77659741739
-MISC metadata.xml 1617 BLAKE2B e24aeb1644a4fe0a9ca35ad078149c1736de01820ee78d78cd733b06313a82294913601ceab2f35eee98a608bc5c25d184d285810916c42902515058a57e13b4 SHA512 992b300e69e808ecd51c4e3073941d7e577889e4d8d8573b7643a49fb3bb7de1fb2c48d4f99c8e703c5cd7d03bd55f6cffa2c1ccca052f89d6a4cabccb09a76e
+EBUILD pipewire-0.3.49-r2.ebuild 13074 BLAKE2B bc61ce451afa845425c53de628ddf8eba92ea106dbabd56f995aab078f7112d42cc1649efbeb1ef0c582dd298da74be1df634d6195097ab8787fda761b46c76e SHA512 751dce1df4347d4f1d218d5f147a2c52f23b0f5c5f737d636dc4a89f9fd5c1b8ac44c57a0132f95e0836ba9fa2120832bf5cf7dd01e28d27bb2395939ea8bbe1
+EBUILD pipewire-0.3.51-r2.ebuild 13195 BLAKE2B a4aadc7f5831560ad74b95fba740f5fed50dceb2a9d436c806375782b5376788662fba4afc7172b523a097915c627bd85602ccd5b276851b112d34a3c56b92f3 SHA512 3e4729db31116edb0a6474e48ce90b60cb330320ca594daabed67d99a510d2f2c1de031d41e4c2d95ddd1d39179dbad46cb6a1d3ff0a82a0b7c9c6260cd1d1c8
+EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8
+EBUILD pipewire-9999.ebuild 13256 BLAKE2B 0b486819318ee79b892192e04510a9cdb52465dfcfb9e744b84b0779f56a907d6db64ece5ecddae968696b627f91ea9bf83dcdb090ad47cf878f68752b1bd6c1 SHA512 7193f9ebe1ced1cc1a1b84bd45dde762ed1205df938be724cdaabb76562fc0de960a86e3e90164d46e14a9134bc37ae9e0dbfd84d399cf9f52b93825a0aad71c
+MISC metadata.xml 1505 BLAKE2B 415865adf3ecd15444849f69b312a96fb8b59c2a909751b3f8ad868c176fe4c22f76ba0fba78268c75e0847d9c7eb9cc93dbc11d0303d040bb56ded2fc37da9e SHA512 9bd27f8d83889d59bf4fc692e630ab34d2e5fa508bb823c4595b505f95339003c7a81ce1bb37c7294e5a788e9e76297654625d4dfa9aaa3efff05c32e19175b2
diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
deleted file mode 100644
index 5b9ad3cf2d7c..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch
-https://bugs.gentoo.org/838427
-
-From: psykose <alice@ayaya.dev>
-Date: Wed, 13 Apr 2022 21:57:49 +0000
-Subject: [PATCH] spa: fix c90 header include
-
-placing declarations after code is invalid under ISO c90
-
-Fixes !1211
---- a/spa/include/spa/utils/string.h
-+++ b/spa/include/spa/utils/string.h
-@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, .
- static inline float spa_strtof(const char *str, char **endptr)
- {
- 	static locale_t locale = NULL;
-+	locale_t prev;
- 	float v;
- 	if (SPA_UNLIKELY(locale == NULL))
- 		locale = newlocale(LC_ALL_MASK, "C", NULL);
--	locale_t prev = uselocale(locale);
-+	prev = uselocale(locale);
- 	v = strtof(str, endptr);
- 	uselocale(prev);
- 	return v;
-@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val)
- static inline double spa_strtod(const char *str, char **endptr)
- {
- 	static locale_t locale = NULL;
-+	locale_t prev;
- 	double v;
- 	if (SPA_UNLIKELY(locale == NULL))
- 		locale = newlocale(LC_ALL_MASK, "C", NULL);
--	locale_t prev = uselocale(locale);
-+	prev = uselocale(locale);
- 	v = strtod(str, endptr);
- 	uselocale(prev);
- 	return v;
-GitLab
diff --git a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
deleted file mode 100644
index 1e1a8198ef26..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e28a052105f8ef35b3f469d3b85e1fcb25106f26
-
-From e28a052105f8ef35b3f469d3b85e1fcb25106f26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
-Date: Wed, 13 Apr 2022 18:13:12 +0200
-Subject: [PATCH] treewide: retain sections to prevent linker garbage
- collection
-
-The linker may remove sections that are actually used when
-"--gc-sections" and "-z start-stop-gc" is set. Add the `retain`
-attribute to prevent that.
-
-Furthermore, fix the alignment for `pwtest_suite_decl` objects.
-
-See: #2292
-See: https://lld.llvm.org/ELF/start-stop-gc.html
-See: https://github.com/systemd/systemd/issues/21847
-See: https://github.com/systemd/systemd/pull/21855
----
- src/modules/module-protocol-pulse/module.h | 1 +
- test/pwtest-implementation.h               | 2 +-
- test/pwtest.h                              | 6 ++++--
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h
-index c1153640e..f75d8786c 100644
---- a/src/modules/module-protocol-pulse/module.h
-+++ b/src/modules/module-protocol-pulse/module.h
-@@ -47,6 +47,7 @@ struct module_info {
- 
- #define DEFINE_MODULE_INFO(name)					\
- 	__attribute__((used))						\
-+	__attribute__((retain))						\
- 	__attribute__((section("pw_mod_pulse_modules")))		\
- 	__attribute__((aligned(__alignof__(struct module_info))))	\
- 	const struct module_info name
-diff --git a/test/pwtest-implementation.h b/test/pwtest-implementation.h
-index 7bfad01cf..1525d2056 100644
---- a/test/pwtest-implementation.h
-+++ b/test/pwtest-implementation.h
-@@ -131,7 +131,7 @@ void _pwtest_add(struct pwtest_context *ctx,
- struct pwtest_suite_decl {
- 	const char *name;
- 	enum pwtest_result (*setup)(struct pwtest_context *, struct pwtest_suite *);
--} __attribute__((aligned(16)));
-+};
- 
- 
- #endif /* PWTEST_IMPLEMENTATION_H */
-diff --git a/test/pwtest.h b/test/pwtest.h
-index 9c0737523..6d3070b79 100644
---- a/test/pwtest.h
-+++ b/test/pwtest.h
-@@ -494,9 +494,11 @@ enum pwtest_arg {
-  */
- #define PWTEST_SUITE(cname) \
- 	static enum pwtest_result (cname##__setup)(struct pwtest_context *ctx, struct pwtest_suite *suite); \
--	static const struct pwtest_suite_decl _test_suite \
- 	__attribute__((used)) \
--	__attribute((section("pwtest_suite_section"))) = { \
-+	__attribute__((retain)) \
-+	__attribute__((section("pwtest_suite_section"))) \
-+	__attribute__((aligned(__alignof__(struct pwtest_suite_decl)))) \
-+	static const struct pwtest_suite_decl _test_suite = { \
- 	   .name = #cname, \
- 	   .setup = cname##__setup, \
- 	}; \
--- 
-GitLab
-
diff --git a/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
new file mode 100644
index 000000000000..09d8ffff699f
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch
@@ -0,0 +1,78 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4821c7ca2fe5e25ba018e9f5d4967f08d6bb816f
+
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 9 Jun 2022 17:06:07 +0200
+Subject: [PATCH] pulse-server: don't append "/pulse" to PULSE_RUNTIME_PATH
+
+Fixes #2431
+--- a/src/modules/module-protocol-pulse/server.c
++++ b/src/modules/module-protocol-pulse/server.c
+@@ -460,7 +460,7 @@ static int parse_unix_address(const char *address, struct sockaddr_storage *addr
+ 	if (address[0] != '/') {
+ 		char runtime_dir[PATH_MAX];
+ 
+-		if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir), "pulse")) < 0)
++		if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir))) < 0)
+ 			return res;
+ 
+ 		res = snprintf(addr.sun_path, sizeof(addr.sun_path),
+--- a/src/modules/module-protocol-pulse/utils.c
++++ b/src/modules/module-protocol-pulse/utils.c
+@@ -50,27 +50,30 @@
+ #include "log.h"
+ #include "utils.h"
+ 
+-int get_runtime_dir(char *buf, size_t buflen, const char *dir)
++int get_runtime_dir(char *buf, size_t buflen)
+ {
+-	const char *runtime_dir;
++	const char *runtime_dir, *dir = NULL;
+ 	struct stat stat_buf;
+ 	int res, size;
+ 
+ 	runtime_dir = getenv("PULSE_RUNTIME_PATH");
+-	if (runtime_dir == NULL)
++	if (runtime_dir == NULL) {
+ 		runtime_dir = getenv("XDG_RUNTIME_DIR");
+-
++		dir = "pulse";
++	}
+ 	if (runtime_dir == NULL) {
+ 		pw_log_error("could not find a suitable runtime directory in"
+ 				"$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR");
+ 		return -ENOENT;
+ 	}
+ 
+-	size = snprintf(buf, buflen, "%s/%s", runtime_dir, dir);
++	size = snprintf(buf, buflen, "%s%s%s", runtime_dir,
++			dir ? "/" : "", dir ? dir : "");
+ 	if (size < 0)
+ 		return -errno;
+ 	if ((size_t) size >= buflen) {
+-		pw_log_error("path %s/%s too long", runtime_dir, dir);
++		pw_log_error("path %s%s%s too long", runtime_dir,
++				dir ? "/" : "", dir ? dir : "");
+ 		return -ENAMETOOLONG;
+ 	}
+ 
+@@ -182,7 +185,7 @@ int create_pid_file(void) {
+ 	FILE *f;
+ 	int res;
+ 
+-	if ((res = get_runtime_dir(pid_file, sizeof(pid_file), "pulse")) < 0)
++	if ((res = get_runtime_dir(pid_file, sizeof(pid_file))) < 0)
+ 		return res;
+ 
+ 	if (strlen(pid_file) > PATH_MAX - sizeof("/pid")) {
+--- a/src/modules/module-protocol-pulse/utils.h
++++ b/src/modules/module-protocol-pulse/utils.h
+@@ -31,7 +31,7 @@
+ struct client;
+ struct pw_context;
+ 
+-int get_runtime_dir(char *buf, size_t buflen, const char *dir);
++int get_runtime_dir(char *buf, size_t buflen);
+ int check_flatpak(struct client *client, pid_t pid);
+ pid_t get_client_pid(struct client *client, int client_fd);
+ const char *get_server_name(struct pw_context *context);
+GitLab
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index f88730b7d3ba..b7e4f57f5480 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -13,10 +13,6 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://gitlab.freedesktop.org/pipewire/pipewire/-/issues</bugs-to>
 		<changelog>https://gitlab.freedesktop.org/pipewire/pipewire/-/releases</changelog>
diff --git a/media-video/pipewire/pipewire-0.3.49-r1.ebuild b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
index 06b65b5d8bda..b7acb4f37fa8 100644
--- a/media-video/pipewire/pipewire-0.3.49-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.49-r2.ebuild
@@ -147,7 +147,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
@@ -307,8 +307,9 @@ pkg_postinst() {
 		ewarn
 		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
 			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-			elog "autospawning of the original daemon by setting:"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
 			elog
 			elog "  autospawn = no"
 			elog
diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
index c28ecc739f33..36646e433754 100644
--- a/media-video/pipewire/pipewire-0.3.51-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -144,7 +144,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
@@ -310,8 +310,9 @@ pkg_postinst() {
 		ewarn
 		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
 			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-			elog "autospawning of the original daemon by setting:"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
 			elog
 			elog "  autospawn = no"
 			elog
diff --git a/media-video/pipewire/pipewire-0.3.50-r3.ebuild b/media-video/pipewire/pipewire-0.3.52-r1.ebuild
index 8f7f7f1488f1..c94a3f03a994 100644
--- a/media-video/pipewire/pipewire-0.3.50-r3.ebuild
+++ b/media-video/pipewire/pipewire-0.3.52-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -85,7 +85,6 @@ RDEPEND="
 	lv2? ( media-libs/lilv )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
 	)
 	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
 	ssl? ( dev-libs/openssl:= )
@@ -124,10 +123,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-
-	"${FILESDIR}"/${P}-fix-spa-header.patch
-	"${FILESDIR}"/${P}-treewide-retain-sections-to.patch
-	"${FILESDIR}"/${PN}-0.3.49-x86-cast.patch
+	"${FILESDIR}"/${P}-pulse-path.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1
@@ -149,7 +145,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
@@ -194,6 +190,8 @@ multilib_src_configure() {
 		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
 		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
 		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3plus=disabled
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
@@ -241,10 +239,16 @@ multilib_src_install_all() {
 
 	if use pipewire-alsa; then
 		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
 		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
 		# And the current dosym8 -r implementation is likely affected by the same issue, too.
 		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
 	fi
 
 	if ! use systemd; then
@@ -309,8 +313,9 @@ pkg_postinst() {
 		ewarn
 		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
 			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-			elog "autospawning of the original daemon by setting:"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
 			elog
 			elog "  autospawn = no"
 			elog
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index e60bb1f87151..9ab78449ccc3 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
@@ -85,7 +85,6 @@ RDEPEND="
 	lv2? ( media-libs/lilv )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
 	)
 	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
 	ssl? ( dev-libs/openssl:= )
@@ -145,7 +144,7 @@ src_prepare() {
 
 		$(use system-service && {
 			echo @pipewire - rtprio 95
-			echo @pipewire - priority -19
+			echo @pipewire - nice -19
 			echo @pipewire - memlock 4194304
 		})
 
@@ -190,6 +189,8 @@ multilib_src_configure() {
 		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
 		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
 		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3plus=disabled
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
@@ -237,10 +238,16 @@ multilib_src_install_all() {
 
 	if use pipewire-alsa; then
 		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
 		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
 		# And the current dosym8 -r implementation is likely affected by the same issue, too.
 		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
 	fi
 
 	if ! use systemd; then
@@ -305,8 +312,9 @@ pkg_postinst() {
 		ewarn
 		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
 			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
-			elog "autospawning of the original daemon by setting:"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
 			elog
 			elog "  autospawn = no"
 			elog