commit: 8f2c2d8d543dbf3cc060b82d060b699e8575dd49
Author: James Calligeros <jcalligeros99 <AT> gmail <DOT> com>
AuthorDate: Wed May 1 08:09:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 6 07:23:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2c2d8d
media-video/pipewire: revbump for media-video/wireplumber-0.5.2
WirePlumber 0.5 has completely changed the way its configuration
and scripting are managed. Thus, we can no longer insert Lua
scripts into /etc/{pipewire,wireplumber}/ for sound-server
handling.
Furthermore, /etc/pipewire/ is not a valid or checked location
for the new-style WirePlumber config, so we need to install
the new-style sound-server handling to /etc/wireplumber/wireplumber.conf.d
instead.
Bug: https://bugs.gentoo.org/921393
Signed-off-by: James Calligeros <jcalligeros99 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{pipewire-1.0.5.ebuild => pipewire-1.0.5-r1.ebuild} | 16 +++-------------
media-video/pipewire/pipewire-9999.ebuild | 16 +++-------------
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/media-video/pipewire/pipewire-1.0.5.ebuild
b/media-video/pipewire/pipewire-1.0.5-r1.ebuild
similarity index 95%
rename from media-video/pipewire/pipewire-1.0.5.ebuild
rename to media-video/pipewire/pipewire-1.0.5-r1.ebuild
index 88312367a689..1373789d2b11 100644
--- a/media-video/pipewire/pipewire-1.0.5.ebuild
+++ b/media-video/pipewire/pipewire-1.0.5-r1.ebuild
@@ -162,9 +162,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -313,16 +311,8 @@ 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
+ # Install sound-server enabler for wireplumber 0.5.0+ conf
syntax
+ insinto /etc/wireplumber/wireplumber.conf.d
doins
"${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
fi
diff --git a/media-video/pipewire/pipewire-9999.ebuild
b/media-video/pipewire/pipewire-9999.ebuild
index b792e5bf1639..0e1cb10820aa 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -162,9 +162,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+PDEPEND=">=media-video/wireplumber-0.5.2"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
@@ -313,16 +311,8 @@ 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
+ # Install sound-server enabler for wireplumber 0.5.0+ conf
syntax
+ insinto /etc/wireplumber/wireplumber.conf.d
doins
"${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf
fi
