summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2023-09-19 13:53:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-20 08:57:27 +0100
commitebcf25b14f934fbd323a381604d0727a544fd4db (patch)
tree5ad56a0e1957fcd4e961fd47cc7dede64ff7efea /meta/recipes-multimedia/alsa
parent6d7af50f88d26d80e1a2d99758bdfc811c41644d (diff)
downloadpoky-ebcf25b14f934fbd323a381604d0727a544fd4db.tar.gz
alsa-lib: upgrade 1.2.9 -> 1.2.10
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 (From OE-Core rev: 232b6b7276b6b34edd1aa5292897a92e16235ecf) 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-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch52
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.9.bb)6
2 files changed, 56 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
new file mode 100644
index 0000000000..a75300f51f
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
@@ -0,0 +1,52 @@
1From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
2From: Michael Opdenacker <michael.opdenacker@bootlin.com>
3Date: Wed, 6 Sep 2023 15:16:44 +0200
4Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
5
6From: Jaroslav Kysela <perex@perex.cz>
7
8It solves the musl libc compilation issue.
9
10control.c: In function 'snd_ctl_open_conf':
11../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
12 98 | #define SND_DLSYM_VERSION(version) __STRING(version)
13 | ^~~~~~~~
14
15Fixes: https://github.com/alsa-project/alsa-lib/issues/350
16Upstream-Status: Accepted
17Signed-off-by: Jaroslav Kysela <perex@perex.cz>
18---
19 include/global.h | 10 +++++-----
20 1 file changed, 5 insertions(+), 5 deletions(-)
21
22diff --git a/include/global.h b/include/global.h
23index dfe9bc2b..3ecaeee8 100644
24--- a/include/global.h
25+++ b/include/global.h
26@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
27 #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
28 #endif
29
30+#ifndef __STRING
31+/** \brief Return 'x' argument as string */
32+#define __STRING(x) #x
33+#endif
34+
35 #ifdef PIC /* dynamic build */
36
37 /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
38@@ -71,11 +76,6 @@ struct snd_dlsym_link {
39
40 extern struct snd_dlsym_link *snd_dlsym_start;
41
42-#ifndef __STRING
43-/** \brief Return 'x' argument as string */
44-#define __STRING(x) #x
45-#endif
46-
47 /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
48 #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
49 /**
50--
512.34.1
52
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.9.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb
index d482e27683..83bc6877d2 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.9.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb
@@ -9,8 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ 9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
10 " 10 "
11 11
12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" 12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
13SRC_URI[sha256sum] = "dc9c643fdc4ccfd0572cc685858dd41e08afb583f30460b317e4188275f615b2" 13 file://0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch \
14 "
15SRC_URI[sha256sum] = "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e"
14 16
15inherit autotools pkgconfig 17inherit autotools pkgconfig
16 18