gentoo auto-resync : 25:09:2022 - 05:33:00

7 files changed, 239 insertions, 3 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 94621698544d..5293857d16fb 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 19f1e0c25e3e..1f1e57ef9a7a 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
 DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe
+EBUILD alsa-lib-1.2.7.2-r1.ebuild 2538 BLAKE2B 03e5450487342313b88d3fc092c10eaf3fc563deda3d0289f5978d8780669fe1c94f4f79fc2c25f6aef788f2feeb226b9e670d5eb88d904294aa1847d5e1cd99 SHA512 b60edde961118761c07f10088b72c3ec77884e02c14805fb6f0465b576a047598dd3551223ff449180f65fc07284c0d3234fe94c1760f72f6ed5a58bfa8693f3
 EBUILD alsa-lib-1.2.7.2.ebuild 2550 BLAKE2B 1c42ad20cb4b4044fba20a164a2c6e225872e840a2277a7cb4c7b18ebf6c1b455d24f2b5a0dd724a9c08bc594a98bb424cb60eed526afd6dfd8b7c15d26b3932 SHA512 4c064583506992e8400c254d6069a52ad732e1c84fd81ab94d4a31403a540f14e62b10b9f6e7c15d348f7bdfdfd10479fec4647f10881a0b9dc57d72e56064fb
 MISC metadata.xml 550 BLAKE2B 7cb512f3517d9506a371651e82feef9dd262fb1862547380ec6a2ac1885c2717ea07a974526324c460107041458fbeebdbd5a1930a483891f9bffc5e20ee6ca7 SHA512 a674617b6de08084580889b6629c52e3f6ed3d118da577cedd5ad3b94d1716762238a7c86440b9ddee4fd2e183ae9340639da7a7f5d298a1803aaf506229e886
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild
new file mode 100644
index 000000000000..79c92d0a5d8f
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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
+)
+
+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.
+	filter-lto
+
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		--enable-thread-safety
+
+		# enable Python only on final ABI
+		$(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 '*.a' -o -name '*.la' \) -delete || die
+
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index f21f55e6eb36..80918b951a67 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,3 +1,5 @@
+AUX backport-e29571f-issue-175.patch 3113 BLAKE2B 667a71b0749c335675d7bc6f71ef7fde19a9ec7b88444caf3bc231e99b7800af56d0584a1d8d4172d67bd8876c93afa1f3327962a603c8bd78a8c6dcbf5b5b15 SHA512 02e227bd4b8fedd07192802e5f9e48ecd2621d480d0e9a52806c13ddf02ce5d0d492bb415d2c52361a0ea9abc3bc814886dccd16f96721e4af88cc04af57e781
+AUX system-gtest.patch 1483 BLAKE2B 21e9e347c85a81e562cff1bd6e9d6a017f87ad408566e7d93205a6ecd77222cd361f112c15f4720a464c86b1801a96666401f5daeec83bffcfb81ccc67f2c4d5 SHA512 91a034c0f303fee5a6b7deec5badf9269d4888c558a20a2cbeb52005f296a38446e3df8a3bfd2ba863ca7d9a0c350782b3b02bae91de04e2ff81d65e6113a4f7
 AUX zimg-2.9.2-gcc-10.patch 462 BLAKE2B 1066a231f220c6c114447065b4c0ad97f38e48fe697e5a3a0ab245fc63b7c4e784365cd9c189d52654032241f5b5e74169d3a60a43d7a1211a6a5560d2a0e727 SHA512 75a6cde8696aef5900fa1a2d450048159866ee8784f2dc435e7db77171065d5f01642472346bd55d83d0b7dc689a92bd05aef28a1000a3ab5b1d8094da5fc131
 DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea6a0c0dc71235d3dd286fb811303b0a5198ab82165ee78d993caabaf39d7ec17db4c4e5ffca9a3475b49781 SHA512 b688f8e93a2e4549f2c844cd58c6e0714e6494d6fc8c800dc1b0cdf2278fb9925a646fc332350c1b5d77cef2134bf35e18a873c24ea1979c1adce57bfef68ebe
 DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe386ade6b7a5c1b86db696dd50ff72ff40e1edbd38ee9a8a10dd429f207061fdb2ea326018396dfb92707053 SHA512 ae117399772d2c35ffa61b8cf5d156edf4ed65e9ffeb2e9e0688c88244fdd1a89c098bd842e3795b33fb0951da97f844fb6ffe27045e3234720f70f842356936
@@ -8,6 +10,6 @@ EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d6
 EBUILD zimg-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
 EBUILD zimg-3.0.2.ebuild 790 BLAKE2B 82bb65dae94ebcb7297fcf7cd7d008a422948f1a8d5fb823e2ebd8e0f208822d6047a93df42a7060af67dacdbcaa685cf19ef105e6248577a7cf0b6993e1c397 SHA512 f99abe15acd9d55ab345b73a6e2e6ba2b1ece7b3fbb2b293d0a249c371d3f6d8a4b85b18563a6ff07de155289507d613b01bed6b16d3fdbed7936f1d7e9d39d0
 EBUILD zimg-3.0.3.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
