From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 005CF15808A for ; Thu, 7 Sep 2023 14:48:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22F592BC03E; Thu, 7 Sep 2023 14:48:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08BC32BC027 for ; Thu, 7 Sep 2023 14:48:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 395A9335C34 for ; Thu, 7 Sep 2023 14:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D94821104 for ; Thu, 7 Sep 2023 14:48:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694097998.b0ead6beba8b528c5d03c738a8214f8eeea27105.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/alsa-lib/alsa-lib-1.2.10.ebuild media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch X-VCS-Directories: media-libs/alsa-lib/ media-libs/alsa-lib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b0ead6beba8b528c5d03c738a8214f8eeea27105 X-VCS-Branch: master Date: Thu, 7 Sep 2023 14:48:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8fdc8735-645d-46f7-952a-256ac404fc53 X-Archives-Hash: b957329838feb900cd0f547c86db2fec commit: b0ead6beba8b528c5d03c738a8214f8eeea27105 Author: Violet Purcell inventati org> AuthorDate: Thu Sep 7 00:13:40 2023 +0000 Commit: Sam James gentoo 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 inventati.org> Signed-off-by: Sam James 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 +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 +--- 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 + /**