| 1 |
commit: d62c635158deae0918d32b476800b28f17d8d0f2 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 26 19:16:18 2018 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 4 14:07:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62c6351 |
| 7 |
|
| 8 |
media-libs/kvazaar: EAPI=7, test deps, fix tests |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/671146 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../kvazaar/{kvazaar-9999.ebuild => kvazaar-1.2.0-r1.ebuild} | 11 ++++++++++- |
| 15 |
media-libs/kvazaar/kvazaar-9999.ebuild | 11 ++++++++++- |
| 16 |
2 files changed, 20 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild |
| 19 |
similarity index 81% |
| 20 |
copy from media-libs/kvazaar/kvazaar-9999.ebuild |
| 21 |
copy to media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild |
| 22 |
index 48ce175d048..b8685352e22 100644 |
| 23 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
| 24 |
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
# Copyright 1999-2018 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=6 |
| 30 |
+EAPI=7 |
| 31 |
|
| 32 |
GREATEST_PV="1.2.1" |
| 33 |
|
| 34 |
@@ -24,9 +24,13 @@ SLOT="0/4" |
| 35 |
IUSE="static-libs test" |
| 36 |
REQUIRED_USE="test? ( static-libs )" |
| 37 |
|
| 38 |
+RESTRICT="!test? ( test )" |
| 39 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
| 40 |
RDEPEND="" |
| 41 |
DEPEND="${RDEPEND} |
| 42 |
+ test? ( |
| 43 |
+ media-video/ffmpeg |
| 44 |
+ ) |
| 45 |
abi_x86_32? ( ${ASM_DEP} ) |
| 46 |
abi_x86_64? ( ${ASM_DEP} ) |
| 47 |
" |
| 48 |
@@ -42,6 +46,11 @@ src_prepare() { |
| 49 |
fi |
| 50 |
# Some m4 macros append Werror, we do not want that. |
| 51 |
append-flags "-Wno-error" |
| 52 |
+ |
| 53 |
+ # valgrind isn't available on all archs |
| 54 |
+ # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) |
| 55 |
+ # see https://github.com/ultravideo/kvazaar/issues/216 |
| 56 |
+ find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die |
| 57 |
} |
| 58 |
|
| 59 |
multilib_src_configure() { |
| 60 |
|
| 61 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild |
| 62 |
index 48ce175d048..b8685352e22 100644 |
| 63 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
| 64 |
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild |
| 65 |
@@ -1,7 +1,7 @@ |
| 66 |
# Copyright 1999-2018 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
-EAPI=6 |
| 70 |
+EAPI=7 |
| 71 |
|
| 72 |
GREATEST_PV="1.2.1" |
| 73 |
|
| 74 |
@@ -24,9 +24,13 @@ SLOT="0/4" |
| 75 |
IUSE="static-libs test" |
| 76 |
REQUIRED_USE="test? ( static-libs )" |
| 77 |
|
| 78 |
+RESTRICT="!test? ( test )" |
| 79 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
| 80 |
RDEPEND="" |
| 81 |
DEPEND="${RDEPEND} |
| 82 |
+ test? ( |
| 83 |
+ media-video/ffmpeg |
| 84 |
+ ) |
| 85 |
abi_x86_32? ( ${ASM_DEP} ) |
| 86 |
abi_x86_64? ( ${ASM_DEP} ) |
| 87 |
" |
| 88 |
@@ -42,6 +46,11 @@ src_prepare() { |
| 89 |
fi |
| 90 |
# Some m4 macros append Werror, we do not want that. |
| 91 |
append-flags "-Wno-error" |
| 92 |
+ |
| 93 |
+ # valgrind isn't available on all archs |
| 94 |
+ # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) |
| 95 |
+ # see https://github.com/ultravideo/kvazaar/issues/216 |
| 96 |
+ find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die |
| 97 |
} |
| 98 |
|
| 99 |
multilib_src_configure() { |
Archives