summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2024-02-08 09:44:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-08 23:14:51 +0000
commitbe94979c6972b4a2548c1828a6310c15c13cc895 (patch)
treee06ca5de5acf317924ef8f547eb796ba4fcfad4b /meta/recipes-multimedia/alsa
parenta8cf6842ed46c69ba20bcac7b5e8f0bd594052fe (diff)
downloadpoky-be94979c6972b4a2548c1828a6310c15c13cc895.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch31
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch31
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb)4
3 files changed, 1 insertions, 65 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch
deleted file mode 100644
index 0ebf98b41e..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 35a3382f3818d29b60f4c888e338189a4d93d0e5 Mon Sep 17 00:00:00 2001
2From: Michael Opdenacker <michael.opdenacker@bootlin.com>
3Date: Tue, 19 Sep 2023 11:47:50 +0200
4Subject: [PATCH] nhlt/nhlt-dmic-info.c: include sys/types.h
5
6To fix an issue compiling with the musl C library:
7nhlt-dmic-info.c: error: unknown type name 'u_int8_t'
8
9https://github.com/alsa-project/alsa-utils/issues/238
10
11Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3]
12Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
13---
14 nhlt/nhlt-dmic-info.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c
18index 3f6c64d..331555a 100644
19--- a/nhlt/nhlt-dmic-info.c
20+++ b/nhlt/nhlt-dmic-info.c
21@@ -33,6 +33,7 @@
22 #include <fcntl.h>
23 #include <getopt.h>
24 #include <sys/stat.h>
25+#include <sys/types.h>
26 #include <arpa/inet.h>
27
28 int debug = 0;
29--
302.34.1
31
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch
deleted file mode 100644
index e1c7470356..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From d8a8a9affd5726827ef3995652248595b4a8c87e Mon Sep 17 00:00:00 2001
2From: Michael Opdenacker <michael.opdenacker@bootlin.com>
3Date: Tue, 19 Sep 2023 11:27:46 +0200
4Subject: [PATCH] topology.c: include locale.h
5
6To fix an issue compiling with the musl C library:
7topology.c: error: 'LC_ALL' undeclared
8
9https://github.com/alsa-project/alsa-utils/issues/239
10
11Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02]
12Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
13---
14 topology/topology.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/topology/topology.c b/topology/topology.c
18index 1840ffe..5d03a8b 100644
19--- a/topology/topology.c
20+++ b/topology/topology.c
21@@ -32,6 +32,7 @@
22 #include <sys/stat.h>
23 #include <getopt.h>
24 #include <assert.h>
25+#include <locale.h>
26
27 #include <alsa/asoundlib.h>
28 #include <alsa/topology.h>
29--
302.34.1
31
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
index 4e5ed8dfa0..e598fac9f8 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
@@ -25,10 +25,8 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook
25 25
26# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe 26# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
27SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ 27SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
28 file://0001-topology.c-include-locale.h.patch \
29 file://0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch \
30 " 28 "
31SRC_URI[sha256sum] = "104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a" 29SRC_URI[sha256sum] = "9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7"
32 30
33# On build machines with python-docutils (not python3-docutils !!) installed 31# On build machines with python-docutils (not python3-docutils !!) installed
34# rst2man (not rst2man.py) is detected and compile fails with 32# rst2man (not rst2man.py) is detected and compile fails with