gentoo auto-resync : 22:12:2023 - 13:48:30

4 files changed, 166 insertions, 7 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 232ee476d53c..333c3a3b5119 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -12,13 +12,16 @@ DIST libaom-3.7.0-testdata.tar.xz 374076136 BLAKE2B 17036f37fbb04d59b50e13e5e225
 DIST libaom-3.7.0.tar.gz 5347924 BLAKE2B 2693d60f5afa810e00ab6aadcf8ca763e328bc64e47b3678eeba9993db89b25cfa0380beeff5a5938f19da74410ce83068c318cff2aea30e5fe39680ac67e937 SHA512 b763a877db26dcaddea5513825900917e55bc131bf78a83f941f1e74b534a514cb599fb64c3ac18a8202ac0a72c511dfef6eeff21dfbe59ed9816887ca3ec5f3
 DIST libaom-3.7.1-testdata.tar.xz 373814716 BLAKE2B 2aecab88d36998d72ccbd170400425912404cffad0594749bd862c56ee732fa2a21898872db3898f5706459d45e13a026b6bb79ffb5ee9a6b284765ebf3cd8f6 SHA512 89a598e549602daeeb1a488303503644c4cf3f05b28706df3075c52592d3fdad13d29e56f36e571621db3d32f354af4b6978c02e9af8665f87c82f8c9918de9a
 DIST libaom-3.7.1.tar.gz 5349727 BLAKE2B a5bc8aaa538353fa405520fc096459d0009348c590dc585377e53971df252bac0b5bea40b6483c8be54caa7a0e8fccd761c5b3ec0db4144becec3cc12a91a5e9 SHA512 2ac90997065fcbdfa028e09945c10cbdad405569b98e03592a46971aebb189014ebd59553589804ba0a03c386af41bfbc37dd0a12320eb0fc6c9fd03e2149ee3
+DIST libaom-3.8.0-testdata.tar.xz 426384840 BLAKE2B a195f44aa8f55e869ea613f587a101162723be643d272c08b5ac50afc9c55e2240d84f63489402482699f6c306d96116f7808f47f529ce4d0ec8149495b72b49 SHA512 18ba3468e770e274e8a1556160c8524d309d6ea80e3cca971d6858cccc5ba4f2d3764f484e19d23df83ebc50e047aa1ef6fb1a92aad90668cfee7daa95447db2
+DIST libaom-3.8.0.tar.gz 5448720 BLAKE2B 276e50c134a5a5925591cbc5c76a11383d288854bc5f4db79d97f1e4e41e74f5739ee916df127112cb678673f09aeb5dfa91f1d8696b0894923837cea991bd73 SHA512 201a3ef00c0de3f90ed2486b306b836ec3e5c891c0ea05cb4607523f084f957849d38cd1e2684c05af2a93180a1b151ccc7a99ba8d5d52a84d8cb17cb25b0e8a
 EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B d42b5eb01f7383b4f4abc0000614251af08d02e1560babcc41f74d13711d6f3d17205b4fbe82011e1be39ce89a7a5694ea000f26df94676a7d7179bb0737034c SHA512 a965cec35285846c6df630d59ce520f37f423946e6a9130d8af72aaa48e9f80bc8df80e020b73bf4e5be8584e23f44fd054bbb6a0d7fb9c1002de4442b4301c4
 EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51edf1cd6f34bea2aa42cd42941c7d259a2a947ca063e3add31c532c0ea4a894de212de625241cd1c3d5e928a87 SHA512 d88224575368b6aa4dbc83edf5970e7a1c5bfef9c1500a9b28e3bb91e2d1586c8b86c03a3756743d8e7c5ec63028b269a276572f9a1c9dc9fff5e02fd6b3f5ed
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 EBUILD libaom-3.6.1.ebuild 4084 BLAKE2B 48ae40602af98e63e02fbbcbf64737fd0e9f9f0b278c311b8e43d46b92b848f089103c2a6191a931f0c6575d713915a2f8145b4afa488fb5b66158136021cad9 SHA512 48e6ba74685f7b6625ff63b5614362a5fac8b2e1cf089ef5eef92eda9666722f8afab6c754cf4a20d9de51061e8e5b30d6877dfe3f275a508892fcc004bc2bc6
 EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f
