summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@cold-front.org>2022-04-27 20:09:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-12 16:44:05 +0100
commit681ae51e6e72b29ebe1e1b2efe4213065373d46f (patch)
tree6092ae66db2a9a80818a6677b7fccf28eb8566fb
parent1c65a77b390e372672a6c6ee8a51e1042fc6ab0e (diff)
downloadpoky-681ae51e6e72b29ebe1e1b2efe4213065373d46f.tar.gz
pulseaudio: conditionally depend on alsa-plugins-pulseaudio-conf
The alsa-plugins-pulseaudio-conf package is only enabled when DISTRO_FEATURES contains pulseaudio. (From OE-Core rev: 1800c06e254d44b6439dee82b7a4f4b678479b62) Signed-off-by: Justin Bronder <jsbronder@cold-front.org> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 54e9b8f308f28bb2db37f5ea5b85e6a1608c0516) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a69dd32bd7..821ce7d1df 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -254,7 +254,7 @@ RDEPENDS:pulseaudio-server = " \
254# If the server is installed, it's usually desirable to make ALSA applications 254# If the server is installed, it's usually desirable to make ALSA applications
255# use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration 255# use PulseAudio. alsa-plugins-pulseaudio-conf will install the configuration
256# that makes the PulseAudio plugin the default ALSA device. 256# that makes the PulseAudio plugin the default ALSA device.
257RDEPENDS:pulseaudio-server += "alsa-plugins-pulseaudio-conf" 257RDEPENDS:pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}"
258 258
259# pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG 259# pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG
260# but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES 260# but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES