gentoo auto-resync : 05:10:2024 - 04:27:09

9 files changed, 2 insertions, 586 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 32a8aad8c871..463562bee33d 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,15 +1,7 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
-AUX alsa-lib-1.2.10-lld-17.patch 1695 BLAKE2B 657fdeb94cadeac71e4a966f8efe79d68a55c911472bcd3bb9bf6949b4cfc0a91a5781e62e973b65b34d77bb65be1791c6b83fc81550c81c18f3ba5498e18791 SHA512 0d746485c7be793830cbfa7c33447b2c20b81c3b9ce4cd0aa35013829a45886e1a546c34a5e26ecdd9e48168b317a2459c09795538f3315e7381747f86d07f1f
-AUX alsa-lib-1.2.10-musl-string.patch 1435 BLAKE2B ad0e72c63652a2ba1c92f05a0b4154a35aa6fdd010cb3f095855345d99a4f2467fbdc1db79cb9970bada5b2f61fe07277ff179dcb912fedca634ed142d06e3b0 SHA512 6651379f50d72c06fbd8cdc298e3a31f6da2df4011faa00dcd8e0206e4858876f6a2ac50154dff70c2dc33676ee35306c0d85182aacbd136e3e5df311fa1adae
-AUX alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch 2319 BLAKE2B f56f6117f4513451de67ca91a00561891a979543bfe5d596a58d5a485e7a64bbb2a0e3100b83fd2a40a91dcc5f1f2465dbe9618bb195a870f25592957fefe357 SHA512 b0536d567bde218a989f1ab64129cd1967e0b0003490277233d299bcb751e3a4aa305dce7ac72ded354eae351e606b43718e62ca096611eb088e26910fc309d5
-AUX alsa-lib-1.2.10-reshuffle-included-files-config-h.patch 3874 BLAKE2B 87bd7a55d90e2186115bbc176562f3b69dd7db8984ef077a979c5a30ed772b4da0b6d7df4cf988d0be4655112ee42e9a79e8956e4ab97196098350247b8a9ae3 SHA512 940f012a5d3657cca9de20f4c27422143903fb5ed6bffa45dcbd32973d77d9c3e29488716c924ff3f4bb110498b4ccdd8302ecb516c453d8b762b901376532ef
-AUX alsa-lib-1.2.10-ump-header-detection.patch 1624 BLAKE2B da7a512d1e389d8dbf004ee3924a079f337e83fe7006dd8ed92bb838968c4550ac3474083e8ccef817e2f701a62c02c2890b2a384686fda9bd91622f41fad9d8 SHA512 98a22f53368265bed1918235adc12e9a2b7910e79d2151d48846837a7941cf8ecf7e1fe86b9def72c2b3facd6567e7c8d24051374e686353cb526762234a4528
 AUX alsa-lib-1.2.11-topology-correct-version-script-path.patch 1167 BLAKE2B 0540456e96eb47279d952b888d7c7ada54b7850e0a2a091b98bafc7969e97cdd829ecf7572a03eaa8b5da3d8e548b3c787eda66502673954bd583809b98a5f3d SHA512 a8ed806a9a98a0c351a76f043bb8344746f5258c13d8d08be547556e0f9c1c65472398d9d6cdeb87c22fb1340b8cc23c10bb1aee42063544c31f4afbcf8fa84e
-DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
 DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d
 DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0db8cccf58e997b9d619aac5c74288b69220589efdcd3917eb1d781ef71be5fcd16d997c59c069fe20788d1a479068 SHA512 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
