1 |
commit: 19e111e291e62ab657919e3286442617a23d1f63 |
2 |
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Thu Mar 16 05:57:18 2023 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 20 05:35:39 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e111e2 |
7 |
|
8 |
media-libs/kvazaar: add 2.2.0, wire up tests |
9 |
|
10 |
Bug: https://bugs.gentoo.org/896120 |
11 |
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/30149 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
media-libs/kvazaar/Manifest | 1 + |
16 |
.../{kvazaar-9999.ebuild => kvazaar-2.2.0.ebuild} | 16 ++++++++-------- |
17 |
media-libs/kvazaar/kvazaar-9999.ebuild | 16 ++++++++-------- |
18 |
3 files changed, 17 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest |
21 |
index b4dc3234b543..a3305dc8296a 100644 |
22 |
--- a/media-libs/kvazaar/Manifest |
23 |
+++ b/media-libs/kvazaar/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 |
26 |
DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec |
27 |
+DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae829492d1ff456899d2a24669b3deca25a320a8bdcf6e2cebc2c24e33c0678ac7bf51d2634a46781f66497bed54 SHA512 476abe251d7f555911851bc5a7dca84a96c0cd243c6a45dd59b808b8adf2b0787f69101a061bd48dfb6fe54a0aea046417f21fc826f14f518cada25c6d22aec4 |
28 |
|
29 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-2.2.0.ebuild |
30 |
similarity index 78% |
31 |
copy from media-libs/kvazaar/kvazaar-9999.ebuild |
32 |
copy to media-libs/kvazaar/kvazaar-2.2.0.ebuild |
33 |
index d44b2a4ef699..eae2fc58decc 100644 |
34 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
35 |
+++ b/media-libs/kvazaar/kvazaar-2.2.0.ebuild |
36 |
@@ -1,7 +1,7 @@ |
37 |
-# Copyright 1999-2022 Gentoo Authors |
38 |
+# Copyright 1999-2023 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
-EAPI=7 |
42 |
+EAPI=8 |
43 |
|
44 |
GREATEST_PV="1.2.1" |
45 |
|
46 |
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then |
47 |
else |
48 |
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
49 |
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
50 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
51 |
+ KEYWORDS="~amd64 ~mips" |
52 |
fi |
53 |
inherit autotools flag-o-matic multilib-minimal |
54 |
|
55 |
@@ -30,6 +30,7 @@ RDEPEND="" |
56 |
DEPEND="${RDEPEND} |
57 |
test? ( |
58 |
media-video/ffmpeg |
59 |
+ media-video/hevc-hm |
60 |
) |
61 |
abi_x86_32? ( ${ASM_DEP} ) |
62 |
abi_x86_64? ( ${ASM_DEP} ) |
63 |
@@ -46,11 +47,6 @@ src_prepare() { |
64 |
fi |
65 |
# Some m4 macros append Werror, we do not want that. |
66 |
append-flags "-Wno-error" |
67 |
- |
68 |
- # valgrind isn't available on all archs |
69 |
- # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) |
70 |
- # see https://github.com/ultravideo/kvazaar/issues/216 |
71 |
- find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die |
72 |
} |
73 |
|
74 |
multilib_src_configure() { |
75 |
@@ -59,6 +55,10 @@ multilib_src_configure() { |
76 |
$(use_enable static-libs static) |
77 |
} |
78 |
|
79 |
+multilib_src_test() { |
80 |
+ KVZ_TEST_VALGRIND=0 emake check |
81 |
+} |
82 |
+ |
83 |
multilib_src_install_all() { |
84 |
find "${ED}" -name '*.la' -delete || die |
85 |
} |
86 |
|
87 |
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild |
88 |
index d44b2a4ef699..eae2fc58decc 100644 |
89 |
--- a/media-libs/kvazaar/kvazaar-9999.ebuild |
90 |
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild |
91 |
@@ -1,7 +1,7 @@ |
92 |
-# Copyright 1999-2022 Gentoo Authors |
93 |
+# Copyright 1999-2023 Gentoo Authors |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
|
96 |
-EAPI=7 |
97 |
+EAPI=8 |
98 |
|
99 |
GREATEST_PV="1.2.1" |
100 |
|
101 |
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then |
102 |
else |
103 |
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz |
104 |
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )" |
105 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
106 |
+ KEYWORDS="~amd64 ~mips" |
107 |
fi |
108 |
inherit autotools flag-o-matic multilib-minimal |
109 |
|
110 |
@@ -30,6 +30,7 @@ RDEPEND="" |
111 |
DEPEND="${RDEPEND} |
112 |
test? ( |
113 |
media-video/ffmpeg |
114 |
+ media-video/hevc-hm |
115 |
) |
116 |
abi_x86_32? ( ${ASM_DEP} ) |
117 |
abi_x86_64? ( ${ASM_DEP} ) |
118 |
@@ -46,11 +47,6 @@ src_prepare() { |
119 |
fi |
120 |
# Some m4 macros append Werror, we do not want that. |
121 |
append-flags "-Wno-error" |
122 |
- |
123 |
- # valgrind isn't available on all archs |
124 |
- # also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3) |
125 |
- # see https://github.com/ultravideo/kvazaar/issues/216 |
126 |
- find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die |
127 |
} |
128 |
|
129 |
multilib_src_configure() { |
130 |
@@ -59,6 +55,10 @@ multilib_src_configure() { |
131 |
$(use_enable static-libs static) |
132 |
} |
133 |
|
134 |
+multilib_src_test() { |
135 |
+ KVZ_TEST_VALGRIND=0 emake check |
136 |
+} |
137 |
+ |
138 |
multilib_src_install_all() { |
139 |
find "${ED}" -name '*.la' -delete || die |
140 |
} |