gentoo auto-resync : 19:03:2024 - 06:50:06

8 files changed, 54 insertions, 7 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 746304109c64..844568a409a3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 9858f72b1795..8d5f9ae17450 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,7 @@ AUX 1.0.0/0002-fix-x11-bell-segfault.patch 988 BLAKE2B 2281275262157fa2545820e15
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
 AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
+AUX gentoo-sound-server-enable-audio-bluetooth.conf 106 BLAKE2B 79945d2dac9671d9b85f6334afb43ff3f35db555d460e82bccee0f1f8ec4a8bf5e6de3b340698a4e9db80a5dc181c4824b9265bf0fce43bef61afd50177ef70a SHA512 fede2c9dc6256894aa29cf72ede8ba42874cf0706d81031d724ca5b43fa424d09009ec6eb685737623f3c5eadb9b095060b0ce48b7325d68d4b07225b07aa2fe
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab SHA512 14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
@@ -11,6 +12,6 @@ DIST pipewire-1.0.3.tar.bz2 1682330 BLAKE2B cf7f69ee8db703b3e441b6ca34aec4e41cc9
 DIST pipewire-1.0.4.tar.bz2 1698660 BLAKE2B 0842a5fca65c8a91eadd9f0594864ae0f0d428b3c03d2c5fecc3b7f62ff6f5d24fc1190eb351279c002e26596148b23b4b576551502be21beb2eeaa0d2ad4dac SHA512 42e8e28b1fd497f5329b5966abd5cfb7d7976fb0ca9f8f39bccf44195dd11f227cdec2448ba7db4559e866ea2dccf64b8172a2ae069c5204cd8f66c0f8a9e2d9
 EBUILD pipewire-1.0.0-r1.ebuild 19657 BLAKE2B 3b82a4e466937ee6d1d0f21a5837071ff0730530e1bc7c09066ee1b666a36169b4284ae4296f693e60e2f11b1699140bb20cf1153f56f390a5e564b05235db0e SHA512 57c5c699a13cf8288e0cfbd08ef412405d50f6e5be9babe6d63a7a86cdc66b4c5e781364b83885925567e6ac4f91c09ebeeedcc55deb63ae02ac3a01f7022cdd
 EBUILD pipewire-1.0.3.ebuild 19576 BLAKE2B a83be9a9cf0473e41fc3098f23818325c3306d8a9e7d527047b16324c490b711cf799c4a7d892533e625c42a4e36fda6016f425541d718a18d23beedd91f9b7e SHA512 02ef47740b9a30f451718e923a51161dca4bfabe16317e46db1e412fb6247b2bd04bc0128b5769d9106617d938baa6e4c7854fba93ac7c67774ecad707c74d6a
-EBUILD pipewire-1.0.4.ebuild 19582 BLAKE2B 6a71ac1d4cfb6057022fa9f4d8b9439318fe8c93b15b5fe56da5596444f2625e564fed035a76df232b97a2d3ddbdb5e86ae9446d7cfc9c6010737a7b45de50b9 SHA512 c3a408664a224ace0e2d0b72f0ee59c7f7b3b4d49a7f1771c1d7c95f6a657cc9191410765a17d378fd5b9180a53d1fdb0160710c18b8dc281034aa9e1fa51058
-EBUILD pipewire-9999.ebuild 19573 BLAKE2B 591c2635574b9e383058a4d26cf80686d37ad06508b3940ac1d994de255cd21563b5e979d72359ce7c841675c011c6923dcd0f15da1e10749a97829668898d45 SHA512 496315b3c30a102fcf04fd720be05218dee2ca20e40b6f63c31b2d7fdaf1a23b908a34ecff5e785a144f95acbacc6ab4c94fc23892308475dc7b7bfe58c36721
+EBUILD pipewire-1.0.4.ebuild 19994 BLAKE2B 2d369e36d27151586e4a6b9e6775577f43597bfe3489ba2c9006983bfea48482702e689cd11fbc50a8e52a04792fe01e9b29854bb5ea0721a390bdb75d6c3cc9 SHA512 24f4dd50e4d2681d5c61c26c733a75a1bd93a9fd36cc9827f42fceaf8a9a26dcd5bd5714cae6fe137c97d597741d2b5bc50a1f6f8a87e5f7d0caec02c05ed338
+EBUILD pipewire-9999.ebuild 19985 BLAKE2B 7bacb5fa282eccbad7142ae221ba169a2f19f006cf6a99e6d307ebeb563f5c4d4e91f963c15c69bbea51dd129022de74d520ff0cd68d040051d012cebf437cb1 SHA512 c74d11a0f3c0930028a659e5f4d09427442feae03c804bc69d632cf55f08d5975850778d3a37a97c4e69821602f6f3a3bb3e7a310ecbe4936ccc8b44e168a365
 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