-EBUILD alsa-lib-1.2.10-r2.ebuild 2857 BLAKE2B 0738b7a27c255344b9bc3e7be225aea953fdaa8948c6070c4854c545e7a6f82887e7e9b1e25ec54c64d9b1d691077e46339a7be31b74e527c70fd14a81fccea6 SHA512 f30a2f2d326493744be71935abb160ab239f3f8b35eba84987fdd5e48ae398adfc5b1952a1c79b1211a73198ac4b74f876131b0d0c5cc20df45c8ebad71bc5d9
-EBUILD alsa-lib-1.2.10-r3.ebuild 2914 BLAKE2B 696439fc26b94f27fc9c9513299beb21ae15082ef65a44c4a546327bce02a2c6b8475eededae83860fabd79680a54dbc383ff89b8d8361278d75ce2fe1fad93a SHA512 4a7044dad75f82d65ac9301665882ec0fcc87fb08d2c0b747b9b9b2f38eb104584291ec8d532a72646245fc9d694ae60fd51bf2b661d49ceb367faebd67b6ae4
 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e
-EBUILD alsa-lib-1.2.12.ebuild 2589 BLAKE2B a75e9067f2864dc1b938ff864db33b7e20636bd4c5ea4ab94cbb5c4d0f30fd84b4a05fe7fd28842f1e55aa6621467037103ef599e47fcf999ceb19dede1f2407 SHA512 00caaf6aa43024452d5e5b02f30aad071d96139ff006402054e71b2c0c0737c74c63d191dff46a66fb93cc58c117d298c53000191c72acd6d54ccb01d9426f9b
+EBUILD alsa-lib-1.2.12.ebuild 2589 BLAKE2B b3ad782b31515af4e21fc59b805bc95a1033844af33d94475fc889a23a199442cf03361fff7273fd4fc6875d37a8ebba554d5c9d1f70dbeddda6bb086831c55d SHA512 a17bf77c10a814a1d8150cc14a3c0d1a9341e80132fde5a3bd736be302d5ad650c84ab7ce57380171f9eab79d6278dc3423be623699894dd7a0e12fc2e62706c
 MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
