From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 24 Mar 2025 16:33:34 +0000 (-0700)
Subject: alsa-tools: Fix build with gcc 15
X-Git-Tag: yocto-5.2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f30f314d03148fc4c0ebeb0e189ac42a0d31722c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

alsa-tools: Fix build with gcc 15

Fix reset_changes_boot() signature

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
new file mode 100644
index 00000000000..08929575078
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch
@@ -0,0 +1,26 @@
+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.11.bb
index 53868041c09..0b884e20753 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
@@ -12,7 +12,8 @@ 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"
+SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \
+           file://0001-hdajackretask-fix-reset_changes_boot-declaration.patch"
 
 SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9"