media-libs/libvpx: fixup test phase

Roll a new testdata tarball for 1.6.1. REQUIRED_USE="test? ( threads )" RESTRICT="!test? ( test )" Bug: https://bugs.gentoo.org/605884 Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25
johu · Jan 17, 2017 · da813f2 · da813f2
1 parent 78f0c02
commit da813f2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
@@ -6,4 +6,5 @@ DIST libvpx-testdata-1.3.0.tar.bz2 45380954 SHA256 0956429f629f068b734d760f6af49
 DIST libvpx-testdata-1.4.0.tar.bz2 113132379 SHA256 8458297dfe6ecc168a6bb3b41260aeef5c35296b99ced888767f70af40a50046 SHA512 5a0402ce1943fcd1a0e954a42728a409a512c9382883c227adea399f4ca4ff8b7d72d0247dce842c3e929dce86ca2bdad935fc82d3ee58ea72291c8fcdeca393 WHIRLPOOL b4b451be2074a1af1e36c757ac14dc41c764a32eeb4b4fed2bbb38030e51a18d0c37afd71db3118dc4af4546e212946fabc6e1cf453ebee88e66a43045c938be
 DIST libvpx-testdata-1.5.0.tar.bz2 117022525 SHA256 e707d6e1499250e24fb4b355f4e3e1cec848881c42016a5f1fc3068b7cc01257 SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb WHIRLPOOL 357ed7f300536f5767a264e6a379f9b19259b23dde925584f66a911c1e44605deff4f93aa4eb012cd7ffc20d6eb471cb227422d4c28f0776bef2979370a4e784
 DIST libvpx-testdata-1.6.0.tar.bz2 121020858 SHA256 b25064beff80a71feed9a6440b86ea9c15759e94d723c325014bcbdfd131cc8d SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e WHIRLPOOL 01ee679ce3b425863f2f6ac901880ca5fc9dc86a18bf3f6ac6925c1cef66dd82c6d20a75886197f495287d7beea4a1bc08d8c83870cf75c478b5af4ad554c563
+DIST libvpx-testdata-1.6.1.tar.bz2 158774682 SHA256 9eedc5d9143657ede20ef1a37cadd04a97637150854ded1737c305d942711338 SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab WHIRLPOOL d6ea6878c6ea1136a405f669df67caf19f71b6d279ef261c2bfbf40ef3d2fd5ffcd709896e89e1cecd0f4360caa0d1b2ff06dcada8858c05c3db9f03a047c1f5
 DIST libvpx-v1.3.0.tar.bz2 2084229 SHA256 d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9 SHA512 af26766a3336155c5bc7b8cce7c23228de054287b990f9cacdc35273384a7af4999c01bb623d12143f40107036308a8b3207081efe67936748503c30c985fd6b WHIRLPOOL 03de78d6701daab8847c453317d8cc0a22e4a332994b7e1f55c5d6953b7f3acf94f3c623943dd8588bb1a174df4f7d9a8b8bc889f50823d92767c40c96fc5e68
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -5,7 +5,14 @@
 EAPI=6
 inherit toolchain-funcs multilib-minimal
 
-LIBVPX_TESTDATA_VER=1.6.0
+# To create a new testdata tarball:
+# 1. Unpack source tarbll or checkout git tag
+# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 4. make testdata
+# 5. tar -cjf libvpx-testdata-${PV}.tar.bz2 libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.6.1
 
 DESCRIPTION="WebM VP8 and VP9 Codec SDK"
 HOMEPAGE="http://www.webmproject.org"
@@ -17,6 +24,15 @@ SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+	test? ( threads )
+"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
@@ -29,11 +45,6 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
 	)
 "
 
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
 PATCHES=(
 	"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
 )
@@ -106,8 +117,9 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+	emake verbose=yes GEN_EXAMPLES= test
 }
 
 multilib_src_install() {