deleted file mode 100644
index 47f51c323a5e..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	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}/${P}-musl-string.patch" # bug #913573, backport
-	"${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
-	"${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
-	"${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
-)
-
-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() {
-	# 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.10-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
deleted file mode 100644
index b2b07f72acaf..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	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}/${P}-musl-string.patch" # bug #913573, backport
-	"${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
-	"${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
-	"${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
-	"${FILESDIR}/${P}-lld-17.patch" # bug #914511, backport
-)
-
-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() {
-	# 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.12.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild
index e6b5e1471035..e2d95ace169a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools multilib-minimal flag-o-matic python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
deleted file mode 100644
index cba1e2e2d507..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/914511
-https://github.com/alsa-project/alsa-lib/issues/356
-https://github.com/alsa-project/alsa-lib/commit/96f60d829f2c9dc9ad9eda46410adaa41b4b0da0
-
-From 96f60d829f2c9dc9ad9eda46410adaa41b4b0da0 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 10 Oct 2023 08:20:15 +0200
-Subject: [PATCH] seq: Fix typos in symbol version definitions
-
-There were obvious typos in src/Versions.in that resulted in the
-undefined symbols.  Correct those entries.
-
-Fixes: 2aefb5c41cc0 ("seq: Add UMP support")
-Closes: https://github.com/alsa-project/alsa-lib/issues/356
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
---- a/src/Versions.in
-+++ b/src/Versions.in
-@@ -158,13 +158,13 @@ ALSA_1.2.10 {
-     @SYMBOL_PREFIX@snd_ctl_ump_block_info;
-     @SYMBOL_PREFIX@snd_seq_ump_*;
-     @SYMBOL_PREFIX@snd_seq_client_info_get_midi_version;
--    @SYMBOL_PREFIX@snd_seq_seq_client_info_get_ump_group_enabled;
-+    @SYMBOL_PREFIX@snd_seq_client_info_get_ump_group_enabled;
-     @SYMBOL_PREFIX@snd_seq_client_info_get_ump_groupless_enabled;
--    @SYMBOL_PREFIX@snd_seq_seq_client_get_ump_conversion;
-+    @SYMBOL_PREFIX@snd_seq_client_info_get_ump_conversion;
-     @SYMBOL_PREFIX@snd_seq_client_info_set_midi_version;
--    @SYMBOL_PREFIX@snd_seq_seq_client_info_set_ump_group_enabled;
-+    @SYMBOL_PREFIX@snd_seq_client_info_set_ump_group_enabled;
-     @SYMBOL_PREFIX@snd_seq_client_info_set_ump_groupless_enabled;
--    @SYMBOL_PREFIX@snd_seq_seq_client_set_ump_conversion;
-+    @SYMBOL_PREFIX@snd_seq_client_info_set_ump_conversion;
-     @SYMBOL_PREFIX@snd_seq_get_ump_endpoint_info;
-     @SYMBOL_PREFIX@snd_seq_get_ump_block_info;
-     @SYMBOL_PREFIX@snd_seq_set_ump_endpoint_info;
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
deleted file mode 100644
index 49747dcfecbe..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@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 <perex@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
- /**
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
deleted file mode 100644
index 4cd3614ee943..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7
-
-From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sat, 9 Sep 2023 17:42:03 +0200
-Subject: [PATCH] pcm: Fix segfault with 32bit libs
-
-The recent rearrangement of header inclusion order caused a regression
-showing segfaults on 32bit Arm.  The primary reason is the
-inconsistent compile condition depending on the inclusion of config.h;
-while most of other code include pcm_local.h (that implicitly includes
-config.h) at first, pcm_direct.c doesn't do it, hence the access with
-direct plugins crashes.
-
-For fixing it, we need to include config.h at the beginning.  But,
-it's better to include pcm_local.h for all relevant code for
-consistency.  The patch does it, and also it adds the guard in
-pcm_local.h for double inclusions.
-
-Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first")
-Link: https://github.com/alsa-project/alsa-lib/issues/352
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
---- a/src/pcm/pcm_direct.c
-+++ b/src/pcm/pcm_direct.c
-@@ -19,6 +19,7 @@
-  *
-  */
-   
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dmix.c
-+++ b/src/pcm/pcm_dmix.c
-@@ -26,7 +26,7 @@
-  *
-  */
-   
--#include "config.h"
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dshare.c
-+++ b/src/pcm/pcm_dshare.c
-@@ -26,6 +26,7 @@
-  *
-  */
-   
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dsnoop.c
-+++ b/src/pcm/pcm_dsnoop.c
-@@ -26,6 +26,7 @@
-  *
-  */
-   
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_local.h
-+++ b/src/pcm/pcm_local.h
-@@ -20,6 +20,9 @@
-  *
-  */
- 
-+#ifndef __PCM_LOCAL_H
-+#define __PCM_LOCAL_H
-+
- #include "config.h"
- 
- #include <stdio.h>
-@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm)
- #define snd_pcm_lock(pcm)		do {} while (0)
- #define snd_pcm_unlock(pcm)		do {} while (0)
- #endif /* THREAD_SAFE_API */
-+
-+#endif /* __PCM_LOCAL_H */
---- a/src/pcm/pcm_shm.c
-+++ b/src/pcm/pcm_shm.c
-@@ -26,6 +26,7 @@
-  *
-  */
-   
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
deleted file mode 100644
index 42493fef6af1..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d
-
-From 81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 13 Sep 2023 12:27:21 +0200
-Subject: [PATCH] reshuffle included files to include config.h as first - v2
-
-config.h may contain defines like _FILE_OFFSET_BITS which influence
-the system wide include files (off_t types, open -> open64 function
-usage etc.).
-
-Fixes: ad3a8b8b ("reshuffle included files to include config.h as first")
-Related: https://github.com/alsa-project/alsa-lib/pull/333
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/src/control/setup.c
-+++ b/src/control/setup.c
-@@ -29,13 +29,13 @@
-  *
-  */
- 
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
--#include "local.h"
- 
- #ifndef DOC_HIDDEN
- typedef struct {
---- a/src/rawmidi/rawmidi.c
-+++ b/src/rawmidi/rawmidi.c
-@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations.
-  * Shows open and read/write rawmidi operations.
-  */
-  
-+#include "rawmidi_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <unistd.h>
- #include <string.h>
--#include "rawmidi_local.h"
- 
- /**
-  * \brief setup the default parameters
---- a/src/rawmidi/rawmidi_local.h
-+++ b/src/rawmidi/rawmidi_local.h
-@@ -19,10 +19,10 @@
-  *
-  */
- 
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
--#include "local.h"
- 
- typedef struct {
- 	int (*close)(snd_rawmidi_t *rawmidi);
---- a/src/rawmidi/rawmidi_virt.c
-+++ b/src/rawmidi/rawmidi_virt.c
-@@ -19,13 +19,11 @@
-  *
-  */
- 
--#include <stdio.h>
--#include <stdlib.h>
-+#include "rawmidi_local.h"
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include "rawmidi_local.h"
- #include "seq.h"
- #include "seq_midi_event.h"
- 
---- a/src/rawmidi/ump.c
-+++ b/src/rawmidi/ump.c
-@@ -4,10 +4,6 @@
-  * \brief Universal MIDI Protocol (UMP) Interface
-  */
- 
--#include <stdio.h>
--#include <stdlib.h>
--#include <limits.h>
--#include "local.h"
- #include "rawmidi_local.h"
- #include "ump_local.h"
- 
---- a/src/seq/seq.c
-+++ b/src/seq/seq.c
-@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
- 
- */
- 
--#include <poll.h>
- #include "seq_local.h"
-+#include <poll.h>
- 
- /****************************************************************************
-  *                                                                          *
---- a/src/seq/seq_hw.c
-+++ b/src/seq/seq_hw.c
-@@ -20,9 +20,9 @@
-  *
-  */
- 
-+#include "seq_local.h"
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include "seq_local.h"
- 
- #ifndef PIC
- /* entry for static linking */
---- a/src/seq/seq_local.h
-+++ b/src/seq/seq_local.h
-@@ -23,10 +23,10 @@
- #ifndef __SEQ_LOCAL_H
- #define __SEQ_LOCAL_H
- 
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
--#include "local.h"
- 
- #define SND_SEQ_OBUF_SIZE	(16*1024)	/* default size */
- #define SND_SEQ_IBUF_SIZE	500		/* in event_size aligned */
---- a/src/seq/seq_midi_event.c
-+++ b/src/seq/seq_midi_event.c
-@@ -28,10 +28,10 @@
-  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
-+#include "local.h"
- #if HAVE_MALLOC_H
- #include <malloc.h>
- #endif
--#include "local.h"
- 
- #ifndef DOC_HIDDEN
- 
---- a/src/seq/seqmid.c
-+++ b/src/seq/seqmid.c
-@@ -20,14 +20,12 @@
-  *
-  */
- 
--#include <stdio.h>
--#include <stdlib.h>
-+#include "seq_local.h"
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
- #include <ctype.h>
- #include <sys/ioctl.h>
--#include "seq_local.h"
- 
- /**
-  * \brief queue controls - start/stop/continue
---- a/src/userfile.c
-+++ b/src/userfile.c
-@@ -18,7 +18,7 @@
-  *
-  */
-   
--#include <config.h>
-+#include "config.h"
- #include <string.h>
- #include <errno.h>
- #include <assert.h>
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
deleted file mode 100644
index a75aa3a85a06..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 4 Sep 2023 09:38:26 +0200
-Subject: [PATCH] control.h: Fix ump header file detection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Apparently, the control.h is used from apps separately (outside
-asoundlib.h). Avoid errors like:
-
-/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared
-  417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
-      |                                               ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared
-  418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
-      |                                            ^~~~~~~~~~~~~~~~~~~~
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/348
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/include/control.h
-+++ b/include/control.h
-@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
- int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
- int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
- int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
-+#endif
-+#ifdef __ALSA_UMP_H
- int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device);
- int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
- int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);