summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Calligeros <jcalligeros99@gmail.com>2024-05-01 18:09:41 +1000
committerSam James <sam@gentoo.org>2024-05-06 08:23:54 +0100
commit8f2c2d8d543dbf3cc060b82d060b699e8575dd49 (patch)
treef4c3f87f4b67d4ed612ccf256e11dbbc4eafed9b /media-video/pipewire
parentx11-libs/wxGTK: drop 3.2.1, 3.2.2.1-r1, 3.2.2.1-r2 (diff)
downloadgentoo-8f2c2d8d543dbf3cc060b82d060b699e8575dd49.tar.gz
gentoo-8f2c2d8d543dbf3cc060b82d060b699e8575dd49.tar.bz2
gentoo-8f2c2d8d543dbf3cc060b82d060b699e8575dd49.zip
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@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/pipewire')
-rw-r--r--media-video/pipewire/pipewire-1.0.5-r1.ebuild (renamed from media-video/pipewire/pipewire-1.0.5.ebuild)16
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild16
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
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