Skip to contentSkip to conversation

alsa-lib: upgrade 1.2.9 -> 1.2.10

PATCH New [email protected] 1 participant 2 messages Sep 19, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH v2 1/2 alsa-lib: upgrade 1.2.9 -> 1.2.10

From: Michael Opdenacker <[email protected]>

Changelog:
- Fix symver build error on non-ELF platforms
- ucm: main - remove cast to pointer from integer of different size warning
- ucm: mark internal functions static
- topology: fix src/mixer/mixer.c return value warning
- dogyxen: fix topology.h warnings
- doxygen: fix broken examples links
- doxygen: include docs for shmarea functions
- doxygen: conf: do not hide PCM specific function
- doxygen: silence warning from asoundlib.h
- doxygen: ucm: silence warnings
- doxygen: topology: silence 'not documented' warnings
- doxygen: global: silence 'not documented' warnings
- doxygen: namehint: silence 'not documented' warnings
- doxygen: seq: silence 'not documented' warnings
- doxygen: conf: silence 'not documented' warnings
- doxygen: rawmidi: silence 'not documented' warnings
- doxygen: control: silence 'not documented' item warnings
- doxygen: pcm: silence 'not documented' warnings
- doxygen: include external control docs
- doxygen: fix inadvertent link requests
- doxygen: fix list indentation errors
- doxygen: escape xml tags
- doxygen: fix image path
- doxygen: fix broken parameter name tags
- doxygen: Fix missing group end markers
- reshuffle included files to include config.h as first
- configure: add AC_SYS_LARGEFILE
- seq: Fix wrong seq version update at snd_seq_hw_get_client_info()
- seq: Add overflow check in snd_seq_ev_set_ump_data()
- test: oldapi - fix the clang-16 compilation error
- rawmidi: Suppress error messages for non-fatal errors
- seq: ump: Fix typo in function name containing "group"
- pcm: hw: fix minor bug in sw_params ioctl
- seq: Add UMP 1.1 features
- ump: Add UMP 1.1 features
- uapi: Update rawmidi API to 2.0.4
- seq: Add UMP support
- uapi: Update asequencer.h definitions for 1.0.3
- ump: Add helpers for handling SysEx data
- ump: Add helpers to parse / set UMP packet data
- control: Add UMP Endpoint and Block info query support
- control: Add UMP device query support
-- ump: Add initial support
- rawmidi: Add UMP ioctl support
- uapi: Update control API to 2.0.9
- uapi: Update rawmidi API to 2.0.3
- remove extra trailing new line in SNDMSG and SNDERR calls
- usecase: add CaptureMicInfoFile field to documentation
- include: fix SND_DLSYM_BUILD_VERSION() for static build
- pcm: hw - prevent divide by zero for broken apps

---

Changes in V2:
- 0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
Upstream-Status: replace "Accepted" (obsolete) by "Backport"

