summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2024-02-08 09:44:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-08 23:14:51 +0000
commit1d1d8b3f57f4a953892f876e64597d420eefd8d0 (patch)
tree321c62b0a04df87f6280e628aa6fbec7cfb3baae /meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
parent6f2c3b77444d162a8a755454536887dd28a7964e (diff)
downloadpoky-1d1d8b3f57f4a953892f876e64597d420eefd8d0.tar.gz
alsa-lib: upgrade 1.2.10 -> 1.2.11
- Upstream release update See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 - Remove merged patch - Add new patch merged after the release (From OE-Core rev: 5260a5e2316bb8d20cfb20e345f7aefe936a0da5) 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/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch52
1 files changed, 0 insertions, 52 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
deleted file mode 100644
index 9a7ba0d847..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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: Backport [https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c]
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