If alsa-lib is built with ALSA_LIB_SEQ enabled, alsa-utils will always
build aplaymidi, and it will try to use a header alsa/ump_msg.h that is
only installed with ALSA_LIB_RAWMIDI enabled. Select ALSA_LIB_RAWMIDI
to install the missing header when aplaymidi is going to be installed
via ALSA_UTILS_MIDI, and set an override to stop it from including the
missing header otherwise.
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
rules/alsa-utils.in | 2 +-
rules/alsa-utils.make | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index 78c60f0c2b40..95c27c5baa07 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -5,7 +5,7 @@ menuconfig ALSA_UTILS
prompt "alsa utils "
select ALSA_LIB
select ALSA_LIB_UCM if ALSA_UTILS_USE_CASE_MANAGER
- select ALSA_LIB_RAWMIDI if ALSA_UTILS_RAW_MIDI
+ select ALSA_LIB_RAWMIDI if ALSA_UTILS_RAW_MIDI || ALSA_UTILS_MIDI
select ALSA_LIB_MIXER if ALSA_UTILS_AMIXER || ALSA_UTILS_ALSAMIXER
select ALSA_LIB_PCM if ALSA_UTILS_APLAYRECORD || ALSA_UTILS_IECSET
|| ALSA_UTILS_MIDI || ALSA_UTILS_ALSALOOP
select ALSA_LIB_SEQ if ALSA_UTILS_SEQTOOLS || ALSA_UTILS_ACONNECT
|| ALSA_UTILS_MIDI
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index f99a4768fb19..588cf7cffa41 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -37,7 +37,8 @@ ALSA_UTILS_LICENSE_FILES := \
ALSA_UTILS_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_header_alsa_mixer_h=$(call ptx/yesno,
PTXCONF_ALSA_UTILS_ALSAMIXER) \
- ac_cv_header_alsa_rawmidi_h=$(call ptx/yesno,
PTXCONF_ALSA_UTILS_RAW_MIDI)
+ ac_cv_header_alsa_rawmidi_h=$(call ptx/yesno,
PTXCONF_ALSA_UTILS_RAW_MIDI) \
+ ac_cv_lib_asound_snd_seq_client_info_get_midi_version=$(call ptx/yesno,
PTXCONF_ALSA_UTILS_MIDI)
#
# autoconf
--
2.39.2
