diff mbox series

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

Message ID 20250425062251.2825835-2-michael.opdenacker@rootcommit.com
State New
Headers show
Series [1/4] alsa-lib: upgrade 1.2.13 -> 1.2.14 | expand

Commit Message

Michael Opdenacker April 25, 2025, 6:23 a.m. UTC 
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 mbox series

Patch

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