From 94ab3132cc232f70d1770bcf263e44d2cfa6f6ae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Jul 2022 08:27:31 +0200 Subject: [PATCH] package/pipewire: simplify alsa-lib feature selection Instead of having the user need to figure out that 2 alsa-lib features are needed for pipewire ALSA support, have the top-level pulseaudio option select the relevant alsa-lib features, when alsa-lib is enabled as already done for pulseaudio in commit 97cd3680a4cc4bc0c71bccccb1459eda4b880159 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pipewire/Config.in | 2 ++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index 3bfcf42a81..f038291e87 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PIPEWIRE depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_PACKAGE_ALSA_LIB_UCM if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_SEQ if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime help PipeWire is a server and user space API to deal with diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index ecfb6c0ae2..790d9c8d9f 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -77,7 +77,7 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB),y) PIPEWIRE_CONF_OPTS += -Dpipewire-alsa=enabled PIPEWIRE_DEPENDENCIES += alsa-lib -ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_UCM)$(BR2_PACKAGE_HAS_UDEV),yyy) +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) PIPEWIRE_CONF_OPTS += -Dalsa=enabled else PIPEWIRE_CONF_OPTS += -Dalsa=disabled