gentoo auto-resync : 21:03:2023 - 06:39:12

3 files changed, 33 insertions, 10 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index cb37f6cff631..53a664b2e89c 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,9 +1,10 @@
 AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
+DIST libaom-3.6.0-testdata.tar.gz 498554450 BLAKE2B bbc84e9d3fd91272fa6e30a19f625fb5b71b1ff6c622982202c298e45c7a331338ed316942d7c0ab00f5ef37d442e1a45a62a30be70f8c1315caac9e7742903e SHA512 a86303a2486fca9a85cdb9275c1715a3862df92021967a5a0d97f8aa6862dd6cad1d65e1377fbee3f1b21d73c770e10ece4041a13bf57e6f2a1bb39357b00316
 DIST libaom-3.6.0.tar.gz 5258526 BLAKE2B bf97c74f3e59e3cc2431e7b7e3494beffde1b659d1a8f8775b4b47da0c7314b8bf5b9bdf14a9d1d47a8378271f49c9e26676e73509f9e910f1d5a01e79b575bc SHA512 28df178f43f26a064474f7d9c79882b4c04b66fed16f904ac9b37386912660e2af88c90672ec04eed99aef104156cf1e72040fa975895522dca7b88760b138bc
 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 3320 BLAKE2B bf33c13e06959088801581a56cf0b93f80182ab3c3804e3804eee6392cb022584cb393387b3555a66a76ef7ce3524f919fac6112c47803607a0f471924f03df3 SHA512 d31d6dc3d64a5bafe94151de76f2ae335546425fe057c24d9ed61e9f735bc7be83f32752fa5028879b18ea34f2276d85e3a29e73d7f4e9c76d2c37d739a39784
-EBUILD libaom-9999.ebuild 3320 BLAKE2B bf33c13e06959088801581a56cf0b93f80182ab3c3804e3804eee6392cb022584cb393387b3555a66a76ef7ce3524f919fac6112c47803607a0f471924f03df3 SHA512 d31d6dc3d64a5bafe94151de76f2ae335546425fe057c24d9ed61e9f735bc7be83f32752fa5028879b18ea34f2276d85e3a29e73d7f4e9c76d2c37d739a39784
+EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
+EBUILD libaom-9999.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.6.0.ebuild b/media-libs/libaom/libaom-3.6.0.ebuild
index b4074f6c48c7..a4a3923a8c6a 100644
--- a/media-libs/libaom/libaom-3.6.0.ebuild
+++ b/media-libs/libaom/libaom-3.6.0.ebuild
@@ -10,7 +10,19 @@ 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"
+	# 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-1.2.3-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvzf libaom-1.2.3-testdata.tar.gz libaom-1.2.3-testdata
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~ionen/distfiles/${P}-testdata.tar.gz )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -23,8 +35,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
@@ -97,7 +108,7 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	"${BUILD_DIR}"/test_libaom || die
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
 }
 
 multilib_src_install() {
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index b4074f6c48c7..a4a3923a8c6a 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -10,7 +10,19 @@ 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"
+	# 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-1.2.3-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvzf libaom-1.2.3-testdata.tar.gz libaom-1.2.3-testdata
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~ionen/distfiles/${P}-testdata.tar.gz )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -23,8 +35,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
@@ -97,7 +108,7 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-	"${BUILD_DIR}"/test_libaom || die
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
 }
 
 multilib_src_install() {