commit: a2760c11992fad88374b11deb8db1e645269bb8b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 04:30:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 04:30:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2760c11
media-libs/libaom: add 3.5.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libaom/Manifest | 1 +
.../{libaom-9999.ebuild => libaom-3.5.0.ebuild} | 36 ++++++++++++++++++++--
media-libs/libaom/libaom-9999.ebuild | 36 ++++++++++++++++++++--
3 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 74b88245f6e4..d9317b5b8cae 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/media-libs/libaom/libaom-9999.ebuild
b/media-libs/libaom/libaom-3.5.0.ebuild
similarity index 70%
copy from media-libs/libaom/libaom-9999.ebuild
copy to media-libs/libaom/libaom-3.5.0.ebuild
index 39cf3f69c8d2..7c969b44ed77 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-3.5.0.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/. )
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/. )
