From fd4783258b187b06ce9da6baaa4b1b9197c3f184 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Jul 2022 14:24:49 +0200 Subject: [PATCH] package/mediastreamer: simplify alsa-lib feature selection Instead of having the user need to figure out that 2 alsa-lib features are needed for mediastreamer 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/mediastreamer/Config.in | 2 ++ package/mediastreamer/mediastreamer.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in index 471d8ad91a..e776b60df3 100644 --- a/package/mediastreamer/Config.in +++ b/package/mediastreamer/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_MEDIASTREAMER depends on BR2_TOOLCHAIN_HAS_THREADS # ortp depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_PCM if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_MBEDTLS select BR2_PACKAGE_ORTP help diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 5d66a09880..febbb7b343 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -22,7 +22,7 @@ MEDIASTREAMER_CONF_OPTS = \ -DENABLE_UNIT_TESTS=OFF \ -DENABLE_ZRTP=OFF -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) MEDIASTREAMER_CONF_OPTS += \ -DENABLE_ALSA=ON \ -DENABLE_SOUND=ON