commit: 003c47c5b969885b16b7a34ad182c8419c3e4656 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jul 5 18:20:22 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 6 03:47:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=003c47c5
media-video/pipewire: drop dep on media-plugins/alsa-plugins[pulseaudio] Instead, emit an optfeature message if sound-server is enabled and pipewire-alsa is disabled. This allows users to use pipewire without installing any ALSA plugins. Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/26235 Signed-off-by: Sam James <sam <AT> gentoo.org> ...e-0.3.53_p20220704.ebuild => pipewire-0.3.53_p20220704-r1.ebuild} | 5 ++++- media-video/pipewire/pipewire-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild similarity index 98% rename from media-video/pipewire/pipewire-0.3.53_p20220704.ebuild rename to media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild index 8c5648e7fe72..bd99803c14b4 100644 --- a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild +++ b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild @@ -93,7 +93,6 @@ RDEPEND=" pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon @@ -381,6 +380,10 @@ pkg_postinst() { optfeature_header "The following can be installed for optional runtime features:" optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + if use sound-server && ! use pipewire-alsa; then + optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" + fi + if has_version 'net-misc/ofono' ; then ewarn "Native backend has become default. Please disable oFono via:" if systemd_is_booted ; then diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 1c8969b1cff1..3e9252539cbb 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -93,7 +93,6 @@ RDEPEND=" pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon @@ -381,6 +380,10 @@ pkg_postinst() { optfeature_header "The following can be installed for optional runtime features:" optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + if use sound-server && ! use pipewire-alsa; then + optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" + fi + if has_version 'net-misc/ofono' ; then ewarn "Native backend has become default. Please disable oFono via:" if systemd_is_booted ; then
