commit: d59caef600a47bc3b0e45c9485261e9f05d9a18a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 04:05:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 04:05:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59caef6
media-libs/libaom: add 3.8.1
Run tests in parallel.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libaom/Manifest | 2 ++
.../libaom/files/libaom-3.8.1-tests-parallel.patch | 21 +++++++++++++++++++++
.../{libaom-9999.ebuild => libaom-3.8.1.ebuild} | 17 ++++++++++++++---
media-libs/libaom/libaom-9999.ebuild | 17 ++++++++++++++---
4 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 656483c55d3c..1b4b83e7571b 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -5,3 +5,5 @@ DIST libaom-3.7.1-testdata.tar.xz 373814716 BLAKE2B
2aecab88d36998d72ccbd1704004
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
+DIST libaom-3.8.1-testdata.tar.xz 426372276 BLAKE2B
4d6194a98612045023f4d35ca851a37ffc69cbfbfd015d5c1f4e3aebb6789096d7b7f82b9641c545e4203b44fe8a9243de83bb23a8c53aced30ec26aed0376e0
SHA512
03bf5d521c613728dd12fd33bb76fc64a20798e276dbdc2501446e1fb9891552e88adb25f0e4ff65d6c8aad301a550aec195498ab1f1a506bce3fe384e24cc0e
+DIST libaom-3.8.1.tar.gz 5450909 BLAKE2B
fec3123f8ee68b1027a1a2019969c098b730da72be2902274659b983857f2d8f62dae5b563543b3f144ae8bc51b6d6fdd4fcd6aadf2ca04d5a4dd5be987fbbac
SHA512
f9ee918a37699cfaf2bcb5aa16a4d8b077feb1fc577d8c5437ed3fa1a1c0a5d734c9564e3c8c0f0b1baf43dc5abb7ff0196a77607b10d926c0be7858778ac1e3
diff --git a/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch
b/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch
new file mode 100644
index 000000000000..8c090764681c
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.8.1-tests-parallel.patch
@@ -0,0 +1,21 @@
+--- a/test/test.cmake
++++ b/test/test.cmake
+@@ -573,10 +573,14 @@ function(setup_aom_test_targets)
+ if(((NOT MSVC) AND (NOT XCODE)) OR ENABLE_IDE_TEST_HOSTING)
+
+ # Pick a reasonable number of targets (this controls parallelization).
+- processorcount(num_test_targets)
+- if(num_test_targets EQUAL 0) # Just default to 10 targets when there's
no
+- # processor count available.
+- set(num_test_targets 10)
++ if(DEFINED ENV{LIBAOM_TEST_PROCS})
++ set(num_test_targets $ENV{LIBAOM_TEST_PROCS})
++ else()
++ processorcount(num_test_targets)
++ if(num_test_targets EQUAL 0) # Just default to 10 targets when
there's no
++ # processor count available.
++ set(num_test_targets 10)
++ endif()
+ endif()
+
+ math(EXPR max_shard_index "${num_test_targets} - 1")
diff --git a/media-libs/libaom/libaom-9999.ebuild
b/media-libs/libaom/libaom-3.8.1.ebuild
similarity index 85%
copy from media-libs/libaom/libaom-9999.ebuild
copy to media-libs/libaom/libaom-3.8.1.ebuild
index 9316ed29f90d..9ea4cca0ff7e 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-3.8.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib flag-o-matic multiprocessing python-any-r1
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -33,7 +33,7 @@ HOMEPAGE="https://aomedia.org
https://aomedia.googlesource.com/aom/";
LICENSE="BSD-2"
SLOT="0/3"
-IUSE="big-endian doc +examples test"
+IUSE="big-endian debug 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"
@@ -58,9 +58,14 @@ DOCS=( PATENTS )
PATCHES=(
"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+ "${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
)
multilib_src_configure() {
+ # Follow upstream recommendations in README (bug #921438) and avoid
+ # asserts during common use (bug #914614).
+ append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
local mycmakeargs=(
-DENABLE_CCACHE=OFF
-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
@@ -124,11 +129,17 @@ multilib_src_configure() {
)
fi
+ # LIBAOM_TEST_PROCS is added by our tests-parallel.patch
+ export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
+
cmake_src_configure
}
multilib_src_test() {
- LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata"
"${BUILD_DIR}"/test_libaom || die
+ einfo "Running quiet tests which take hours."
+ # We use ninja rather than test_libaom directly so we can run it in
parallel
+ # with sharding, see
https://aomedia.googlesource.com/aom/#sharded-testing.
+ LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C
"${BUILD_DIR}" runtests
}
multilib_src_install() {
diff --git a/media-libs/libaom/libaom-9999.ebuild
b/media-libs/libaom/libaom-9999.ebuild
index 9316ed29f90d..9ea4cca0ff7e 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib flag-o-matic multiprocessing python-any-r1
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -33,7 +33,7 @@ HOMEPAGE="https://aomedia.org
https://aomedia.googlesource.com/aom/";
LICENSE="BSD-2"
SLOT="0/3"
-IUSE="big-endian doc +examples test"
+IUSE="big-endian debug 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"
@@ -58,9 +58,14 @@ DOCS=( PATENTS )
PATCHES=(
"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+ "${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
)
multilib_src_configure() {
+ # Follow upstream recommendations in README (bug #921438) and avoid
+ # asserts during common use (bug #914614).
+ append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
+
local mycmakeargs=(
-DENABLE_CCACHE=OFF
-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
@@ -124,11 +129,17 @@ multilib_src_configure() {
)
fi
+ # LIBAOM_TEST_PROCS is added by our tests-parallel.patch
+ export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
+
cmake_src_configure
}
multilib_src_test() {
- LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata"
"${BUILD_DIR}"/test_libaom || die
+ einfo "Running quiet tests which take hours."
+ # We use ninja rather than test_libaom directly so we can run it in
parallel
+ # with sharding, see
https://aomedia.googlesource.com/aom/#sharded-testing.
+ LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C
"${BUILD_DIR}" runtests
}
multilib_src_install() {
