summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2023-09-19 13:53:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-20 08:57:27 +0100
commit551a1c088796c0e179fdc4053009f097ad4dd8b3 (patch)
treede33f5514ff42d8f0f52da5eb602789825884280
parentebcf25b14f934fbd323a381604d0727a544fd4db (diff)
downloadpoky-551a1c088796c0e179fdc4053009f097ad4dd8b3.tar.gz
alsa-utils: upgrade 1.2.9 -> 1.2.10
Changelog: - po: add Korean translations - alsactl: fix compilation when building in a subdir - reshuffle included files to include config.h as first - github: update build.yml - aseqdump: fix MIDI 2.0 code - it compiles now - gitcompile: set more verbose compilation warnings - nhlt-dmic-info: fix the verbose compilation warnings for latest gcc - alsaucm: fix the verbose compilation warnings for latest gcc - aplaymidi: fix the verbose compilation warnings for latest gcc - aseqnet: fix the verbose compilation warnings for latest gcc - aseqdump: fix the verbose compilation warnings for latest gcc - aconnect: fix the verbose compilation warnings for latest gcc - speaker-test: fix the verbose compilation warnings for latest gcc - amidi: fix the verbose compilation warnings for latest gcc - bat: fix the verbose compilation warnings for latest gcc - iecset: fix the verbose compilation warnings for latest gcc - alsamixer: fix the verbose compilation warnings for latest gcc - alsaloop: fix the verbose compilation warnings for latest gcc - axfer: fix the verbose compilation warnings for latest gcc - alsactl: fix the verbose compilation warnings for latest gcc - amixer: fix the verbose compilation warnings for latest gcc - aplay: fix the verbose compilation warnings for latest gcc - topology: fix the verbose compilation warnings for latest gcc - alsactl: fix the copy-n-paste typo (SND_RAWMIDI_STREAM_*) - aseqdump: Add options to switch view mode - aseqdump: Correct wrong channel number - aseqdump: Align outputs of UMP MIDI 1.0 with legacy MIDI 1.0 - speaker-test: allow large buffer and period time setup - up to 100 seconds - topology: plugins: nhlt: remove dmic error print - Topology: NHLT: Intel: Update DMIC FIR coefficients - topology: nhlt: intel: support more device types and directions - topology: pre-processor: Add support for CombineArrays - alsactl: add define to compile with glibc 2.38 - topology: plugins: nhlt: set dmic stereo mode only in hw version 1 - aplaymidi: Add UMP support - aconnect: Add UMP support - aseqdump: Add UMP support - nhlt: add nhlt-dmic-info utility (From OE-Core rev: 24b7cd2e58c0a2f48cefb09a3363fd982d50f575) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch39
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch35
-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.10.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb)11
5 files changed, 69 insertions, 78 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch
deleted file mode 100644
index 8c23fb2cec..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a610f4c21b083c0f9cf62ad2251dfadc98abb50e Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Sat, 22 Jul 2023 15:36:09 +0000
4Subject: [PATCH] alsactl: add define to compile with glibc 2.38
5
6strlcat and strlcpy have been added to glibc 2.38.
7update the defines to use the glibc versions, and not conflict with
8string.h.
9
10ref:
11- https://sourceware.org/git/?p=glibc.git;a=commit;h=454a20c8756c9c1d55419153255fc7692b3d2199
12
13Fixes: https://github.com/alsa-project/alsa-utils/pull/225
14Signed-off-by: Jaroslav Kysela <perex@perex.cz>
15Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16
17Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/d6a71bfbde9e1710743d3a446c6ea3b41c45234e]
18---
19 alsactl/init_sysdeps.c | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c
23index 3aca1b4..f09b1ae 100644
24--- a/alsactl/init_sysdeps.c
25+++ b/alsactl/init_sysdeps.c
26@@ -18,6 +18,7 @@
27 */
28
29 #if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
30+#if !(__GLIBC_PREREQ(2, 38))
31 static size_t strlcpy(char *dst, const char *src, size_t size)
32 {
33 size_t bytes = 0;
34@@ -60,4 +61,5 @@ static size_t strlcat(char *dst, const char *src, size_t size)
35 *q = '\0';
36 return bytes;
37 }
38+#endif /* !(__GLIBC_PREREQ(2, 38)) */
39 #endif /* __GLIBC__ */
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch
deleted file mode 100644
index 3b3fe5345a..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 44636a7c5862538def0d2fac074772cc39a22a15 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Tue, 16 May 2023 02:27:59 +1000
4Subject: [PATCH] alsactl: fix compilation when building in a subdir
5
6Fixes: 613372d
7Fixes: cff2d1c
8
9Compile errors when building in a subdir:
10alsactl/alsactl.c:33:10: fatal error: os_compat.h: No such file or directory
11 33 | #include "os_compat.h"
12 | ^~~~~~~~~~~~~
13alsactl/lock.c:34:10: fatal error: os_compat.h: No such file or directory
14 34 | #include "os_compat.h"
15 | ^~~~~~~~~~~~~
16
17Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
18Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/213]
19---
20 alsactl/Makefile.am | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
24index 80dba69d..fb32c4f3 100644
25--- a/alsactl/Makefile.am
26+++ b/alsactl/Makefile.am
27@@ -9,6 +9,8 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml
28
29 AM_CFLAGS = -D_GNU_SOURCE
30
31+AM_CPPFLAGS = -I$(top_srcdir)/include
32+
33 alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \
34 daemon.c monitor.c clean.c info.c
35
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
new file mode 100644
index 0000000000..43497e3d76
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch
@@ -0,0 +1,31 @@
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: Submitted [alsa-devel@alsa-project.org]
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
new file mode 100644
index 0000000000..a4b1decceb
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch
@@ -0,0 +1,31 @@
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: Submitted [alsa-devel@alsa-project.org]
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.9.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb
index af28f5468f..4e5ed8dfa0 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb
@@ -25,10 +25,10 @@ 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-alsactl-fix-compilation-when-building-in-a-subdir.patch \ 28 file://0001-topology.c-include-locale.h.patch \
29 file://0001-alsactl-add-define-to-compile-with-glibc-2.38.patch \ 29 file://0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch \
30 " 30 "
31SRC_URI[sha256sum] = "e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd" 31SRC_URI[sha256sum] = "104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a"
32 32
33# On build machines with python-docutils (not python3-docutils !!) installed 33# On build machines with python-docutils (not python3-docutils !!) installed
34# rst2man (not rst2man.py) is detected and compile fails with 34# rst2man (not rst2man.py) is detected and compile fails with
@@ -57,6 +57,7 @@ ALSA_UTILS_PKGS = "\
57 alsa-utils-alsaloop \ 57 alsa-utils-alsaloop \
58 alsa-utils-alsaucm \ 58 alsa-utils-alsaucm \
59 alsa-utils-scripts \ 59 alsa-utils-scripts \
60 alsa-utils-nhltdmicinfo \
60 " 61 "
61 62
62PACKAGES += "${ALSA_UTILS_PKGS}" 63PACKAGES += "${ALSA_UTILS_PKGS}"
@@ -82,6 +83,7 @@ FILES:alsa-utils-scripts = "${sbindir}/alsaconf \
82 ${sbindir}/alsa-info.sh \ 83 ${sbindir}/alsa-info.sh \
83 ${sbindir}/alsabat-test.sh \ 84 ${sbindir}/alsabat-test.sh \
84 " 85 "
86FILES:alsa-utils-nhltdmicinfo = "${bindir}/nhlt-dmic-info"
85 87
86SUMMARY:alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver" 88SUMMARY:alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver"
87SUMMARY:alsa-utils-alsatplg = "Converts topology text files into binary format for kernel" 89SUMMARY:alsa-utils-alsatplg = "Converts topology text files into binary format for kernel"
@@ -98,6 +100,7 @@ SUMMARY:alsa-utils-aseqdump = "Shows the events received at an ALSA sequence
98SUMMARY:alsa-utils-alsaloop = "ALSA PCM loopback utility" 100SUMMARY:alsa-utils-alsaloop = "ALSA PCM loopback utility"
99SUMMARY:alsa-utils-alsaucm = "ALSA Use Case Manager" 101SUMMARY:alsa-utils-alsaucm = "ALSA Use Case Manager"
100SUMMARY:alsa-utils-scripts = "Shell scripts that show help info and create ALSA configuration files" 102SUMMARY:alsa-utils-scripts = "Shell scripts that show help info and create ALSA configuration files"
103SUMMARY:alsa-utils-nhltdmicinfo = "Dumps microphone array information from ACPI NHLT table"
101 104
102RRECOMMENDS:alsa-utils-alsactl = "alsa-states" 105RRECOMMENDS:alsa-utils-alsactl = "alsa-states"
103 106