From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] alsa-utils: fix build with(out) aplaymidi
Date: Wed, 18 Oct 2023 09:42:53 +0200 [thread overview]
Message-ID: <20231018074253.3107680-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20231009124657.2869152-1-p.zabel@pengutronix.de>
Thanks, applied as 12c625e7d54d51a886c57e88466fec8e6fbb34cc.
Michael
[sent from post-receive hook]
On Wed, 18 Oct 2023 09:42:53 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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.zabel@pengutronix.de>
> Message-Id: <20231009124657.2869152-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
prev parent reply other threads:[~2023-10-18 7:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 12:46 [ptxdist] [PATCH] " Philipp Zabel
2023-10-18 7:42 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018074253.3107680-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox