7 files changed, 203 insertions, 4 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 69b1c982b499..b2b01461f905 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 8abfecc933b9..bbfdea548a6b 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,6 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.11-topology-correct-version-script-path.patch 1167 BLAKE2B 0540456e96eb47279d952b888d7c7ada54b7850e0a2a091b98bafc7969e97cdd829ecf7572a03eaa8b5da3d8e548b3c787eda66502673954bd583809b98a5f3d SHA512 a8ed806a9a98a0c351a76f043bb8344746f5258c13d8d08be547556e0f9c1c65472398d9d6cdeb87c22fb1340b8cc23c10bb1aee42063544c31f4afbcf8fa84e
+AUX alsa-lib-1.2.13-header-fixups.patch 1680 BLAKE2B 42b906605a531209712bd4e20d2a878dfc06d01f94b0420e2c269f95d2c5283b1f230d6561b3efa6fcab0792df91d9dc3a7fee233d00a255278863f780d67954 SHA512 e32314a64de2d79925ebefd8da06d0283d028c0b5a3ad09c978a11b39dde8d16ff46080ada20a539cf8a20c2992d1922947d85cd7efed2a75e3b89dc63f306d2
 AUX alsa-lib-1.2.13-headers-again.patch 1302 BLAKE2B 79d581927427552ea934ee4f81ca142ca5cdcd44b064f1287720aacef91ecd37d386d11284230b27e643c6a82d573e8c81dd2e90417bf5eff7c0963b9a374f5b SHA512 18b656d393da25a0ce7d40e5c1734e9d83d6224426a2e29fc405edfcb004ead8814ff89644f31e3558ae5488b3ae854debe545e9a64f735f2c23fe6bda686517
 AUX alsa-lib-1.2.13-seq-ump-headers.patch 1262 BLAKE2B eb4c76aa3d72d026690881b7a051b8da6b8f8837120889a364a85e16fe76190d57fbd23c52c6f5ab52262805e0ff29d3a22270beae14bcbbd25f4c02f2c72391 SHA512 13c5c009505ff502ac52c0f7745c947c49cf6332e26d667f876ef4afbe6b240ff7f87946d1b5d542260d020e599336d54e37d17d7ad72532581792a85fb41d12
 AUX alsa-lib-1.2.13-update-symbol-name.patch 1574 BLAKE2B d685102ff60f4ed1bcdca4cf943110aa9abd3d4a421668804b60a38409fd83f1213661355d77a39a0bd8fe55f02e5750fb77fcdd284f0cf7709082d292797833 SHA512 d283736ae62eb055d0a5c7200b555193b6a57300887483310756f94ddca16b6a11f22fdf91998d3673a2c470279b677d4002c682d503dc1e3984cf22a3920379
@@ -8,5 +9,6 @@ DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0
 DIST alsa-lib-1.2.13.tar.bz2 1116739 BLAKE2B 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3 SHA512 b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0
 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e
 EBUILD alsa-lib-1.2.12.ebuild 2588 BLAKE2B f63344a40d1d07be7c8ba1b57634d872aad48f5c334e8b3d95e55a512e91264ff1f197a38b54ec011ce096cf9219da1ea713362536f75d06a9e5ccd150246454 SHA512 67caebc57c286cdc5c13e7a77e5edd8fe5c56a8d56d126369fd21873a224df37a75e3b831a2316c1de3efd0d47e35fb76eedd0589c8b804f911084a8ce14c76e
-EBUILD alsa-lib-1.2.13-r2.ebuild 2823 BLAKE2B 76f9f136a8c08d2aabc53f03642fac570c1c05cec04e50c2258efd3dc31a63c0bd193ac6613196083e224eb96172a25444a76993ff1fff1d98f8a0ad7290bccf SHA512 ad7a8243f1dea83d5fa4c6bdedbb4fb160193712e90790f2c5d1011c20ec2625d35123c1b4acc355783ed9ac7cb978490784d91c822219832e6eafcbadf0df3c
+EBUILD alsa-lib-1.2.13-r2.ebuild 2822 BLAKE2B ae8ff340725d72fcd8bc528dc0bc4e4fba6b5993cbc360fd1f8752a412988505601885a3673264e8a50a0e1a5271f07a87aee9d6640c8d9d8a4df00afab7b68d SHA512 ec9765e322fed1fd321035e5f14c13ad287341a8ddbe3b94d34c38067ba2ffec02fa7920e43acfa77379b747b791ac9588e30469efdb1c25d14227dd3c309c4a
+EBUILD alsa-lib-1.2.13-r3.ebuild 2862 BLAKE2B 4f62f051192eaf6597027fdc8191b40abccb21d4a49cd82ee85da811401d405d79e29211e562155ab4e9bd85b7b73c8fba65de8f626157b02d4f000fdb46d116 SHA512 5a0cd599158d0e83d0e31b7c064119ed229286de6a44e0624bebe0009cfee7493d7bb2579a8d79033d037ec0325849f8cc3ba66f19256d313a85459d070aac7e
 MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild
index 20608bf6ae72..8362aef7f6e6 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
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
new file mode 100644
index 000000000000..9bd95c2e1efe
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r3.ebuild
@@ -0,0 +1,105 @@
+# 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 ~amd64-linux ~x86-linux"
+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/files/alsa-lib-1.2.13-header-fixups.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-header-fixups.patch
new file mode 100644
index 000000000000..a0a2a8e01f3f
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.13-header-fixups.patch
@@ -0,0 +1,92 @@
+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 <stddef.h>
+ #include <stdint.h>
+ 
+ /**
+--- a/include/rawmidi.h
++++ b/include/rawmidi.h
+@@ -28,6 +28,8 @@
+ #ifndef __ALSA_RAWMIDI_H
+ #define __ALSA_RAWMIDI_H
+ 
++#include <stddef.h>
++
+ #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 <stddef.h>
+ #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 <stddef.h>
++
+ #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 <stddef.h>
++
+ #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 <stddef.h>
++#include <sys/types.h>
++
+ #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 <stddef.h>
++#include <sys/types.h>
++
+ #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 <stddef.h>
+ #include <stdint.h>
+ 
+ #ifdef __cplusplus
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 8e89753bd90b..d61da429bf37 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -5,5 +5,5 @@ DIST alsa-ucm-conf-1.2.12.tar.bz2 52618 BLAKE2B 65f429afa6a9134f1896acac3827f606
 DIST alsa-ucm-conf-1.2.13.tar.bz2 58408 BLAKE2B 87e4bf2285961e316ca853e9245e02447ea9e60fa506e124c072e2b6ed71345fc0c30b19bf8c849f8123a6b95a4facd22225eafccba8164266961110a60ef44c SHA512 cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85
 EBUILD alsa-ucm-conf-1.2.11.ebuild 503 BLAKE2B 8acbe87d7a55847e4848a6c975cdac618cd0c53cc9873eb21678864d0901f7da716226a5c7a0d729fdacda4f9adb63c186d2e4e196e74204d3aadda72a4d2c8f SHA512 910abd4c03c5eb5df31b6cda01735d23a266f5efa9fbd72bf0baa4cac09b6b1354cc4606101df4d572a3ffa8fb91557f0daacc7951336ad6340f951ba347e716
 EBUILD alsa-ucm-conf-1.2.12.ebuild 503 BLAKE2B 8acbe87d7a55847e4848a6c975cdac618cd0c53cc9873eb21678864d0901f7da716226a5c7a0d729fdacda4f9adb63c186d2e4e196e74204d3aadda72a4d2c8f SHA512 910abd4c03c5eb5df31b6cda01735d23a266f5efa9fbd72bf0baa4cac09b6b1354cc4606101df4d572a3ffa8fb91557f0daacc7951336ad6340f951ba347e716
-EBUILD alsa-ucm-conf-1.2.13.ebuild 615 BLAKE2B 9f51c1540c94c55c9053a80b93e1da73cc32e3b5de06090a307e8fc0f2c596bdc68b1db5e1e10d23a5537690da21e8fc90fa20b21c4ed44076f2be75e9ba6e07 SHA512 bc0d6cd7cb65eda789066161aabe159a5c16da65570755374f5727f56cfbcfab4509d76a7efb82268ad63df4b92af751abfec6f8d7b7072cfa076073a5dd962b
+EBUILD alsa-ucm-conf-1.2.13.ebuild 614 BLAKE2B 6d0c8a8f084fd697658ca5c5f2bdbfeadee299e76c076d669773739f4e5bc73d528c628a2c600d6be2c984a885c1422af510af7536449556348db275cd8f3512 SHA512 f3873a64ab37ed1678ef974bcbbf5b0dfdf0428983d43dee9dfb000258fc87ba2cdd5ed59a775618e33bec47c70751e7f04ae905eba9710b8ecae0139c97131a
 MISC metadata.xml 403 BLAKE2B c1555457584c9ccfc55d8cf423c2980863a68e45a2993133c56f124996c33a8ca402f7611fb22c4f6fd87cd5ea70e417f1424d4df5bc5aebca6ccbd2b5efb3e6 SHA512 23290395834ba3d4b58cc79ec5fca79b1b2710b69504a49057f3d26bb5f3ae3b1b7f2c4957d8b3d13168f81795c25df4cb5007ec3c60bbe61c7f588ae2445d43
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.13.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.13.ebuild
index df778dfd5386..b40af3b66730 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.13.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"