-EBUILD libaom-3.7.0-r2.ebuild 4407 BLAKE2B 85cc0c39cbd3e9837384f5dd9d511fd92d09204c9e3c53eb6f4db3b61bf34147edb39057e0416dd2a761a96b1ea3698785ae760da9090c66e52ea68af030ea8c SHA512 ac35584e8ca005bfda5f96189c99fa7b4fca78ba2508762239231dce639c1b73171cc698d7de832add815c74e56f2903b6551fd2056b184fa63cd938c035d045
+EBUILD libaom-3.7.0-r2.ebuild 4406 BLAKE2B 13bc894a3aacb8b9ecf9efe48749cc87f032b2f0b4a49973bae13255a8138e47857227d038c39323a6a341e00c6d35d147ab7779ef1de2d53ada0c84dde943dc SHA512 c98add5d2f5b00b708d853170d3c0c701ef191e2000c0c981f85b34fc9ab0b5fdb3c8dcdd784bde04f5631914ceed2242ad94561b6765181d479056bf9334a62
 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
 EBUILD libaom-3.7.1.ebuild 4423 BLAKE2B 05afb91037b2c90df89a7034db363a049cd349b7fee3dde73de9a12afae8a28184b9f0a7b277f6b5980b76dddc64ca4616f2cf1fdbd4aba81fd38f11cf803f9b SHA512 9e41b03f29a7464e298dd247f65fc0a7a74802f54d61d5a17a645dc0a4aaa481674f5d0d52e79426eb11ffcd15cc522c18a0bab2a3a7a4f0f5761601b18161d3
-EBUILD libaom-9999.ebuild 4329 BLAKE2B 946765ae1ece82e006ecd0ffe60e28617b1715309ad6cd5a7b935ba50bd464f520cb1ed3505c6c13b02eed54076e68c1e65c55de374eb054658fee1a190fb131 SHA512 22ce0e5ec7125d6815831b4994dc0be8d001d250779779ad385308cdb2299a9d27a2379d8d476ecee75dd19071289cb30fe415240d483658e483539f3ba73fdb
+EBUILD libaom-3.8.0.ebuild 4487 BLAKE2B 189f3b91d38e807c60d343fc36c83d52dbfc2837f9ff16eb8fd6f738e66a1a94e5f01a7f16f3413288614068387c27ddf944707d1add269e75b487625f387213 SHA512 c7f63e840008b66e7fd391a3bb87dac66208e24be36a578b8bb85a99681030c8cd9061ef36f60de41a33919318f4ddaac8fa1d50f598c4b20be0a797344284c0
+EBUILD libaom-9999.ebuild 4487 BLAKE2B 189f3b91d38e807c60d343fc36c83d52dbfc2837f9ff16eb8fd6f738e66a1a94e5f01a7f16f3413288614068387c27ddf944707d1add269e75b487625f387213 SHA512 c7f63e840008b66e7fd391a3bb87dac66208e24be36a578b8bb85a99681030c8cd9061ef36f60de41a33919318f4ddaac8fa1d50f598c4b20be0a797344284c0
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild
index 484985245c81..bf34b1dca583 100644
--- a/media-libs/libaom/libaom-3.7.0-r2.ebuild
+++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild
@@ -25,7 +25,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.8.0.ebuild b/media-libs/libaom/libaom-3.8.0.ebuild
new file mode 100644
index 000000000000..90505353bef1
--- /dev/null
+++ b/media-libs/libaom/libaom-3.8.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	# To update test data tarball, follow these steps:
+	# 1.  Clone the upstream repo and check out the relevant tag,
+	#	  or download the release tarball
+	# 2.  Regular cmake configure (options don't matter here):
+	#     cd build && cmake ..
+	# 3.  Set LIBAOM_TEST_DATA_PATH to the directory you want and
+	#     run the "make testdata" target:
+	#     LIBAOM_TEST_DATA_PATH=../libaom-3.7.1-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvaf libaom-3.7.1-testdata.tar.xz libaom-3.7.1-testdata
+	SRC_URI="
+		https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="big-endian doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# The PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+		# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
+		# that big endian detection doesn't really work otherwise.
+		-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# arm
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
+		# bug #917277
+		-DENABLE_NEON_DOTPROD=OFF
+		# bug #917278
+		-DENABLE_NEON_I8MM=OFF
+		# bug #920474
+		-DENABLE_SVE=OFF
+
+		# mips
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+
+		# amd64
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		# ppc
+		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 342fbbcdf1db..90505353bef1 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -36,7 +36,7 @@ SLOT="0/3"
 IUSE="big-endian doc +examples test"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon cpu_flags_ppc_vsx"
+IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -76,9 +76,20 @@ multilib_src_configure() {
 		# Needs libjxl, currently unpackaged.
 		-DCONFIG_TUNE_BUTTERAUGLI=0
 
-		# neon support is assumed to be always enabled on arm64
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# arm
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
+		# bug #917277
+		-DENABLE_NEON_DOTPROD=OFF
+		# bug #917278
+		-DENABLE_NEON_I8MM=OFF
+		# bug #920474
+		-DENABLE_SVE=OFF
+
+		# mips
 		# ENABLE_DSPR2 / ENABLE_MSA for mips
+
+		# amd64
 		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
 		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
@@ -89,6 +100,7 @@ multilib_src_configure() {
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 
+		# ppc
 		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
 	)