Skip to contentSkip to conversation

pulseaudio: normalize alsa-lib optional dependency

PATCH New Baruch Siach 2 participants 6 messages Dec 20, 2017 – Dec 27, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 package/pulseaudio/pulseaudio.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/pulseaudio/pulseaudio.mk +4 -2
index a30d5401bae2..3863557881e5 100644
@@ -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
Signature · 1 line
2.15.1
author
#1 lore raw

PATCH 2/2 pulseaudio: fix libsamplerate dependency

The (deprecated) libsamplerate support is not enabled unless --enable-samplerate is passed to configure. Fix this.

Signed-off-by Baruch Siach <[email protected]>
---
 package/pulseaudio/pulseaudio.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/pulseaudio/pulseaudio.mk +7 -1
index 3863557881e5..13fcec52a3b3 100644
@@ -17,7 +17,6 @@ PULSEAUDIO_CONF_OPTS = \
 
 PULSEAUDIO_DEPENDENCIES = \
 	host-pkgconf libtool libsndfile speex host-intltool \
-	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
 	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \

@@ -25,6 +24,13 @@ PULSEAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+PULSEAUDIO_CONF_OPTS += --enable-samplerate
+PULSEAUDIO_DEPENDENCIES += libsamplerate
+else
+PULSEAUDIO_CONF_OPTS += --disable-samplerate
+endif
+
 ifeq ($(BR2_PACKAGE_GDBM),y)
 PULSEAUDIO_CONF_OPTS += --with-database=gdbm
 PULSEAUDIO_DEPENDENCIES += gdbm
Signature · 1 line
2.15.1
#2 lore raw

PATCH 2/2 pulseaudio: fix libsamplerate dependency

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

The (deprecated) libsamplerate support is not enabled unless --enable-samplerate is passed to configure. Fix this.

Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 pulseaudio: normalize alsa-lib optional dependency

In reply to Baruch Siach
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 pulseaudio: normalize alsa-lib optional dependency

In reply to Baruch Siach
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

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 <[email protected]>

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard