gentoo auto-resync : 15:09:2023 - 10:49:51

5 files changed, 370 insertions, 0 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2bf51274c2bc..3d2984dcb193 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 43c4b7d7a1fd..e2ba5a8a9639 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,14 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 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.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f932f472a2d6cc53c9d10373a76def7a7e7e21f33b6cf804630a7b6b4c37c8422fe4580cfa9e8e490abb2faf89cbf98d05f03 SHA512 5be97f4a609a285a976197b6f7320f82c2c1a3425e00b7c7c2f58cc4e8c61ce4270ec49c068882268924fe7dec32557f36c206870df5abf3b715e8ad2494655e
 DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
 DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
 DIST alsa-lib-1.2.9.tar.bz2 1094660 BLAKE2B ec0c6966802196016679652292a579c6301cce33a2e887fce79cdb80629b6df047269787445cf0645e6cf43d3d2aae8fa57ddad5ab79fc254ee65a0ed695f449 SHA512 8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a
 EBUILD alsa-lib-1.2.10-r1.ebuild 2734 BLAKE2B 747f6f584ebcd3b97e593ccd79e20c7e51cd5399841421094fe5db544fe745a2435a7c1c86e40c6370a95a1402619cf52308490fcc08149ed4f7b0dc609a5a74 SHA512 890479bd7de7aa2add693e9d710dc0f5e26a95c04e4e8922331d5318c29d6e516292fcdc8e33cc8bf4ce7bafbd278cf5e830e6d5a1ff67b7c856250a9d48d657
+EBUILD alsa-lib-1.2.10-r2.ebuild 2870 BLAKE2B ad47c3debfc19ff6dfaa654a37645ac4cdc2ee6a4f3fd28f9c3503725b1e194df67faf326d5a1ef5862804ed73db4cea17a352c63c40dec4b95d293162cfafe6 SHA512 241c7dd97d1af1a56d18e1c6213f524556a62450eb0b0fdc028d41d729c3be2a36f938b99a97845ea89245062009d4a5000e0ed53426be1153124885f09f793d
 EBUILD alsa-lib-1.2.8-r1.ebuild 2540 BLAKE2B f4aff12b1da6ed6a5b3be7955d918a1dfbf3995ca17fbd7f7e947addb17b8570bd1f18e59d0d47c091ff493163f2fc61363558d52eb22ea19369904f7d162cc1 SHA512 114feb897ac54c94c8527af2953a3fc02c94fe6a32c3638e1056c3184e005a8e1f3f289447274a5a0155c8dbe0ef64ac55aa52b4edcfb07a3f186c16c56b9389
 EBUILD alsa-lib-1.2.9.ebuild 2593 BLAKE2B a1c38eb9ff96e6005713f6a7b21dbb44b2ab5d6afbe708b8801751ff0a6b46f9921b5690c940aae9dd5477b8d7bd04d9d5cec647bc8be20d24c94465f20a5621 SHA512 04711ea90325d7375158aecf9ecf3b6d42a44189b08414fe5e497508c2e178169d97c1618bc69f88765a104538dba39125f990e137b9216a3e0405bf352f946c
 MISC metadata.xml 562 BLAKE2B e5944d48c846097392d401c5aec1c25adc58aa78cc441df8ac6ecc351ee338094f70cbe526cb0c8b9b87750b76d11bd24ddfab63d9ef87938ee25d5a9930b23f SHA512 d2ea1565bc3dcd9899ce0c108aca7ecc50a89621fcfda7d2dc111dc12c83e7551468a54c08bc7ffbbab4884d2a8bcb280005e54d11f12e9c31770f94a7728c02
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
new file mode 100644
index 000000000000..4b5a3c65e8bb
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 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 ~ia64 ~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-doc/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/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
new file mode 100644
index 000000000000..4cd3614ee943
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
@@ -0,0 +1,91 @@
+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
new file mode 100644
index 000000000000..42493fef6af1
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
@@ -0,0 +1,174 @@
+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>
+