diff options
author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2022-07-02 09:13:11 +0300 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-07-04 22:35:33 +0100 |
commit | 21f12bb743b94242f73cef85ef24fdf6ff703eed (patch) | |
tree | d14e8effcb6c3c8c82dbbbea19dca2ee396dbd35 /media-video/pipewire | |
parent | media-video/wireplumber: Disable sound server parts (diff) | |
download | gentoo-21f12bb743b94242f73cef85ef24fdf6ff703eed.tar.gz gentoo-21f12bb743b94242f73cef85ef24fdf6ff703eed.tar.bz2 gentoo-21f12bb743b94242f73cef85ef24fdf6ff703eed.zip |
media-video/pipewire: Add USE sound-server
Add USE sound-server to enable sound server with alsa and bluetooth devices.
Conditionally enable required wireplumber monitor parts and pipewire-pulse.
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/pipewire')
-rw-r--r-- | media-video/pipewire/metadata.xml | 1 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.53.ebuild | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index b7e4f57f5480..08adc4c25b4f 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -28,5 +28,6 @@ <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> <flag name="system-service">Install systemd unit files for running as a system service. Not recommended.</flag> <flag name="X">Enable audible bell for X11</flag> + <flag name="sound-server">Provide sound server using ALSA and bluetooth devices</flag> </use> </pkgmetadata> diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild b/media-video/pipewire/pipewire-0.3.53.ebuild index 9ab78449ccc3..a2f1daf3b80c 100644 --- a/media-video/pipewire/pipewire-0.3.53.ebuild +++ b/media-video/pipewire/pipewire-0.3.53.ebuild @@ -28,7 +28,8 @@ HOMEPAGE="https://pipewire.org/" LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa +sound-server ssl system-service systemd test udev v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -36,6 +37,7 @@ IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewir # JACK's sink - doing so is likely to yield no audio, cause a CPU # cycles consuming loop (and may even cause GUI crashes)! +# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled REQUIRED_USE=" jack-sdk? ( !jack-client ) system-service? ( systemd ) @@ -250,12 +252,26 @@ multilib_src_install_all() { dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf fi + # Enable required wireplumber alsa and bluez monitors + if use sound-server; then + dodir /etc/wireplumber/main.lua.d + echo "alsa_monitor.enabled = true" > ${D}/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua + dodir /etc/wireplumber/bluetooth.lua.d + echo "bluez_monitor.enabled = true" > ${D}/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua + fi + if ! use systemd; then insinto /etc/xdg/autostart newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop exeinto /usr/bin newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + + # Disable pipewire-pulse if sound-server is disabled. + if ! use sound-server ; then + sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die + fi + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher fi } @@ -310,7 +326,8 @@ pkg_postinst() { ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" ewarn "advised that a D-Bus user session is set up before starting the script." ewarn - if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + + if use sound-server && ( 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 pulseaudio client configuration files:" elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" |