gentoo auto-resync : 25:09:2022 - 11:33:33

8 files changed, 218 insertions, 6 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5293857d16fb..824ce0c08894 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index d6d8df5ef20e..e6c8bbaafeed 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -3,6 +3,6 @@ AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAK
 AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
 AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a
 DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
-EBUILD assimp-5.2.4-r1.ebuild 1375 BLAKE2B e1220e06a095463a39000179f8b17688014d8f3c1447bfdab691a635ec4cc3067ac3b40893a9c742b23529599de2f5117cee8885d964805584f8ace3e921b681 SHA512 944cb7696116315de7c515f2511adb09825c1a056dc12b4232c4eb8279ca015aef553883959c44ef399aa31d3d89825bdfb19354d85483388ab9d334b4ba092a
+EBUILD assimp-5.2.4-r1.ebuild 1373 BLAKE2B e584ce74d6f76759bd15289746dea42f18fc012d3c86e59c573bafe7ceaaaaa13ae2dfdf36a4ff5d4d5456f73c52a3d3e06d647864791d271e8494189b43f7ce SHA512 e6a6b9869690a0237581c829d23f340466726e72347704d90ba1b9475e1c1e42421705f70d8c8b62b69854353550e27aa6fb0f98a1f34c49f5549a94a61f9285
 EBUILD assimp-5.2.4.ebuild 1331 BLAKE2B dce8a52d03ca05308597797692a8a05747d6fe548f72c26f62d6a81bceec985cb794d783402fea524fb3f0858966c11939d67bbe5cc16bc1e5efbe5befe20236 SHA512 b66147e3bb614a2dcfb59f14e5c1a5dc8526157bed59adc812302d7c69422f3afa1eb8048c0ca9e08a8eda1d80917d0ee0fccd0e472b88a84dcda430d32e2104
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild b/media-libs/assimp/assimp-5.2.4-r1.ebuild
index a6b0a428bfd5..ab429167f11f 100644
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ b/media-libs/assimp/assimp-5.2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/5.2.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="samples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index e51329b95f15..b60f5ee3077c 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,5 +1,7 @@
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
 DIST flac-1.4.0.tar.xz 783372 BLAKE2B 69fd756ae6a41bdf84a1237cb24949ae24126a66432a0ecf1d9943a9ddd082629aa9ff480bf77ff60fcfc2401a4942bdc4549e22378841997e0d1a83f8f18f25 SHA512 b7310de7bcf49584c0a1fdc6d5ee7216a8ab3e2b1af85366fa0905752da13e1cbb9638e0d92f3b756568a69848abf4d5c2fe0d21a86c6fdb4840f2678daf0f8d
+DIST flac-1.4.1.tar.xz 1024160 BLAKE2B 9ed283a0e56e96667bb0c7d66ad9f9d932dc001bfe4c5a71b0302d393a829fdeae6cfa1b0fed5a1d243f32b73933cbbf29c7f7684314b60c2a05758925acde4d SHA512 72a5ced62e06407ddea3ed6dcd28bf8f56f3d45e0649ea38e1b778f7856041c68bf85c3cec0a55170c2fbc144626829fed132d386f7439f1d6e3d0b45f13dba7
 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8
 EBUILD flac-1.4.0-r1.ebuild 1797 BLAKE2B 71ceb931c898a4b8b1a572559f4608d8060d217da2d2ea13190880fc8aa24a620fb617ce0153edf60c6628fcd8c00690153f1ced602c30082974ad521bc17a6a SHA512 cb9a1b2172435bbe9e4944398c957c02237a9900137a2fd70fb8f34f00891ca3fd42fc01aa90da44e01b03dbe1fa02006f9bf88bb0c7d3af9337a5202311d0e3
+EBUILD flac-1.4.1.ebuild 1848 BLAKE2B acc6a86e0be02ae523cd6f22effdc13f3e230b20b93fc2183fb03cfc3c97cd1dbc3ca92bb7c693eb4ef919692e24a8eaabec1c230712d86a2a7381a754ae49f1 SHA512 8d24154e35e27a32be7e0a82cfcbe85e4004095a5e8c51bbb8f43e74e3b204bd2cc1fcd0af75829eccb0142bc8e5cb70f2275db083b085aed6f9c9f36368ac5f
 MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e
