[PATCH 1/4] alsa-lib: upgrade 1.2.13 -> 1.2.14

[PATCH 1/4] alsa-lib: upgrade 1.2.13 -> 1.2.14

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14
Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 .../alsa/{alsa-lib_1.2.13.bb => alsa-lib_1.2.14.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.13.bb => alsa-lib_1.2.14.bb} (94%)

diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.13.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
similarity index 94%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.13.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
index 4572eff97f..41a42f9ecc 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.13.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
                     "
 
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "8c4ff37553cbe89618e187e4c779f71a9bb2a8b27b91f87ed40987cc9233d8f6"
+SRC_URI[sha256sum] = "be9c88a0b3604367dd74167a2b754a35e142f670292ae47a2fdef27a2ee97a32"
 
 inherit autotools pkgconfig
 

[PATCH 2/4] alsa-tools: upgrade 1.2.11 -> 1.2.14

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Remove 1 patch now included upstream.

Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 ...k-fix-reset_changes_boot-declaration.patch | 26 -------------------
 ...a-tools_1.2.11.bb => alsa-tools_1.2.14.bb} |  5 ++--
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.2.11.bb => alsa-tools_1.2.14.bb} (95%)

diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch b/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch
deleted file mode 100644
index 0892957507..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2b666ccbd616e0e0215241cb69b65d69d5146c8c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 27 Jan 2025 11:02:21 +0100
-Subject: [PATCH] hdajackretask: fix reset_changes_boot() declaration
-
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-tools/commit/5eaadd15bda4cf0424ee2470a6d304a0c2ce10cb]
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- hdajackretask/apply-changes.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hdajackretask/apply-changes.h b/hdajackretask/apply-changes.h
-index e08d66d..e431a0d 100644
---- a/hdajackretask/apply-changes.h
-+++ b/hdajackretask/apply-changes.h
-@@ -9,7 +9,7 @@ gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int
- 
- gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device, 
-     const char* model, const char* hints, GError** err);
--gboolean reset_changes_boot();
-+gboolean reset_changes_boot(GError ** err);
- 
- #endif
- 
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb
similarity index 95%
rename from meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
rename to meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb
index 0b884e2075..751d9e8a76 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65
                     file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \
                     "
 
-SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \
-           file://0001-hdajackretask-fix-reset_changes_boot-declaration.patch"
+SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
 
-SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9"
+SRC_URI[sha256sum] = "faef6fdd39ec79c9a5473dc63aa1b6331bf7664a9d452a0a8198cec7016cbc6f"
 
 inherit autotools-brokensep pkgconfig
 # brokensep as as10k1 (and probably more) fail out of tree

[PATCH 3/4] alsa-ucm-conf: upgrade 1.2.13 -> 1.2.14

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14
Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 .../alsa/{alsa-ucm-conf_1.2.13.bb => alsa-ucm-conf_1.2.14.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.13.bb => alsa-ucm-conf_1.2.14.bb} (89%)

diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.13.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.13.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb
index 1cba08b97a..d9ef831937 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.13.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.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] = "4483b6e3983cca08fd326a73fbae449b5036e444fb1a07c0dee74b504b7ab5af"
+SRC_URI[sha256sum] = "32e9809f592d92b978aa1032e35293c33b8d0f1ec475f937022c3ee9a3069c21"
 # Something went wrong at upstream tarballing
 
 inherit allarch

[PATCH 4/4] alsa-utils: upgrade 1.2.13 -> 1.2.14

[michael.opdenacker]

From: Michael Opdenacker <michael.opdenacker@rootcommit.com>

Remove 2 patches now included upstream.

Changelog:
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14

Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
---
 ...restore.rules-fix-alsa_restore_go-st.patch | 42 -------------------
 ...restore.rules-fix-AMD-acp-pdm-mach-l.patch | 35 ----------------
 ...a-utils_1.2.13.bb => alsa-utils_1.2.14.bb} |  7 +---
 3 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.13.bb => alsa-utils_1.2.14.bb} (95%)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
deleted file mode 100644
index ea02fdb8c5..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 14 Nov 2024 09:38:49 +0100
-Subject: [PATCH 1/2] alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std
-
-Fix the label mismatch which was introduced in the transition from the
-temporary test rules.
-
-Closes: https://github.com/alsa-project/alsa-utils/issues/280
-Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- alsactl/90-alsa-restore.rules.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
-index 85f0b15f4856..dae2ed8ccc8f 100644
---- a/alsactl/90-alsa-restore.rules.in
-+++ b/alsactl/90-alsa-restore.rules.in
-@@ -3,6 +3,8 @@
- ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go"
- GOTO="alsa_restore_end"
- 
-+LABEL="alsa_restore_go"
-+
- ENV{ALSA_CARD_NUMBER}="$attr{device/number}"
- 
- # mark HDA analog card; HDMI/DP card does not have capture devices
-@@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std"
- IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card"
- ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}"
- 
--LABEL="alsa_restore_go"
-+LABEL="alsa_restore_std"
- TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}"
- TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}"
- 
--- 
-2.25.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch b/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch
deleted file mode 100644
index 2299718d14..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6f7ce73159c02b726a6f0fe0acff961c95e337a8 Mon Sep 17 00:00:00 2001
-From: Aaron Ma <aaron.ma@canonical.com>
-Date: Wed, 20 Nov 2024 15:55:02 +0800
-Subject: [PATCH 2/2] alsactl: 90-alsa-restore.rules - fix AMD acp-pdm-mach
- link
-
-The link name of AMD ACP digital microphones driver acp-pdm-mach
-is acp-dmic-codec. Fix it to make UCM initialize it again.
-
-Closes: https://github.com/alsa-project/alsa-utils/pull/281
-Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
-Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/6f7ce73159c02b726a6f0fe0acff961c95e337a8]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- alsactl/90-alsa-restore.rules.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
-index dae2ed8ccc8f..5db6080b0dc6 100644
---- a/alsactl/90-alsa-restore.rules.in
-+++ b/alsactl/90-alsa-restore.rules.in
-@@ -14,7 +14,7 @@ DRIVERS=="snd_hda_intel", TEST=="device/pcmC$env{ALSA_CARD_NUMBER}D0p", RUN+="/b
- TEST=="device/device/acp3x-dmic-capture", GOTO="alsa_hda_analog"
- TEST=="device/device/acp6x-dmic-capture", GOTO="alsa_hda_analog"
- TEST=="device/device/acp63-dmic-capture", GOTO="alsa_hda_analog"
--TEST=="device/device/acp-pdm-dmic", GOTO="alsa_hda_analog"
-+TEST=="device/device/acp-dmic-codec", GOTO="alsa_hda_analog"
- GOTO="alsa_restore_std"
- 
- LABEL="alsa_hda_analog"
--- 
-2.25.1
-
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
similarity index 95%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
index 91dcee1453..74b36291d6 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.13.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
@@ -24,11 +24,8 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # 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-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch \
-           file://0002-alsactl-90-alsa-restore.rules-fix-AMD-acp-pdm-mach-l.patch \
-           "
-SRC_URI[sha256sum] = "1702a6b1cdf9ba3e996ecbc1ddcf9171e6808f5961d503d0f27e80ee162f1daa"
+SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with