From patchwork Wed Feb 7 21:58:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Opdenacker X-Patchwork-Id: 39010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 086CDC4828D for ; Wed, 7 Feb 2024 21:59:12 +0000 (UTC) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by mx.groups.io with SMTP id smtpd.web10.3024.1707343148998625383 for ; Wed, 07 Feb 2024 13:59:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=gkPAOXFS; spf=pass (domain: bootlin.com, ip: 217.70.183.200, mailfrom: michael.opdenacker@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id AF01A20007; Wed, 7 Feb 2024 21:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707343146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mfV4S9CWbHTYl+Lqbc+PPyquwHQwrn7zGb8ZJshwkCE=; b=gkPAOXFSFzUjnb+Nxkd8t1WIUHXdvDv8CNuHVepWlFzKbc8sPd72g8SoXrPW1kXiFGXts5 /zu5VhfwvdogLETyUUSnsfCgtEces3UlC4rrm6xrP+RhBkR4u4D4VEJzg4N3T8UbjgnQd/ tbEssvZqPpoKlLJQQqMYQlt1Z7cWEwBkRyaZbInq/MdrEb589C3ESuhVq3E1GyBT0PX62B 798hSJ1gh/UKbslSazjoo3Z0AUM9e3vv99t1myxXmUxsenllCv6OnfFGESQuUYnejsXkOW JVmqlEgiZPl8yz2qzfqe4qH++rEKovkXbUQzagRUkuf6ju9vncS48UOauPLzoQ== From: michael.opdenacker@bootlin.com To: openembedded-core@lists.openembedded.org Cc: Michael Opdenacker Subject: [PATCH v2 1/4] alsa-lib: upgrade 1.2.10 -> 1.2.11 Date: Wed, 7 Feb 2024 22:58:50 +0100 Message-Id: <20240207215853.3605620-2-michael.opdenacker@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> References: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: michael.opdenacker@bootlin.com List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 07 Feb 2024 21:59:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195085 From: Michael Opdenacker - Upstream release update See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 - Remove merged patch - Add new patch merged after the release Signed-off-by: Michael Opdenacker --- ...STRING-macro-outside-PIC-ifdef-block.patch | 52 ------------------- ...topology-correct-version-script-path.patch | 38 ++++++++++++++ ...{alsa-lib_1.2.10.bb => alsa-lib_1.2.11.bb} | 4 +- 3 files changed, 40 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.10.bb => alsa-lib_1.2.11.bb} (89%) diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 9a7ba0d847..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -From: Jaroslav Kysela - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c] -Signed-off-by: Jaroslav Kysela ---- - include/global.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/global.h b/include/global.h -index dfe9bc2b..3ecaeee8 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** --- -2.34.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch new file mode 100644 index 0000000000..30aeef5817 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch @@ -0,0 +1,38 @@ +From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Tue, 30 Jan 2024 14:24:25 +0100 +Subject: [PATCH] topology: correct version script path + +From: Jan Palus + +contrary to libasound, version script for libatopology is a regular +source file. while it's often the case that $(builddir) and $(srcdir) +point to the same directory, they don't always have to. therefore path +needs to point explicitly to $(srcdir) for Versions script in topology + +Closes: https://github.com/alsa-project/alsa-lib/pull/383 +Fixes: GH-382 +Fixes: dc7da761f3a2 ("topology: separate Versions linker script") +Signed-off-by: Jan Palus +Signed-off-by: Jaroslav Kysela +Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917] +--- + src/topology/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am +index 04299588..e0b78373 100644 +--- a/src/topology/Makefile.am ++++ b/src/topology/Makefile.am +@@ -2,7 +2,7 @@ EXTRA_DIST = Versions + COMPATNUM=@LIBTOOL_VERSION_INFO@ + + if VERSIONED_SYMBOLS +-VSYMS = -Wl,--version-script=Versions ++VSYMS = -Wl,--version-script=$(srcdir)/Versions + else + VSYMS = + endif +-- +2.34.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb similarity index 89% rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb index 83bc6877d2..c212b17aa3 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ " SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ - file://0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch \ + file://0001-topology-correct-version-script-path.patch \ " -SRC_URI[sha256sum] = "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e" +SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d" inherit autotools pkgconfig From patchwork Wed Feb 7 21:58:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Opdenacker X-Patchwork-Id: 39013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCA0EC4828D for ; Wed, 7 Feb 2024 21:59:21 +0000 (UTC) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by mx.groups.io with SMTP id smtpd.web11.3029.1707343152298360061 for ; Wed, 07 Feb 2024 13:59:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=Ja+9Gwd1; spf=pass (domain: bootlin.com, ip: 217.70.183.195, mailfrom: michael.opdenacker@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7AE3260003; Wed, 7 Feb 2024 21:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707343150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=14LE16PrGUp8EseE0tkjAStpiztI5yE0EAvWmODvZCM=; b=Ja+9Gwd1d66CMzJkcp3p0R0SxmPplWiilvx3EyInVNywvyLR4l7CQbBDyZbh/nhlxuLNlo 86HgGwKv/qrGZoIh7IhasIf34l6b6lrfh4vSJ5V5wHQMYHbLQmZjwGVAxEbWs7WrI26lgF uPp+prVmb3ylR+HrODnRKjafR27UPGqsuIHqWnV87VGH9evq0gjD4FB1TYCaRvnDp4PFUi DmtkMUw65TeoqfVIbp5yShwZwwSGx1x6VdPQs4yGVIx0Dn73fANE2Nem2JF4eEF7fWN4LA qR5rbQG7r8OrURenI1/GeQepMcpkwIqmORb4jpEAI2wWNDpXXpmdV35PT8Dgtg== From: michael.opdenacker@bootlin.com To: openembedded-core@lists.openembedded.org Cc: Michael Opdenacker Subject: [PATCH v2 2/4] alsa-tools: upgrade 1.2.5 -> 1.2.11 Date: Wed, 7 Feb 2024 22:58:51 +0100 Message-Id: <20240207215853.3605620-3-michael.opdenacker@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> References: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: michael.opdenacker@bootlin.com List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 07 Feb 2024 21:59:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195086 From: Michael Opdenacker - Upstream release update See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 --- Changes in V2: - Fix commit title, correcting updated version for alsa-tools --- .../alsa/{alsa-tools_1.2.5.bb => alsa-tools_1.2.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/alsa/{alsa-tools_1.2.5.bb => alsa-tools_1.2.11.bb} (97%) diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb index 56acc84559..53868041c0 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65 SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2" -SRC_URI[sha256sum] = "35a71027a01f4d7de4722e223520e940de68b3c570b6c671691567ae28f9893e" +SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9" inherit autotools-brokensep pkgconfig # brokensep as as10k1 (and probably more) fail out of tree From patchwork Wed Feb 7 21:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Opdenacker X-Patchwork-Id: 39011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0AB5C4828F for ; Wed, 7 Feb 2024 21:59:21 +0000 (UTC) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by mx.groups.io with SMTP id smtpd.web11.3034.1707343154241990947 for ; Wed, 07 Feb 2024 13:59:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=mai4cmTS; spf=pass (domain: bootlin.com, ip: 217.70.183.197, mailfrom: michael.opdenacker@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3367D1C0003; Wed, 7 Feb 2024 21:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707343152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mYbcEo063N795jQQOnqrGAXWCrpPq/OVnFktIs79xc8=; b=mai4cmTS5490KPBTCSQU/3XXloNMoP0ysU1M9mq7nV3Sdn/gZPesoaz5mCzcR8wJNqT5FR jj3O4jXKwh3lDLG5mwaBO+Gt4Gjl94q+7lu9ymcXvVegNKxLe8MWbQMTmrPNoD5yvg7aBA cf0Y0GrS+8SiemQGKWN/jDX1Bc6+eof1YLqbVpeRY04efSeIfg+StFHdY4eiPAWfIXnUZD qsKiQuJppIIMYzh8dEzzCqAPo9p8HqYq5wrX01HTuaUGvYfYnbZhV9RlsXSWWvAS9lTXLG 6FSxHwDWvaD+5yLXIqc341ZBK3mhlVZyPHgRWMzJwQP42E3YS/tCQC9f+9z9VQ== From: michael.opdenacker@bootlin.com To: openembedded-core@lists.openembedded.org Cc: Michael Opdenacker Subject: [PATCH v2 3/4] alsa-ucm-conf: upgrade 1.2.10 -> 1.2.11 Date: Wed, 7 Feb 2024 22:58:52 +0100 Message-Id: <20240207215853.3605620-4-michael.opdenacker@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> References: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: michael.opdenacker@bootlin.com List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 07 Feb 2024 21:59:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195087 From: Michael Opdenacker - Upstream release update See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 --- .../alsa/{alsa-ucm-conf_1.2.10.bb => alsa-ucm-conf_1.2.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.10.bb => alsa-ucm-conf_1.2.11.bb} (89%) diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.10.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb similarity index 89% rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.10.bb rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb index f4fd284db8..ce1a42c9b8 100644 --- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.10.bb +++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "9c21e3f01ff00baa758df17e867cd36e24ebb41a6bec49737e99105e16f2ae97" +SRC_URI[sha256sum] = "387c01cf30e2a1676d7b8f72b2681cf219abca70dd1ec2a9e33add5bf3feae81" # Something went wrong at upstream tarballing inherit allarch From patchwork Wed Feb 7 21:58:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Opdenacker X-Patchwork-Id: 39012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E90A7C4829A for ; Wed, 7 Feb 2024 21:59:21 +0000 (UTC) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by mx.groups.io with SMTP id smtpd.web10.3026.1707343154740083248 for ; Wed, 07 Feb 2024 13:59:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=p5LYLj9y; spf=pass (domain: bootlin.com, ip: 217.70.183.198, mailfrom: michael.opdenacker@bootlin.com) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2A615C0005; Wed, 7 Feb 2024 21:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1707343153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rpSNVrweZnuALMFbFs+swREpk/mOQJPfG0TVKz6G5n4=; b=p5LYLj9y+UQkMS4NpEXCG1rf7Sm6dpqq3KcPMDaY2OxF14rLoCODZH6r6+y9+Bs3eigjnV vyr/ZmC1lsKvu1nXPA4TriybOLetkZjdSKMWREX9DaoHCXUNxyCqXBf4LImYDRoY1H9xfc wXa+E01dw0FK1+GFbVYGBSZE27oVW6Syc3ODaOXq7bo4OfCK30nOA/YeAV6ZAP2fCwtbSC q6RZ3ha6cTHE4yfhPkyVTJl9VucJqZrYaeUwwUfHEFC5VeXX1ceViNzpXKfXcOKlzm9QYC BZlLKXHs8S7Wg4rLt1001f2VheyihW3p+qVSdfzSdBax7FsQkAHZiRuYUt6csQ== From: michael.opdenacker@bootlin.com To: openembedded-core@lists.openembedded.org Cc: Michael Opdenacker Subject: [PATCH v2 4/4] alsa-utils: upgrade 1.2.10 -> 1.2.11 Date: Wed, 7 Feb 2024 22:58:53 +0100 Message-Id: <20240207215853.3605620-5-michael.opdenacker@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> References: <20240207215853.3605620-1-michael.opdenacker@bootlin.com> MIME-Version: 1.0 X-GND-Sasl: michael.opdenacker@bootlin.com List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 07 Feb 2024 21:59:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195088 From: Michael Opdenacker - Upstream release upgrade See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 - Remove merged patches Signed-off-by: Michael Opdenacker --- ...nhlt-dmic-info.c-include-sys-types.h.patch | 31 ------------------- .../0001-topology.c-include-locale.h.patch | 31 ------------------- ...a-utils_1.2.10.bb => alsa-utils_1.2.11.bb} | 4 +-- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.10.bb => alsa-utils_1.2.11.bb} (96%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch deleted file mode 100644 index 0ebf98b41e..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 35a3382f3818d29b60f4c888e338189a4d93d0e5 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 11:47:50 +0200 -Subject: [PATCH] nhlt/nhlt-dmic-info.c: include sys/types.h - -To fix an issue compiling with the musl C library: -nhlt-dmic-info.c: error: unknown type name 'u_int8_t' - -https://github.com/alsa-project/alsa-utils/issues/238 - -Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3] -Signed-off-by: Michael Opdenacker ---- - nhlt/nhlt-dmic-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c -index 3f6c64d..331555a 100644 ---- a/nhlt/nhlt-dmic-info.c -+++ b/nhlt/nhlt-dmic-info.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - - int debug = 0; --- -2.34.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch deleted file mode 100644 index e1c7470356..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d8a8a9affd5726827ef3995652248595b4a8c87e Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 11:27:46 +0200 -Subject: [PATCH] topology.c: include locale.h - -To fix an issue compiling with the musl C library: -topology.c: error: 'LC_ALL' undeclared - -https://github.com/alsa-project/alsa-utils/issues/239 - -Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02] -Signed-off-by: Michael Opdenacker ---- - topology/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/topology/topology.c b/topology/topology.c -index 1840ffe..5d03a8b 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.34.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb similarity index 96% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb index 4e5ed8dfa0..e598fac9f8 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb @@ -25,10 +25,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://0001-topology.c-include-locale.h.patch \ - file://0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch \ " -SRC_URI[sha256sum] = "104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a" +SRC_URI[sha256sum] = "9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with