summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViolet Purcell <vimproved@inventati.org>2023-09-06 20:13:40 -0400
committerSam James <sam@gentoo.org>2023-09-07 15:46:38 +0100
commitb0ead6beba8b528c5d03c738a8214f8eeea27105 (patch)
treef7a92380e78008c282d71164789f3a116fcf3017 /media-libs/alsa-lib/files
parentnet-print/hplip-plugin: Stabilize 3.23.5 arm, #913748 (diff)
downloadgentoo-b0ead6beba8b528c5d03c738a8214f8eeea27105.tar.gz
gentoo-b0ead6beba8b528c5d03c738a8214f8eeea27105.tar.bz2
gentoo-b0ead6beba8b528c5d03c738a8214f8eeea27105.zip
media-libs/alsa-lib: backport musl fix for 1.2.10
Closes: https://bugs.gentoo.org/913573 Signed-off-by: Violet Purcell <vimproved@inventati.org> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/alsa-lib/files')
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
new file mode 100644
index 000000000000..49747dcfecbe
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
@@ -0,0 +1,40 @@
+From https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 6 Sep 2023 15:16:44 +0200
+Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
+
+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
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- 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
+ /**