| 1 |
commit: 003c47c5b969885b16b7a34ad182c8419c3e4656 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 18:20:22 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 03:47:11 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=003c47c5 |
| 7 |
|
| 8 |
media-video/pipewire: drop dep on media-plugins/alsa-plugins[pulseaudio] |
| 9 |
|
| 10 |
Instead, emit an optfeature message if sound-server is enabled and |
| 11 |
pipewire-alsa is disabled. |
| 12 |
|
| 13 |
This allows users to use pipewire without installing any ALSA plugins. |
| 14 |
|
| 15 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/26235 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
...e-0.3.53_p20220704.ebuild => pipewire-0.3.53_p20220704-r1.ebuild} | 5 ++++- |
| 20 |
media-video/pipewire/pipewire-9999.ebuild | 5 ++++- |
| 21 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild |
| 24 |
similarity index 98% |
| 25 |
rename from media-video/pipewire/pipewire-0.3.53_p20220704.ebuild |
| 26 |
rename to media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild |
| 27 |
index 8c5648e7fe72..bd99803c14b4 100644 |
| 28 |
--- a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild |
| 29 |
+++ b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild |
| 30 |
@@ -93,7 +93,6 @@ RDEPEND=" |
| 31 |
pipewire-alsa? ( |
| 32 |
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] |
| 33 |
) |
| 34 |
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 35 |
sound-server? ( |
| 36 |
!media-sound/pulseaudio[daemon(+)] |
| 37 |
!media-sound/pulseaudio-daemon |
| 38 |
@@ -381,6 +380,10 @@ pkg_postinst() { |
| 39 |
optfeature_header "The following can be installed for optional runtime features:" |
| 40 |
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit |
| 41 |
|
| 42 |
+ if use sound-server && ! use pipewire-alsa; then |
| 43 |
+ optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" |
| 44 |
+ fi |
| 45 |
+ |
| 46 |
if has_version 'net-misc/ofono' ; then |
| 47 |
ewarn "Native backend has become default. Please disable oFono via:" |
| 48 |
if systemd_is_booted ; then |
| 49 |
|
| 50 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 51 |
index 1c8969b1cff1..3e9252539cbb 100644 |
| 52 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 53 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 54 |
@@ -93,7 +93,6 @@ RDEPEND=" |
| 55 |
pipewire-alsa? ( |
| 56 |
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] |
| 57 |
) |
| 58 |
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 59 |
sound-server? ( |
| 60 |
!media-sound/pulseaudio[daemon(+)] |
| 61 |
!media-sound/pulseaudio-daemon |
| 62 |
@@ -381,6 +380,10 @@ pkg_postinst() { |
| 63 |
optfeature_header "The following can be installed for optional runtime features:" |
| 64 |
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit |
| 65 |
|
| 66 |
+ if use sound-server && ! use pipewire-alsa; then |
| 67 |
+ optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" |
| 68 |
+ fi |
| 69 |
+ |
| 70 |
if has_version 'net-misc/ofono' ; then |
| 71 |
ewarn "Native backend has become default. Please disable oFono via:" |
| 72 |
if systemd_is_booted ; then |
Archives