瀏覽代碼

package/pulseaudio: simplify alsa-lib feature selection

Instead of having the user need to figure out that 3 alsa-lib features
are needed for pulseaudio ALSA support, have the top-level pulseaudio
option select the relevant alsa-lib features, when alsa-lib is
enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Thomas Petazzoni 3 年之前
父節點
當前提交
97cd3680a4
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 3 0
      package/pulseaudio/Config.in
  2. 3 2
      package/pulseaudio/pulseaudio.mk

+ 3 - 0
package/pulseaudio/Config.in

@@ -14,6 +14,9 @@ config BR2_PACKAGE_PULSEAUDIO
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_ALSA_LIB_PCM if BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_UCM if BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBTOOL

+ 3 - 2
package/pulseaudio/pulseaudio.mk

@@ -105,8 +105,9 @@ else
 PULSEAUDIO_CONF_OPTS += -Dwebrtc-aec=disabled
 endif
 
-# pulseaudio alsa backend needs pcm/mixer/ucm apis
-ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_UCM),yyy)
+# our Config.in makes sure that all needed alsa-lib features are
+# enabled
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 PULSEAUDIO_DEPENDENCIES += alsa-lib
 PULSEAUDIO_CONF_OPTS += -Dalsa=enabled
 else