gentoo auto-resync : 13:12:2023 - 05:39:04

6 files changed, 143 insertions, 3 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8e390f4a426e..4c2f8df734c2 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 2023de36fa21..76a547855815 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,4 +1,5 @@
 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
@@ -9,6 +10,7 @@ DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d0
 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 2862 BLAKE2B 70560fdcfe84f6e12a66ba512b8a63c91f18291f4a6dbfd6b92fb178943f957d1a47a5b96305719f06e02cc1b36f23ff6766bf64be136c22ddb4f89d1eaf4e73 SHA512 5574180c762da819d3e55515687122a215289543acfeb0870ae9e6fba5539d527728d26f21f8d3cd189f1eee4a55ccda38f931314ae9a0b04c4200e77a76a812
+EBUILD alsa-lib-1.2.10-r3.ebuild 2927 BLAKE2B b6f85481a451879443451347c9e6177b97378e5e2fc7309c1df9b9af5e4a98f2f52224c2cbf117af45efd7442f2bc10c26b9e3e5a33ea5f52e369c3061714103 SHA512 ca62bce0b5fb2f17f9c6b92632d1cb07d7ed264b14692459d750224f3992f7c2c6e262944805a3b51b378d015214ffe91704854d11e743165407af9445a96203
 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-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
new file mode 100644
index 000000000000..410467070681
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
@@ -0,0 +1,103 @@
+# 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
+	"${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
new file mode 100644
index 000000000000..cba1e2e2d507
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
@@ -0,0 +1,35 @@
+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/libv4l/Manifest b/media-libs/libv4l/Manifest
index ba6cfde057c1..8a7499279f92 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,8 +1,8 @@
 AUX libv4l-1.26.0-meson.patch 2470 BLAKE2B 8dbd40173673a057cab139a3c17109c50083d0dbaba093f40f9caf683d426a897a7454121da29c54c892c2f605afe9db74ff45e189c148fda4fff0074488ebc8 SHA512 6ff7f21a054d23892e47eae495ebfae2a68cea5528f5d6d9cfe6a63ff86779ce78b327fa45a0ca4061d32bf2af62c5d868ca025e3954365f1ccda4e2332657b9
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
 DIST v4l-utils-1.24.1.tar.bz2 2238340 BLAKE2B 1702918699d47b17467e012c2b1875c58851175c1007351a3b40d0b0fa40437eb695efa9e21afe3351f66780899d45798eef7f23c90a4831bface70a245b8a54 SHA512 1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663
-DIST v4l-utils-1.26.0.tar.xz 1191988 BLAKE2B 8a4899f7b0d71ca6fd4b296ce9f154c3125c59389130df2db772d66984652b135178d712cc7b39e9f53b6587a4e128e2240d28382ab3ce7d1172d939260b15e2 SHA512 7820a91beb5cfc8e3ecf54145f2503fbbbf879abf1551d5bba5d8454f5a93242daaa51ff4636959d3434aa0d352bdf35afcd5f56e0eb9ab50c8191e8f6283f4a
+DIST v4l-utils-1.26.1.tar.xz 1192312 BLAKE2B 84a6b5737447fa332b64af8fdc2ecb308865528bc16487e55a4ccc00a76288239432b299ab2225829530db9158b0449f64e2e1c3fb782c7495da55ea8e7a171a SHA512 a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8
 EBUILD libv4l-1.22.1.ebuild 1474 BLAKE2B 02e405372e756e104f9f12fbcf91fdad9065a7da032cdec3b5ef1e1978ec816625d605f89b79a428a5cc21cdfc9422148cb133160aee9d97775d45565ed5516c SHA512 a4b2facc7b261e0b7231374ffe7e049460b1f9da123d02e9b82e5371e6d6dea77e052ea007554b0090a2c5bfe452ca9a02f43d86d3add0bc942fde22563e577d
 EBUILD libv4l-1.24.1.ebuild 1481 BLAKE2B 1ea5253e7f594b4ed2f51a3bbe002992ba979c4beb662497e5912faebfb30ce23363b851f114873b44a7d4030e20c4a350f2d92afafc1c20f503f31e4c575923 SHA512 b55663f8836ecef9c5b45a0e436c9bef3842e058af4f066c1586c6bc38a315ffe57e489741ca273816e5e99420a97ead030224f1e6058f1059d61a3d7a5b38ab
-EBUILD libv4l-1.26.0.ebuild 3240 BLAKE2B cf4413fcc7f47d97a69fbdb00f47f9b6b0468fc8f35f306dfc619a466debef278993bbedfafa60ae0a6c440833ae226ef5e97581f9e94540e8dcf5cad1dc7a73 SHA512 8e29f3a74d122119776cb54848f4e65afbc5e7db476ded3b76df81c9352cc324c5c050f5e58c21bf2b40c70e430508496ae1da1ab769ef275413ad913caf9e96
+EBUILD libv4l-1.26.1.ebuild 3255 BLAKE2B 6b2e05889c80f89d628843de72a87dc8cdac414aa2c53a2dcb766211ed1be4d7eb9d8bf9acdd68db0c16de58acaa0e971641a1b9da06645cb306701f9c780950 SHA512 075d70b2b0df4493af988daca5a4bc94d7c0badfd07e1390e8cb96195eb0369d970c1818d9005b61f242c2a951a6315e0510a7be5264a57b55d94fa4d28f5a0c
 MISC metadata.xml 1333 BLAKE2B 980117d95da191d35287e97e99c1add4231438d0e5f763cd576bd9bf79ce894297bd32252b8e73a1356d14be66dde09ef0ae3307a0e856554cb024569eee63ee SHA512 da28f9574865217098fb8602d7860131e58b7c16501bef840814a3ef7870a5565795151c8b574ecc895c9614400b5ac5b444430fd147dabea0f747174d6ae7a0
diff --git a/media-libs/libv4l/libv4l-1.26.0.ebuild b/media-libs/libv4l/libv4l-1.26.1.ebuild
index 2913916767cc..550c6a1bd084 100644
--- a/media-libs/libv4l/libv4l-1.26.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.26.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
-			dev-qt/qtopengl:5[-gles2(-)]
+			dev-qt/qtopengl:5[-gles2-only(-),-gles2(-)]
 			dev-qt/qtwidgets:5
 			media-libs/alsa-lib
 			virtual/opengl