diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 88b6e51c53e21..0a8e4c53925ec 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -1,5 +1,3 @@ -DIST alsa-lib-1.2.13.tar.bz2 1116739 BLAKE2B 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3 SHA512 b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0 -DIST alsa-lib-1.2.14.tar.bz2 1115517 BLAKE2B 6fee05f859a19b8ef0d9896d37442c55f602e8b4aaa7698f30c01e03a339d7a74b3214493b095a64b59ee581fb7756d903d4965e080db552e062e2001e0662ff SHA512 2716cc3a2299da4a1a170d734af082d78dc452b253179d0f1a9ec190140734aecf002b6924eec4ff2699ce88ce1ae5c56821c267f36384910984db726d1f9626 DIST alsa-lib-1.2.15.3.tar.bz2 1126411 BLAKE2B 13c21ad3686ed5a8dfa48e8fa8e1b6f3f9a138aeaef2ba778838a8c6f9cbe209a5ece0d9953e2dcdd1e5b90ce50409e77b9485010689adfe4aed176cb8774c0e SHA512 7fc0fa8a5ae02d3404d2c262c6a14fcbb8b08e25993eac86b9e89b8419ed4d293b422da77b3eb7a1930f26c316b638e5aa7bdba78b0ada9908b0362d132a0cc0 DIST alsa-lib-1.2.15.3.tar.bz2.sig 833 BLAKE2B 9258b658be6b59ab3463e13d3af4887fe3ed3bb5fdd0ada35f79a5dbec02390e5aee6a67a833285374b3445c68f68b7000430bca44b8a8fcebfe91fa07bca51c SHA512 8b6c49dd4cc6a31fc6c569560af52778c0f78b1a11c0d686a98dd1830f9cdb957ff3e2d6da6f64d8ee177fd6f765fcd8c90cfefe87e330378ae62ddae1ea5b83 DIST alsa-lib-1.2.16.1.tar.bz2 1130309 BLAKE2B 437a9fd2a11a828eb1244a3871dff9b84e2619f3a7a66f37f236025b4a0f37bd5194215bbdbfebfaf6ae96a4a4f24c1712eb1d8b1e176b51d0544a539c07022d SHA512 2ddc5eef7fafe73ba6d8e4f79640a5aaa6e27aac2c77075fda9ee8ae61727bddfcda661e257057d8cf2f1647897d33153703f9ba913574ae7f1fbec53db3fa22 diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild deleted file mode 100644 index 76f9d9e7368f0..0000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools multilib-minimal flag-o-matic python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -if [[ ${PV} == *_p* ]] ; then - # Please set correct commit ID for a snapshot release! - COMMIT="7e3a3c2b0a092d0f568ba3c98365030dd91cc877" - SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT:0:7} -else - # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) - SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="alisp debug doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - media-libs/alsa-topology-conf - media-libs/alsa-ucm-conf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -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}/${P}-seq-ump-headers.patch" # bug #943696 - "${FILESDIR}/${P}-headers-again.patch" - "${FILESDIR}/${P}-header-fixups.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # bug #545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - - eautoreconf -} - -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. - # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. - # Let us know if you can identify one.) - filter-lto - - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - --enable-thread-safety - - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_with debug) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - - default -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild deleted file mode 100644 index 048df1def02f1..0000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.14.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -inherit autotools multilib-minimal flag-o-matic python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -if [[ ${PV} == *_p* ]] ; then - # Please set correct commit ID for a snapshot release! - COMMIT="7e3a3c2b0a092d0f568ba3c98365030dd91cc877" - SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT:0:7} -else - # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) - SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="debug doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - media-libs/alsa-topology-conf - media-libs/alsa-ucm-conf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # bug #545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - - eautoreconf -} - -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. - # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. - # Let us know if you can identify one.) - filter-lto - - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - --enable-thread-safety - - $(multilib_native_use_enable python) - $(use_with debug) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && use doc; then - emake doc - grep -FZrl "${S}" doc/doxygen/html | \ - xargs -0 sed -i -e "s:${S}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - - default -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-header-fixups.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-header-fixups.patch deleted file mode 100644 index a0a2a8e01f3fe..0000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.13-header-fixups.patch +++ /dev/null @@ -1,92 +0,0 @@ -This shouldn't be needed after 1.2.13 as a big rework landed, see -https://github.com/alsa-project/alsa-lib/commit/ea8972c83b020d92e1a9f0a5c12eaee159bf6c63. - -Bug: https://bugs.gentoo.org/946562 -Bug: https://bugs.gentoo.org/946626 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -33,6 +33,7 @@ - extern "C" { - #endif - -+#include - #include - - /** ---- a/include/rawmidi.h -+++ b/include/rawmidi.h -@@ -28,6 +28,8 @@ - #ifndef __ALSA_RAWMIDI_H - #define __ALSA_RAWMIDI_H - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/seq.h -+++ b/include/seq.h -@@ -29,6 +29,7 @@ - #ifndef __ALSA_SEQ_H - #define __ALSA_SEQ_H - -+#include - #include "ump.h" - - #ifdef __cplusplus ---- a/include/seq_midi_event.h -+++ b/include/seq_midi_event.h -@@ -28,6 +28,8 @@ - #ifndef __ALSA_SEQ_MIDI_EVENT_H - #define __ALSA_SEQ_MIDI_EVENT_H - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/seqmid.h -+++ b/include/seqmid.h -@@ -28,6 +28,8 @@ - #ifndef __ALSA_SEQMID_H - #define __ALSA_SEQMID_H - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/timer.h -+++ b/include/timer.h -@@ -28,6 +28,9 @@ - #ifndef __ALSA_TIMER_H - #define __ALSA_TIMER_H - -+#include -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/ump.h -+++ b/include/ump.h -@@ -9,6 +9,9 @@ - #ifndef __ALSA_UMP_H - #define __ALSA_UMP_H - -+#include -+#include -+ - #include "rawmidi.h" - - #ifdef __cplusplus ---- a/include/ump_msg.h -+++ b/include/ump_msg.h -@@ -9,6 +9,7 @@ - #ifndef __ALSA_UMP_MSG_H - #define __ALSA_UMP_MSG_H - -+#include - #include - - #ifdef __cplusplus 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 deleted file mode 100644 index ee666cd56fe72..0000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 -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 ---- - 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 - #include - -+#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; - diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch deleted file mode 100644 index fd38d8274804c..0000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/943696#c10 -https://github.com/alsa-project/alsa-lib/commit/07cee0ba05179a56764c35975d5822420d4f31f9 - -From 07cee0ba05179a56764c35975d5822420d4f31f9 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Sun, 24 Nov 2024 09:33:16 +0100 -Subject: [PATCH] seq: include UMP headers - -Some applications seem including alsa/seqmid.h individually, and this -got broken with the update of alsa-lib because now we have -dependencies to UMP stuff. Include the necessary UMP headers -internally. Also, add the inclusion of rawmidi.h in ump.h for similar -reasons. - -Link: https://bugzilla.suse.com/show_bug.cgi?id=1233682 -Signed-off-by: Takashi Iwai ---- a/include/seq.h -+++ b/include/seq.h -@@ -29,6 +29,8 @@ - #ifndef __ALSA_SEQ_H - #define __ALSA_SEQ_H - -+#include "ump.h" -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/include/seq_event.h -+++ b/include/seq_event.h -@@ -28,6 +28,8 @@ - #ifndef __ALSA_SEQ_EVENT_H - #define __ALSA_SEQ_EVENT_H - -+#include "ump_msg.h" -+ - /** - * \defgroup SeqEvents Sequencer Event Definitions - * Sequencer Event Definitions ---- a/include/ump.h -+++ b/include/ump.h -@@ -9,6 +9,8 @@ - #ifndef __ALSA_UMP_H - #define __ALSA_UMP_H - -+#include "rawmidi.h" -+ - #ifdef __cplusplus - extern "C" { - #endif - diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch deleted file mode 100644 index 637c06bef0b3c..0000000000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/943399 -https://github.com/alsa-project/alsa-lib/issues/420 -https://github.com/alsa-project/alsa-lib/pull/421 -https://github.com/alsa-project/alsa-lib/commit/76edab4e595bd5f3f4c636cccc8d7976d3c519d6 - -From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001 -From: Nicholas Vinson -Date: Thu, 14 Nov 2024 07:49:53 -0500 -Subject: [PATCH] src/Versions.in.in: Update *_tempo_base name - -Change @SYMBOL_PREFIX@snd_has_tempo_base to -@SYMBOL_PREFIX@snd_has_queue_tempo_base. - -Starting with version 1.2.13, alsa-lib fails to link with ld.lld-19 due -to "version script assignment of 'ALSA_1.2.13' to symbol -'snd_seq_has_tempo_base' failed: symbol not defined". - -Per commit 769d1db1b0a213a39c7e59c0d1d724e7f45b1ac3 the correct name for -the symbol is @SYMBOL_PREFIX@snd_has_queue_tempo_base; therefore, update -src/Vesions.in.in to match. - -Fixes bug #420 -Fixes Gentoo bug 943399 (https://bugs.gentoo.org/943399) - -Closes: https://github.com/alsa-project/alsa-lib/pull/421 -Signed-off-by: Nicholas Vinson -Signed-off-by: Jaroslav Kysela ---- a/src/Versions.in.in -+++ b/src/Versions.in.in -@@ -212,7 +212,7 @@ ALSA_1.2.13 { - @SYMBOL_PREFIX@snd_seq_create_ump_block; - @SYMBOL_PREFIX@snd_seq_queue_tempo_get_tempo_base; - @SYMBOL_PREFIX@snd_seq_queue_tempo_set_tempo_base; -- @SYMBOL_PREFIX@snd_seq_has_tempo_base; -+ @SYMBOL_PREFIX@snd_seq_has_queue_tempo_base; - @SYMBOL_PREFIX@snd_seq_port_info_get_ump_is_midi1; - @SYMBOL_PREFIX@snd_seq_port_info_set_ump_is_midi1; - #endif diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml index 5e60b5110a54d..9e974f07d3e54 100644 --- a/media-libs/alsa-lib/metadata.xml +++ b/media-libs/alsa-lib/metadata.xml @@ -2,9 +2,6 @@ - - Enable support for ALISP (ALSA LISP) interpreter for advanced features. - https://www.alsa-project.org/wiki/Main_Page_News cpe:/a:alsa-project:alsa-lib