summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor V. Kovalenko <igor.v.kovalenko@gmail.com>2024-02-03 09:42:44 +0300
committerSam James <sam@gentoo.org>2024-03-19 05:47:57 +0000
commitbdd56b3bcecf86106aaf77a79b3d369ea6d45f9a (patch)
treeeed30d5554bd31a187221d9031cd82834aa87c68 /media-video
parentmedia-video/wireplumber: Amend sound-server split, new conf syntax (diff)
downloadgentoo-bdd56b3bcecf86106aaf77a79b3d369ea6d45f9a.tar.gz
gentoo-bdd56b3bcecf86106aaf77a79b3d369ea6d45f9a.tar.bz2
gentoo-bdd56b3bcecf86106aaf77a79b3d369ea6d45f9a.zip
media-video/pipewire: Add another sound-server part for updated wireplumber conf syntax
Bug: https://bugs.gentoo.org/921393 Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35155 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/pipewire/files/gentoo-sound-server-enable-audio-bluetooth.conf6
-rw-r--r--media-video/pipewire/pipewire-1.0.4.ebuild6
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild6
3 files changed, 18 insertions, 0 deletions
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