commit: ba46ce03b945355d460941112183b7d53a0343eb Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com> AuthorDate: Thu May 12 20:55:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 10 06:57:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba46ce03
media-sound/pulseaudio-daemon: Untangle USE equalizer and fftw For USE equalizer pull required sci-libs/fftw as build and runtime dependency. Add USE fftw to enable module-virtual-surround-sink. Closes: https://bugs.gentoo.org/843131 Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/pulseaudio-daemon/metadata.xml | 5 ++++- .../pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml index 07ca89f667d0..d44e1ed3057b 100644 --- a/media-sound/pulseaudio-daemon/metadata.xml +++ b/media-sound/pulseaudio-daemon/metadata.xml @@ -44,7 +44,10 @@ </flag> <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag> <flag name="equalizer"> - Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>). + Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg> and <pkg>sys-apps/dbus</pkg>). + </flag> + <flag name="fftw"> + Enable the virtual surround sink module (requires <pkg>sci-libs/fftw</pkg>). </flag> <flag name="ssl"> Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild index 3561766e33ac..b8c4907403b4 100644 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild @@ -32,7 +32,7 @@ SLOT="0" # +alsa-plugin as discussed in bug #519530 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file -IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm +glib gstreamer gtk ipv6 jack ldac lirc +IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf" RESTRICT="!test? ( test )" @@ -83,7 +83,10 @@ COMMON_DEPEND=" dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( - sci-libs/fftw:3.0 + sci-libs/fftw:3.0= + ) + fftw? ( + sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) @@ -173,6 +176,11 @@ src_configure() { enable_bluez5_gstreamer="enabled" fi + local enable_fftw="disabled" + if use equalizer || use fftw ; then + enable_fftw="enabled" + fi + local emesonargs=( --localstatedir="${EPREFIX}"/var @@ -203,7 +211,7 @@ src_configure() { $(meson_use ofono-headset bluez5-ofono-headset) $(meson_feature dbus) $(meson_feature elogind) - $(meson_feature equalizer fftw) + -Dfftw=${enable_fftw} $(meson_feature glib) # WARNING: toggling this likely changes ABI $(meson_feature glib gsettings) # Supposedly correct? $(meson_feature gstreamer)
