media-libs/alsa-lib: drop 1.2.10-r2, 1.2.10-r3

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

8 files changed, 0 insertions, 577 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d3ddaa9f97a8..6c09083fba1c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,2 @@
-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
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/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);