From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Sep 2021 22:33:31 +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 1mLtOt-0004Pg-KM for lore@lore.pengutronix.de; Thu, 02 Sep 2021 22:33:31 +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 1mLtOt-0007i4-Ay; Thu, 02 Sep 2021 22:33:31 +0200 Received: from mail.pqgruber.com ([2a05:d014:575:f70b:4f2c:8f1d:40c4:b13e]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mLtO8-0007hv-V5 for ptxdist@pengutronix.de; Thu, 02 Sep 2021 22:32:45 +0200 Received: from workstation.tuxnet (213-47-165-233.cable.dynamic.surfer.at [213.47.165.233]) by mail.pqgruber.com (Postfix) with ESMTPSA id 619CDCDD6EB; Thu, 2 Sep 2021 22:32:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pqgruber.com; s=mail; t=1630614763; bh=ecY19JhVrwUw7hWZkwkkHQYsLnU/xpr+q7Lhmv1tQls=; h=From:To:Cc:Subject:Date:From; b=dyLIV5LWbCJGv54lyCl9nuYbXxz+51PFh0AtzJyRFh9gEdqruX7Wn7/ZnlAWsRdbZ wkm/3XPg9qCdMuiVS43YY8xT2cLetff+tIVndcMu5ARqBYc9Mnc3vjlsNFlqR9v/V9 oG2kFoR4VZaK3WgKNVSI7HXNNlrP1+nNo2nncn8M= From: Clemens Gruber To: ptxdist@pengutronix.de Date: Thu, 2 Sep 2021 22:32:10 +0200 Message-Id: <20210902203210.43812-1-clemens.gruber@pqgruber.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 Adds an upstream patch which fixes builds without the ALSA Use Case Manager. Signed-off-by: Clemens Gruber --- .../0002-fix-build-with-disable-ucm.patch | 37 +++++++++++++++++++ patches/alsa-lib-1.2.5.1/series | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch 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 000000000..886374795 --- /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 f96f3345c..1ede62264 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 -- 2.33.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de