diff --git a/media-libs/flac/flac-1.4.1.ebuild b/media-libs/flac/flac-1.4.1.ebuild
new file mode 100644
index 000000000000..8fd8883406b0
--- /dev/null
+++ b/media-libs/flac/flac-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Free lossless audio encoder and decoder"
+HOMEPAGE="https://xiph.org/flac/"
+SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+# <libFLAC SONAME>-<libFLAC++ SONAME>
+SLOT="0/10-12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx cpu_flags_x86_sse2 static-libs"
+
+# AVX configure switch is for both AVX & AVX2
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+"
+
+RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	abi_x86_32? ( dev-lang/nasm )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-doxygen-docs
+		--disable-examples
+		--disable-xmms-plugin
+		$([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations")
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_ppc_vsx vsx)
+		$(use_enable cpu_flags_x86_avx avx)
+		# SSE option is actually for SSE2, bug #677274
+		$(use_enable cpu_flags_x86_sse2 sse)
+		$(use_enable cxx cpplibs)
+		$(use_enable debug)
+		$(use_enable ogg)
+		$(use_enable static-libs static)
+
+		# cross-compile fix (bug #521446)
+		# no effect if ogg support is disabled
+		--with-ogg
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	if [[ ${UID} != 0 ]]; then
+		emake -j1 check
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index a124b8a5c723..b2e7a557d6ad 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,8 +1,10 @@
 AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
+DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
 EBUILD libaom-3.4.0-r1.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
 EBUILD libaom-3.4.0.ebuild 3249 BLAKE2B f4f278e68c492fb87625ddff065cfe0096dc60473069fcb164a824eaaa07fc0d20e2256d5a5fafc3abad17fdef2ce2b08a956cc4e5d8c97d1b29e6f137f56356 SHA512 f96e63a0c1d0521d43bd41a850d4decb9ffb71c562baf6ad0e8159b24330c979a638b52c6ee5100e99acca2df96e15c8c0cc6c3f8252fbc2ffe3964ea284cc18
-EBUILD libaom-9999.ebuild 2454 BLAKE2B a886edfc976e058ac5c05aad0371771d4fe9417fa16126c19627885e0df84ab22d8b76304e43e6b70d13031dd54dd28d2da5c0576fa6fbef2b9f61755c7b8ca6 SHA512 0733ee09d7c66aa7c1ca09f9c2c91dfb840cdfe12a461cd2f23dff6977493c628133bea3ead2055c1551808490c6bcf00ef4853404f164e2f23ecfd693a45eb2
+EBUILD libaom-3.5.0.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
+EBUILD libaom-9999.ebuild 3320 BLAKE2B 67bb1e13449421ebef4f28456c8095c3765e3b24b0a2c8d884055447251f2568d7a310b9142ee45d9f0fcf41c3b190510053faf2c17948d41c7964eb465e0d24 SHA512 388d0ddbc9538c070a6fd5280644865b452f32926a2cba8012a16ea8cf0a962419edba5642811176633c55c3a98032e2b5e9ebeee4611e95d09fe55c4427dde4
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.5.0.ebuild b/media-libs/libaom/libaom-3.5.0.ebuild
new file mode 100644
index 000000000000..7c969b44ed77
--- /dev/null
+++ b/media-libs/libaom/libaom-3.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	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="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"
+# Tests need more wiring up
+RESTRICT="!test? ( 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
+)
+
+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
+
+		# 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))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-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)
+	)
+
+	# 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() {
+	"${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 39cf3f69c8d2..7c969b44ed77 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -19,10 +19,12 @@ HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
 
 LICENSE="BSD-2"
 SLOT="0/3"
-IUSE="doc +examples"
+IUSE="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"
+# Tests need more wiring up
+RESTRICT="!test? ( test ) test"
 
 REQUIRED_USE="
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
@@ -37,16 +39,20 @@ BDEPEND="${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
 "
 
-# the PATENTS file is required to be distributed with this package, bug #682214
+# 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
+)
+
 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=OFF
+		-DENABLE_TESTS=$(usex test)
 		-DENABLE_TOOLS=ON
 		-DENABLE_WERROR=OFF
 
@@ -67,9 +73,33 @@ multilib_src_configure() {
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 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() {
+	"${BUILD_DIR}"/test_libaom || die
+}
+
 multilib_src_install() {
 	if multilib_is_native_abi && use doc ; then
 		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )