From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 18 Oct 2023 09:43:33 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qt1DJ-00CkCo-Ec for lore@lore.pengutronix.de; Wed, 18 Oct 2023 09:43:33 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qt1DG-0003oV-Dp; Wed, 18 Oct 2023 09:43:30 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qt1Cf-0002WV-N8; Wed, 18 Oct 2023 09:42:53 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qt1Cf-002VHm-Ao; Wed, 18 Oct 2023 09:42:53 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qt1Cf-00D2S3-0x; Wed, 18 Oct 2023 09:42:53 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 18 Oct 2023 09:42:53 +0200 Message-Id: <20231018074253.3107680-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009124657.2869152-1-p.zabel@pengutronix.de> References: <20231009124657.2869152-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] alsa-utils: fix build with(out) aplaymidi X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 12c625e7d54d51a886c57e88466fec8e6fbb34cc. Michael [sent from post-receive hook] On Wed, 18 Oct 2023 09:42:53 +0200, Philipp Zabel 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 > Message-Id: <20231009124657.2869152-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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