package/alsa-lib: add BR2_PACKAGE_ALSA_LIB_UCM

ucm needs mixer since version 1.2.1 and
https://github.com/alsa-project/alsa-lib/commit/5c88b183718ce3df11bc4753c76d95f3e9de6c7e

So add a BR2_PACKAGE_ALSA_LIB_UCM option that selects
BR2_PACKAGE_ALSA_LIB_MIXER and selects this new option in
BR2_PACKAGE_ALSA_UTILS_ALSAUCM to avoid a build failure

Fixes:
 - http://autobuild.buildroot.org/results/aaa615d4e38d100bb9001ecdf7357e755ef42a87

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 995d37916755900a4639ad56c2888d26617a39e3..f334b66bffeeff41df42701862502339934d4947 100644 (file)
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -66,6 +66,11 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
        bool "seq"
        default y
 
+config BR2_PACKAGE_ALSA_LIB_UCM
+       bool "ucm"
+       default y
+       select BR2_PACKAGE_ALSA_LIB_MIXER
+
 config BR2_PACKAGE_ALSA_LIB_ALISP
        bool "alisp"
        default y

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 72e6c3428255043a2ed5cb4abff8ebbfa1a7c93c..954cbfb2414c905cf7149f1d2c7e2397d50c8045 100644 (file)
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -45,6 +45,9 @@ endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
 ALSA_LIB_CONF_OPTS += --disable-seq
 endif
+ifneq ($(BR2_PACKAGE_ALSA_LIB_UCM),y)
+ALSA_LIB_CONF_OPTS += --disable-ucm
+endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y)
 ALSA_LIB_CONF_OPTS += --disable-alisp
 endif

diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
index 012f28aef46fdcd4476cda90ac8b80550b5beac7..2d7062b0ca87eaa4a6984094abb99fe588eec0e7 100644 (file)
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@@ -41,6 +41,7 @@ comment "alsamixer needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_ALSA_UTILS_ALSAUCM
        bool "alsaucm"
+       select BR2_PACKAGE_ALSA_LIB_UCM
 
 config BR2_PACKAGE_ALSA_UTILS_ALSATPLG
        bool "alsatplg"