From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Oct 2021 12:20:28 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mYQVo-0006XW-83 for lore@lore.pengutronix.de; Thu, 07 Oct 2021 12:20:28 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mYQVn-0007NI-Tr; Thu, 07 Oct 2021 12:20:27 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mYQU1-0004l2-Dr; Thu, 07 Oct 2021 12:18:37 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mYQU0-0005yT-Na; Thu, 07 Oct 2021 12:18:36 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1mYQU0-00GTGo-Mi; Thu, 07 Oct 2021 12:18:36 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 7 Oct 2021 12:18:36 +0200 Message-Id: <20211007101836.3925719-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210902203210.43812-1-clemens.gruber@pqgruber.com> References: <20210902203210.43812-1-clemens.gruber@pqgruber.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] alsa-lib: add patch to fix builds without ucm 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: Clemens Gruber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 8f5ef51d50e99c71b86ee43cad25d5f26ad92c04. Michael [sent from post-receive hook] On Thu, 07 Oct 2021 12:18:36 +0200, Clemens Gruber wrote: > Adds an upstream patch which fixes builds without the ALSA Use Case > Manager. > > Signed-off-by: Clemens Gruber > Message-Id: <20210902203210.43812-1-clemens.gruber@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch > new file mode 100644 > index 000000000000..88637479545f > --- /dev/null > +++ b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch > @@ -0,0 +1,37 @@ > +From: Jaroslav Kysela > +Date: Mon, 28 Jun 2021 12:08:53 +0200 > +Subject: [PATCH] fix build with --disable-ucm > + > +Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html > +Reported-by: Michael Forney > +Signed-off-by: Jaroslav Kysela > +--- > + include/local.h | 10 ++++++++++ > + 1 file changed, 10 insertions(+) > + > +diff --git a/include/local.h b/include/local.h > +index 4e7d88a0ecac..7cfcec53dd5d 100644 > +--- a/include/local.h > ++++ b/include/local.h > +@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in, > + void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen); > + #endif > + > ++#ifdef BUILD_UCM > ++ > + const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name); > + > + static inline int _snd_is_ucm_device(const char *name) > +@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name) > + return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm'; > + } > + > ++#else > ++ > ++static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; } > ++static inline int _snd_is_ucm_device(const char *name) { return 0; } > ++ > ++ > ++#endif > ++ > + #endif > diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.5.1/series > index f96f3345c2af..1ede62264790 100644 > --- a/patches/alsa-lib-1.2.5.1/series > +++ b/patches/alsa-lib-1.2.5.1/series > @@ -1,4 +1,5 @@ > # generated by git-ptx-patches > #tag:base --start-number 1 > 0001-add-largefile-support.patch > -# 28c8f5e33d509bdb14724d1cc3204a4d - git-ptx-patches magic > +0002-fix-build-with-disable-ucm.patch > +# e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de