commit: b0ead6beba8b528c5d03c738a8214f8eeea27105 Author: Violet Purcell <vimproved <AT> inventati <DOT> org> AuthorDate: Thu Sep 7 00:13:40 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 7 14:46:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ead6be
media-libs/alsa-lib: backport musl fix for 1.2.10 Closes: https://bugs.gentoo.org/913573 Signed-off-by: Violet Purcell <vimproved <AT> inventati.org> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/alsa-lib/alsa-lib-1.2.10.ebuild | 1 + .../files/alsa-lib-1.2.10-musl-string.patch | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild index 9292f6f04563..bd8d097d5eff 100644 --- a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild @@ -34,6 +34,7 @@ BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" PATCHES=( "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 + "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport ) pkg_setup() { 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 <pe...@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 <pe...@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 + /**