-EBUILD zimg-3.0.4.ebuild 787 BLAKE2B 858a33785579046b6ba4ee83df2979ab736df51c20fab64141658dd8939b9bbc30c61adf216421400004e832cec550cd133e6fd4952640972f601c04f029340e SHA512 356722951435873bd1415bc44d3fbd760b48f93396043588af5f176e1827f28466b126f90e4050ae9f8b8adef687102d03560a2298c8ba09c365c6a96f9aea9e
+EBUILD zimg-3.0.4.ebuild 980 BLAKE2B d7cdc20af50fe2b27f6dff18b89b1230825a27e750f54273176aa3bf98e9e719f1f3d25b94fa2b6223e1dd67d59a15f546f7deaa79aa4156569227c54dff210b SHA512 5f25a7e17dd8575117832873c8603a3c6a034264149024c7ddc99f8308bb0c200a72b0d8de150586d8ea459b2f6a727ac5a8103eef6ace415bb3539d4308a3a0
 EBUILD zimg-9999.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
 MISC metadata.xml 312 BLAKE2B 278c7bce7361e1cb96725595df0c35f0e227db2e6732d3cf1b53c960ad4a319a831a0e7cbf51702b24785f0f8d7bc73d3443a17e88595509a62a476caec5c5f4 SHA512 c070a6ea9f0a64532f6aa33b12ad04b293e8a6e014245936a71d5ab6facdec8ffd2665a49cdf3562a3dbc60406b6a24261aa9e65f7b7b63ef0d005927967cac2
