commit: 653518e17eb50cd761d04f3974209af9ec2c1358 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 6 22:10:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 6 22:10:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653518e1
media-libs/alsa-lib: further test/header fixes Closes: https://bugs.gentoo.org/944447 Closes: https://bugs.gentoo.org/946562 Closes: https://bugs.gentoo.org/949127 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-1.2.13-r1.ebuild => alsa-lib-1.2.13-r2.ebuild} | 8 +++-- .../files/alsa-lib-1.2.13-headers-again.patch | 40 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild similarity index 92% rename from media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild rename to media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild index 8b47c423b17e..9248789746ba 100644 --- a/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,8 @@ BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )" PATCHES=( "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 "${FILESDIR}/${PN}-1.2.13-update-symbol-name.patch" # bug #943399 - "${FILESDIR}/${PN}-1.2.13-seq-ump-headers.patch" # bug #943696 + "${FILESDIR}/${P}-seq-ump-headers.patch" # bug #943696 + "${FILESDIR}/${P}-headers-again.patch" ) pkg_setup() { @@ -53,6 +54,9 @@ src_prepare() { } multilib_src_configure() { + # Tests fail to build w/ C23 (bug #944447) + append-cflags -std=gnu17 + # Broken upstream. Could in theory work with -flto-partitions=none # but it's a hack to workaround the real problem and not strictly safe. # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6. diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch new file mode 100644 index 000000000000..ee666cd56fe7 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/949127 +https://bugs.gentoo.org/946562 +https://bugs.gentoo.org/944447 +https://github.com/alsa-project/alsa-lib/issues/430 +https://github.com/alsa-project/alsa-lib/issues/436 +https://github.com/alsa-project/alsa-lib/commit/c8bc54a9cae3d5080dc7a298aee573b10f2bbf62 + +From c8bc54a9cae3d5080dc7a298aee573b10f2bbf62 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela <pe...@perex.cz> +Date: Sun, 2 Feb 2025 19:18:25 +0100 +Subject: [PATCH] test/playmidi1: fix compilation caused by conflict between + midifile.h and ump_msg.h + +It's a fast fix. The better way is to fix midifile.h or remote this example +(we have already some + +Closes: https://github.com/alsa-project/alsa-lib/issues/436 +Signed-off-by: Jaroslav Kysela <pe...@perex.cz> +--- + test/playmidi1.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/playmidi1.c b/test/playmidi1.c +index 831e95783..286aaa86e 100644 +--- a/test/playmidi1.c ++++ b/test/playmidi1.c +@@ -45,10 +45,11 @@ + #include <errno.h> + #include <string.h> + ++#include "../include/asoundlib.h" ++ + #include "midifile.h" /* SMF library header */ + #include "midifile.c" /* SMF library code */ + +-#include "../include/asoundlib.h" + + /* send the real-time time stamps (instead of midi ticks) to the ALSA sequencer */ + static int use_realtime = 0; +
