aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2017-12-20 18:02:50 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-12-20 21:37:16 +0100
commit8a560563f94e2aa2053db1cd41aa6c74ece1957c (patch)
treed29c361723ce5f6cbecf452d5c8b0c80f4cf5cf2
parent388a4bda6b542168f657f45689e5b756e842c416 (diff)
downloadbuildroot-8a560563f94e2aa2053db1cd41aa6c74ece1957c.tar.gz
buildroot-8a560563f94e2aa2053db1cd41aa6c74ece1957c.tar.bz2
pulseaudio: normalize alsa-lib optional dependency
Put together alsa-lib dependency and configure option code. As a side effect we now avoid alsa-lib dependency when the required support in alsa is missing. Use positive logic. Explicitly enable alsa support when available. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pulseaudio/pulseaudio.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index a30d5401ba..3863557881 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -18,7 +18,6 @@ PULSEAUDIO_CONF_OPTS = \
PULSEAUDIO_DEPENDENCIES = \
host-pkgconf libtool libsndfile speex host-intltool \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
- $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
$(if $(BR2_PACKAGE_DBUS),dbus) \
@@ -119,7 +118,10 @@ PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no
endif
# pulseaudio alsa backend needs pcm/mixer apis
-ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+PULSEAUDIO_DEPENDENCIES += alsa-lib
+PULSEAUDIO_CONF_OPTS += --enable-alsa
+else
PULSEAUDIO_CONF_OPTS += --disable-alsa
endif