alsa-utils: upgrade 1.2.10 -> 1.2.11

- Upstream release upgrade
  See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11
- Remove merged patches

(From OE-Core rev: 877ab719495e0d6d228e355e81a52db4a1291b6e)

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Opdenacker
2024-02-08 09:44:06 +01:00
committed by Richard Purdie
parent a8cf6842ed
commit be94979c69
3 changed files with 1 additions and 65 deletions

View File

@@ -1,31 +0,0 @@
From 35a3382f3818d29b60f4c888e338189a4d93d0e5 Mon Sep 17 00:00:00 2001
From: Michael Opdenacker <michael.opdenacker@bootlin.com>
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 <michael.opdenacker@bootlin.com>
---
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 <fcntl.h>
#include <getopt.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <arpa/inet.h>
int debug = 0;
--
2.34.1

View File

@@ -1,31 +0,0 @@
From d8a8a9affd5726827ef3995652248595b4a8c87e Mon Sep 17 00:00:00 2001
From: Michael Opdenacker <michael.opdenacker@bootlin.com>
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 <michael.opdenacker@bootlin.com>
---
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 <sys/stat.h>
#include <getopt.h>
#include <assert.h>
+#include <locale.h>
#include <alsa/asoundlib.h>
#include <alsa/topology.h>
--
2.34.1

View File

@@ -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