diff --git a/media-video/pipewire/files/gentoo-sound-server-enable-audio-bluetooth.conf b/media-video/pipewire/files/gentoo-sound-server-enable-audio-bluetooth.conf
new file mode 100644
index 000000000000..c5b4f8036b54
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-sound-server-enable-audio-bluetooth.conf
@@ -0,0 +1,6 @@
+wireplumber.profiles = {
+  main = {
+    hardware.audio = required
+    hardware.bluetooth = required
+  }
+}
diff --git a/media-video/pipewire/pipewire-1.0.4.ebuild b/media-video/pipewire/pipewire-1.0.4.ebuild
index 1bdcaea902f0..88312367a689 100644
--- a/media-video/pipewire/pipewire-1.0.4.ebuild
+++ b/media-video/pipewire/pipewire-1.0.4.ebuild
@@ -313,11 +313,17 @@ multilib_src_install_all() {
 
 	# Enable required wireplumber alsa and bluez monitors
 	if use sound-server; then
+		# Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
 		dodir /etc/wireplumber/main.lua.d
 		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
 
+		# Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
 		dodir /etc/wireplumber/bluetooth.lua.d
 		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+
+		# Install sound-server enabler for wireplumber 0.4.81+ conf syntax
+		insinto /etc/pipewire/wireplumber.conf.d
+		doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
 	fi
 
 	if use system-service; then
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 1faa8aec874a..b792e5bf1639 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -313,11 +313,17 @@ multilib_src_install_all() {
 
 	# Enable required wireplumber alsa and bluez monitors
 	if use sound-server; then
+		# Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
 		dodir /etc/wireplumber/main.lua.d
 		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
 
+		# Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump
 		dodir /etc/wireplumber/bluetooth.lua.d
 		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+
+		# Install sound-server enabler for wireplumber 0.4.81+ conf syntax
+		insinto /etc/pipewire/wireplumber.conf.d
+		doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
 	fi
 
 	if use system-service; then
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 43b3bcfb92fd..92ff88dc18a4 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,5 +1,6 @@
 AUX wireplumber-0.4.15-config-disable-sound-server-parts.patch 783 BLAKE2B ed172805cd263fa0320563eb2440147e83567cad24bbec253a9d6cddedffd969056e2041110b96fd0b1e210cd7a45c25385174031496f6931f0a6c27257d23b2 SHA512 b1838315d3629560a93f4d1c7065419b592a7cffe69e898147e37b9e56ae0f0e5cb45f1ba0b5217af01f711fb0c20f547dc61797276892a593f644c48992ae47
+AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373bb9cd9234d0fd68ccfba41011083aadd2dfcfd19d7cdda235f075b5cbe02562f8719153ea4e0412614401b3c7f6b60083b3578e9d9450b0a0dfc4b6222a4 SHA512 9fb2c5b5baeebde8dac9c6b6cc192cf85a4b70db3ef7a50233a7c064dc407c763d906063958a5dd06746e1730e2110803eb328105802ea5c4d6bb6d685376a93
 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8
 EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89
-EBUILD wireplumber-9999.ebuild 3791 BLAKE2B fb8838a0b6619863e37006e41b6ff1a6bcb98b72ee626a4a5ea3e8720b6886a4e53168b0792d9c79bf5b2e3070970a466d76c114200db8d32c35b875c1c26e0c SHA512 2b2d596efdd76e0119bb0254dde61d31a004d785f8c8309a8db8e63472af108661558d86a3a0ba2ba381e0179a51f559485898a2f13b2da18c70251e372d81a2
+EBUILD wireplumber-9999.ebuild 3790 BLAKE2B e2a69da1ffac39dc653e16a07248c780d67a8b6845dd528ef03fca822dfc1f569bf45443a5ce0c8d5830895c5ae4039f075a7db8092cba6f55ecdbf59422135f SHA512 2793cd86071f19b77b6b301770aa845c0e801b046034002a78d59b1fb3b964fd0e7e1120a7e37b31816c2da936442852402aece71962f3d8f164f94e63733a25
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch
new file mode 100644
index 000000000000..3a9e828837b5
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.81-config-disable-sound-server-parts.patch
@@ -0,0 +1,27 @@
+From ed5ce9c176db2e26ac9915b4d86c3a076a8093ae Mon Sep 17 00:00:00 2001
+From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
+Date: Fri, 2 Feb 2024 22:00:03 +0300
+Subject: [PATCH] config: Disable alsa and bluez monitors by default
+
+---
+ src/config/wireplumber.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/config/wireplumber.conf b/src/config/wireplumber.conf
+index 822b7967..ca0faa0a 100644
+--- a/src/config/wireplumber.conf
++++ b/src/config/wireplumber.conf
+@@ -64,8 +64,8 @@ wireplumber.profiles = {
+     support.settings = required
+     support.log-settings = required
+     metadata.sm-objects = required
+-    hardware.audio = required
+-    hardware.bluetooth = required
++    #hardware.audio = required
++    #hardware.bluetooth = required
+     hardware.video-capture = required
+     policy.standard = required
+     #policy.role-priority-system = optional
+-- 
+2.43.0
+
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 42e484bf9447..88ddf0bb6b0e 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,8 +49,8 @@ BDEPEND="
 
 DEPEND="
 	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.68:=
+	>=dev-libs/glib-2.68
+	>=media-video/pipewire-1.0.2:=
 	virtual/libintl
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -70,7 +70,7 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.15-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	"${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
 )
 
 src_configure() {