summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch26
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb)5
2 files changed, 2 insertions, 29 deletions
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 @@
1From 2b666ccbd616e0e0215241cb69b65d69d5146c8c Mon Sep 17 00:00:00 2001
2From: Jaroslav Kysela <perex@perex.cz>
3Date: Mon, 27 Jan 2025 11:02:21 +0100
4Subject: [PATCH] hdajackretask: fix reset_changes_boot() declaration
5
6Upstream-Status: Backport [https://github.com/alsa-project/alsa-tools/commit/5eaadd15bda4cf0424ee2470a6d304a0c2ce10cb]
7
8Signed-off-by: Jaroslav Kysela <perex@perex.cz>
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 hdajackretask/apply-changes.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/hdajackretask/apply-changes.h b/hdajackretask/apply-changes.h
15index e08d66d..e431a0d 100644
16--- a/hdajackretask/apply-changes.h
17+++ b/hdajackretask/apply-changes.h
18@@ -9,7 +9,7 @@ gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int
19
20 gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device,
21 const char* model, const char* hints, GError** err);
22-gboolean reset_changes_boot();
23+gboolean reset_changes_boot(GError ** err);
24
25 #endif
26
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb b/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
12 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ 12 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \
13 " 13 "
14 14
15SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \ 15SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
16 file://0001-hdajackretask-fix-reset_changes_boot-declaration.patch"
17 16
18SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9" 17SRC_URI[sha256sum] = "faef6fdd39ec79c9a5473dc63aa1b6331bf7664a9d452a0a8198cec7016cbc6f"
19 18
20inherit autotools-brokensep pkgconfig 19inherit autotools-brokensep pkgconfig
21# brokensep as as10k1 (and probably more) fail out of tree 20# brokensep as as10k1 (and probably more) fail out of tree