---
 ...STRING-macro-outside-PIC-ifdef-block.patch | 52 +++++++++++++++++++
 .../{alsa-lib_1.2.9.bb => alsa-lib_1.2.10.bb} |  6 ++-
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.9.bb => alsa-lib_1.2.10.bb} (88%)
meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch new file +52 -0
new file mode 100644
index 0000000000..9a7ba0d847
@@ -0,0 +1,52 @@
+From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <[email protected]>
+Date: Wed, 6 Sep 2023 15:16:44 +0200
+Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
+
+From: Jaroslav Kysela <[email protected]>
+
+It solves the musl libc compilation issue.
+
+control.c: In function 'snd_ctl_open_conf':
+../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
+   98 | #define SND_DLSYM_VERSION(version) __STRING(version)
+      |                                    ^~~~~~~~
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/350
+Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c]
+Signed-off-by: Jaroslav Kysela <[email protected]>
+---
+ include/global.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/global.h b/include/global.h
+index dfe9bc2b..3ecaeee8 100644
+--- a/include/global.h
++++ b/include/global.h
+@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
+ #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+ #endif
+ 
++#ifndef __STRING
++/** \brief Return 'x' argument as string */
++#define __STRING(x)     #x
++#endif
++
+ #ifdef PIC /* dynamic build */
+ 
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+@@ -71,11 +76,6 @@ struct snd_dlsym_link {
+ 
+ extern struct snd_dlsym_link *snd_dlsym_start;
+ 
+-#ifndef __STRING
+-/** \brief Return 'x' argument as string */
+-#define __STRING(x)     #x
+-#endif
+-
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+ #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
+ /**
+-- 
+2.34.1
+
meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.9.bb +4 -2
similarity index 88%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.9.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb
index d482e27683..83bc6877d2 100644
@@ -9,8 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
                     file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
                     "
 
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
+           file://0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch \
+           "
+SRC_URI[sha256sum] = "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e"
 
 inherit autotools pkgconfig
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/2 alsa-utils: upgrade 1.2.9 -> 1.2.10

From: Michael Opdenacker <[email protected]>

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

---

Changes in V2:
- 0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch, 0001-topology.c-include-locale.h.patch:
Upstream-Status: replace "Submitted" by "Backport", as the patches were quickly accepted by the maintainer.

0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch#

---
 ...dd-define-to-compile-with-glibc-2.38.patch | 39 -------------------
 ...ompilation-when-building-in-a-subdir.patch | 35 -----------------
 ...nhlt-dmic-info.c-include-sys-types.h.patch | 31 +++++++++++++++
 .../0001-topology.c-include-locale.h.patch    | 31 +++++++++++++++
 ...sa-utils_1.2.9.bb => alsa-utils_1.2.10.bb} | 11 ++++--
 5 files changed, 69 insertions(+), 78 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.9.bb => alsa-utils_1.2.10.bb} (93%)
meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch deleted +0 -39
deleted file mode 100644
index 8c23fb2cec..0000000000
@@ -1,39 +0,0 @@
-From a610f4c21b083c0f9cf62ad2251dfadc98abb50e Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <[email protected]>
-Date: Sat, 22 Jul 2023 15:36:09 +0000
-Subject: [PATCH] alsactl: add define to compile with glibc 2.38
-
-strlcat and strlcpy have been added to glibc 2.38.
-update the defines to use the glibc versions, and not conflict with
-string.h.
-
-ref:
-- https://sourceware.org/git/?p=glibc.git;a=commit;h=454a20c8756c9c1d55419153255fc7692b3d2199
-
-Fixes: https://github.com/alsa-project/alsa-utils/pull/225
-Signed-off-by: Jaroslav Kysela <[email protected]>
-Signed-off-by: Martin Jansa <[email protected]>
-
-Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/d6a71bfbde9e1710743d3a446c6ea3b41c45234e]
----
- alsactl/init_sysdeps.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c
-index 3aca1b4..f09b1ae 100644
---- a/alsactl/init_sysdeps.c
-+++ b/alsactl/init_sysdeps.c
-@@ -18,6 +18,7 @@
-  */
- 
- #if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
-+#if !(__GLIBC_PREREQ(2, 38))
- static size_t strlcpy(char *dst, const char *src, size_t size)
- {
- 	size_t bytes = 0;
-@@ -60,4 +61,5 @@ static size_t strlcat(char *dst, const char *src, size_t size)
- 	*q = '\0';
- 	return bytes;
- }
-+#endif /* !(__GLIBC_PREREQ(2, 38)) */
- #endif /* __GLIBC__ */
meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch deleted +0 -35
deleted file mode 100644
index 3b3fe5345a..0000000000
@@ -1,35 +0,0 @@
-From 44636a7c5862538def0d2fac074772cc39a22a15 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <[email protected]>
-Date: Tue, 16 May 2023 02:27:59 +1000
-Subject: [PATCH] alsactl: fix compilation when building in a subdir
-
-Fixes: 613372d
-Fixes: cff2d1c
-
-Compile errors when building in a subdir:
-alsactl/alsactl.c:33:10: fatal error: os_compat.h: No such file or directory
-   33 | #include "os_compat.h"
-      |          ^~~~~~~~~~~~~
-alsactl/lock.c:34:10: fatal error: os_compat.h: No such file or directory
-   34 | #include "os_compat.h"
-      |          ^~~~~~~~~~~~~
-
-Signed-off-by: Rudi Heitbaum <[email protected]>
-Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/213]
----
- alsactl/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
-index 80dba69d..fb32c4f3 100644
---- a/alsactl/Makefile.am
-+++ b/alsactl/Makefile.am
-@@ -9,6 +9,8 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml
- 
- AM_CFLAGS = -D_GNU_SOURCE
- 
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
- alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \
- 		daemon.c monitor.c clean.c info.c
- 
meta/recipes-multimedia/alsa/alsa-utils/0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch new file +31 -0
new file mode 100644
index 0000000000..0ebf98b41e
@@ -0,0 +1,31 @@
+From 35a3382f3818d29b60f4c888e338189a4d93d0e5 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-multimedia/alsa/alsa-utils/0001-topology.c-include-locale.h.patch new file +31 -0
new file mode 100644
index 0000000000..e1c7470356
@@ -0,0 +1,31 @@
+From d8a8a9affd5726827ef3995652248595b4a8c87e Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb +7 -4
similarity index 93%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb
index af28f5468f..4e5ed8dfa0 100644
@@ -25,10 +25,10 @@ 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-alsactl-fix-compilation-when-building-in-a-subdir.patch \
-           file://0001-alsactl-add-define-to-compile-with-glibc-2.38.patch \
-          "
-SRC_URI[sha256sum] = "e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd"
+           file://0001-topology.c-include-locale.h.patch \
+           file://0001-nhlt-nhlt-dmic-info.c-include-sys-types.h.patch \
+           "
+SRC_URI[sha256sum] = "104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with
@@ -57,6 +57,7 @@ ALSA_UTILS_PKGS = "\
              alsa-utils-alsaloop \
              alsa-utils-alsaucm \
              alsa-utils-scripts \
+             alsa-utils-nhltdmicinfo \
             "
 
 PACKAGES += "${ALSA_UTILS_PKGS}"
@@ -82,6 +83,7 @@ FILES:alsa-utils-scripts     = "${sbindir}/alsaconf \
                ${sbindir}/alsa-info.sh \
                ${sbindir}/alsabat-test.sh \
               "
+FILES:alsa-utils-nhltdmicinfo = "${bindir}/nhlt-dmic-info"
 
 SUMMARY:alsa-utils-alsabat      = "Command-line sound tester for ALSA sound card driver"
 SUMMARY: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
 SUMMARY:alsa-utils-alsaloop     = "ALSA PCM loopback utility"
 SUMMARY:alsa-utils-alsaucm      = "ALSA Use Case Manager"
 SUMMARY:alsa-utils-scripts      = "Shell scripts that show help info and create ALSA configuration files"
+SUMMARY:alsa-utils-nhltdmicinfo = "Dumps microphone array information from ACPI NHLT table"
 
 RRECOMMENDS:alsa-utils-alsactl = "alsa-states"
 
Signature · 1 line
2.34.1