diff --git a/media-libs/zimg/files/backport-e29571f-issue-175.patch b/media-libs/zimg/files/backport-e29571f-issue-175.patch
new file mode 100644
index 000000000000..e8512f35eb7e
--- /dev/null
+++ b/media-libs/zimg/files/backport-e29571f-issue-175.patch
@@ -0,0 +1,83 @@
+https://github.com/sekrit-twc/zimg/issues/175
+
+From e29571f9fc4a7bb37503a9c7ae4afd2352968b8f Mon Sep 17 00:00:00 2001
+From: sekrit-twc <noreply@example.com>
+Date: Sat, 7 May 2022 07:47:53 -0700
+Subject: [PATCH] test: update ARM hashsums
+
+Fix #175
+---
+ test/colorspace/arm/colorspace_neon_test.cpp | 36 ++++++++++----------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/test/colorspace/arm/colorspace_neon_test.cpp b/test/colorspace/arm/colorspace_neon_test.cpp
+index 1b6e0bc9..54ad2c39 100644
+--- a/test/colorspace/arm/colorspace_neon_test.cpp
++++ b/test/colorspace/arm/colorspace_neon_test.cpp
+@@ -54,13 +54,13 @@ TEST(ColorspaceConversionNeonTest, test_matrix)
+ 
+ 	const char *expected_sha1[3] = {
+ #if defined(_M_ARM64) || defined(__aarch64__)
+-		"7b2a05426e2ef61dc6adc16573fca46ea3480256",
+-		"9c69bc8fa775a8e877e66e79812e9f4c39cec647",
+-		"6010983126eb3f5ca2dd5c01f4753c0e9f36d0bb"
++		"749f74428406c019b1b727fa30352fcd1f0141ed",
++		"334cfa73375f8afef8423a163f3cff8f8a196762",
++		"aa3aab12d52e67b4d6765b4e8c03205a5375d8d9"
+ #else
+-		"0495adab9c82d98e73841e229a9b2041838fc0f2",
+-		"ece7edb1118d4b3063ad80f5d8febb6db7e9633a",
+-		"73a9ee951c7bde9ae0ada9b90afd1f7ce8b604df"
++		"1d559e4b2812a5940839b064f5bd74bc4fe0a2f9",
++		"b32a33c4bbbf3901f89458f914e6d03cc81f2c1d",
++		"4aadd644fae30cfd2098bb8d2b9f98483c8821fd"
+ #endif
+ 	};
+ #if defined(_M_ARM64) || defined(__aarch64__)
+@@ -82,34 +82,34 @@ TEST(ColorspaceConversionNeonTest, test_transfer_lut)
+ 		{
+ #if defined(_M_ARM64) || defined(__aarch64__)
+ 			"23d012fcb280f601e2e3c349229d0108e3cd632a",
+-			"21f5071b0a817c28295d51ead5137cabc6e0d5c4",
+-			"158c4ff0c91c08f82e9fc35a500a1c8166f5ae6b"
++			"7ae186215d5fa45065f7aeac74ab2dc74b556696",
++			"bad84d4e0de8572c81df6d9f91fef05b1576f9e5"
+ #else
+ 			"52451877e62e9fc31eb10b1e37c5f95fdd8851db",
+-			"3e2ff4f017c343edbe787692ce169123124337b1",
+-			"f719a90e6a6c859bfcfc136f3296e65044495da0"
++			"06bc0aff436bbbf4ba633b2255dd096e628a129c",
++			"a20570af1c05291029ea7d6b4215c451f4a9187a"
+ #endif
+ 		},
+ 		{
+ 			"011ee645ad30bb6ad6d93d8980d89a3e3e073c19",
+-			"d64814ca78cbf4e07606f92f1644f59762271ca5",
+-			"f871247697737f9f8b6a59a58306e22cce472ea6"
++			"5ae0e075b3856d9f491954b477568b17daf7f147",
++			"84b20f8fa27c23a668540566b9df26c4b42c9afa"
+ 		},
+ 		{
+ #if defined(_M_ARM64) || defined(__aarch64__)
+ 			"8206be2ae5e8a0fc003daeec4178189eecf82a13",
+-			"6bc5833cbd22f04c1965d230aad2ef8969da24b7",
+-			"6538399afe0b9fd55a95608b25c8036e16d658b8"
++			"24843f17600dd7bf9870f5c778549bd96c333427",
++			"26a6b00801b41da17d849e02217bf69add6324a6"
+ #else
+ 			"905d4d54eeae6458e8e0975c9cea66b25edcc234",
+-			"c2e7015447b40ebb2f4bfba48b7b091f964b22f1",
+-			"d222f960fe874ac88608666c4af8de180d91868e"
++			"d380f54820f1e269ea54a1d552b0cb704f83dd7b",
++			"552579149674b5e37f0d443ad19a59593fdca057"
+ #endif
+ 		},
+ 		{
+ 			"16f2274ffac90927de0438114f0ea22e650981a0",
+-			"2e01c95f89ea26b5a55bed895223381ac3f17e70",
+-			"c61d9c5369a00af5bb40b70fbb21956c00a4a1e9"
++			"b1c8b15b6159ab43e7bfc4e715fe3b621628d26e",
++			"632ae07d6919533c87d2ed28560a60cf070498e2"
+ 		},
+ 	};
+ 	const double expected_tolinear_snr = 80.0;
diff --git a/media-libs/zimg/files/system-gtest.patch b/media-libs/zimg/files/system-gtest.patch
new file mode 100644
index 000000000000..5e9e49bcab4d
--- /dev/null
+++ b/media-libs/zimg/files/system-gtest.patch
@@ -0,0 +1,45 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8727ca4..303cc6f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -356,8 +356,7 @@ test_unit_test_CPPFLAGS = \
+ 	$(AM_CPPFLAGS) \
+ 	-I$(srcdir)/src/zimg \
+ 	-I$(srcdir)/test \
+-	-I$(srcdir)/test/extra \
+-	-I$(srcdir)/test/extra/googletest/googletest/include
++	-I$(srcdir)/test/extra
+ 
+ test_unit_test_SOURCES = \
+ 	test/main.cpp \
+@@ -419,13 +418,8 @@ test_unit_test_SOURCES += \
+ 	test/resize/x86/resize_impl_avx512_vnni_test.cpp
+ endif # X86SIMD_AVX512
+ 
+-test/extra/googletest/build/lib/libgtest.a: .FAKE
+-	-$(MAKE) -C test/extra/googletest/build gtest
+-
+-.FAKE:
+-
+ test_unit_test_LDADD = \
+-	test/extra/googletest/build/lib/libgtest.a \
++	-lgtest \
+ 	test/libmusl_m.la \
+ 	libzimg_internal.la
+ endif # UNIT_TEST
+diff --git a/configure.ac b/configure.ac
+index cd50e96..5fd41fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,11 +45,6 @@ AS_IF([test "x$enable_unit_test" = "xyes"],
+                 [i?86],    [CFLAGS="$CFLAGS -mfpmath=sse -msse2" CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse2"],
+                 [x86_64],  [],
+                 [AC_MSG_WARN([Could not determine how to enable IEEE-754 compliance on host. Tests may fail.])])
+-
+-        AC_CHECK_PROG([CMAKE], [cmake], [cmake])
+-        AS_MKDIR_P([test/extra/googletest/build])
+-        AS_IF([(cd "test/extra/googletest/build" && $CMAKE -Dgtest_disable_pthreads=ON "$ac_abs_confdir/test/extra/googletest")],
+-              [], [AC_MSG_ERROR([CMake error])])
+       ])
+ 
+ 
diff --git a/media-libs/zimg/zimg-3.0.4.ebuild b/media-libs/zimg/zimg-3.0.4.ebuild
index 5198226202f1..be89f6335570 100644
--- a/media-libs/zimg/zimg-3.0.4.ebuild
+++ b/media-libs/zimg/zimg-3.0.4.ebuild
@@ -18,7 +18,14 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-IUSE="debug static-libs"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+DEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	"${FILESDIR}/system-gtest.patch"
+	"${FILESDIR}/backport-e29571f-issue-175.patch"
+)
 
 src_prepare() {
 	default
@@ -28,5 +35,6 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(use_enable test unit-test)
 }