1 |
commit: e31a773aa52771524f781a95e46c6c1904e6a08f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 11 08:15:38 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 11 08:15:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31a773a |
7 |
|
8 |
media-libs/openjpeg: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/718918 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
media-libs/openjpeg/Manifest | 2 - |
15 |
.../files/openjpeg-2.3.1-CVE-2020-6851.patch | 29 -- |
16 |
.../files/openjpeg-2.3.1-CVE-2020-8112.patch | 43 -- |
17 |
.../files/openjpeg-2.3.1-gnuinstalldirs.patch | 495 --------------------- |
18 |
.../files/openjpeg-2.3.1-libtiff-4.1-compat.patch | 210 --------- |
19 |
media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild | 136 ------ |
20 |
6 files changed, 915 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest |
23 |
index 4421745b114..2971ec0815a 100644 |
24 |
--- a/media-libs/openjpeg/Manifest |
25 |
+++ b/media-libs/openjpeg/Manifest |
26 |
@@ -1,4 +1,2 @@ |
27 |
-DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 |
28 |
DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8 |
29 |
-DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507 |
30 |
DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31 |
31 |
|
32 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch |
33 |
deleted file mode 100644 |
34 |
index 9a70291f50e..00000000000 |
35 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch |
36 |
+++ /dev/null |
37 |
@@ -1,29 +0,0 @@ |
38 |
-From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 |
39 |
-From: Even Rouault <even.rouault@×××××××××.com> |
40 |
-Date: Sat, 11 Jan 2020 01:51:19 +0100 |
41 |
-Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose |
42 |
- coordinates are beyond INT_MAX (fixes #1228) |
43 |
- |
44 |
---- |
45 |
- src/lib/openjp2/j2k.c | 8 ++++++++ |
46 |
- 1 file changed, 8 insertions(+) |
47 |
- |
48 |
-diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c |
49 |
-index 14f6ff41a..922550eb1 100644 |
50 |
---- a/src/lib/openjp2/j2k.c |
51 |
-+++ b/src/lib/openjp2/j2k.c |
52 |
-@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image, |
53 |
- l_img_comp = p_image->comps; |
54 |
- for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { |
55 |
- OPJ_INT32 l_h, l_w; |
56 |
-+ if (p_image->x0 > (OPJ_UINT32)INT_MAX || |
57 |
-+ p_image->y0 > (OPJ_UINT32)INT_MAX || |
58 |
-+ p_image->x1 > (OPJ_UINT32)INT_MAX || |
59 |
-+ p_image->y1 > (OPJ_UINT32)INT_MAX) { |
60 |
-+ opj_event_msg(p_manager, EVT_ERROR, |
61 |
-+ "Image coordinates above INT_MAX are not supported\n"); |
62 |
-+ return OPJ_FALSE; |
63 |
-+ } |
64 |
- |
65 |
- l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, |
66 |
- (OPJ_INT32)l_img_comp->dx); |
67 |
|
68 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch |
69 |
deleted file mode 100644 |
70 |
index 95cb8095f56..00000000000 |
71 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch |
72 |
+++ /dev/null |
73 |
@@ -1,43 +0,0 @@ |
74 |
-From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 |
75 |
-From: Even Rouault <even.rouault@×××××××××.com> |
76 |
-Date: Thu, 30 Jan 2020 00:59:57 +0100 |
77 |
-Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow |
78 |
- |
79 |
-That could lead to later assertion failures. |
80 |
- |
81 |
-Fixes #1231 / CVE-2020-8112 |
82 |
---- |
83 |
- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- |
84 |
- 1 file changed, 18 insertions(+), 2 deletions(-) |
85 |
- |
86 |
-diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c |
87 |
-index deecc4dff..aa419030a 100644 |
88 |
---- a/src/lib/openjp2/tcd.c |
89 |
-+++ b/src/lib/openjp2/tcd.c |
90 |
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, |
91 |
- /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ |
92 |
- l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; |
93 |
- l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; |
94 |
-- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; |
95 |
-- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; |
96 |
-+ { |
97 |
-+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, |
98 |
-+ (OPJ_INT32)l_pdx)) << l_pdx; |
99 |
-+ if (tmp > (OPJ_UINT32)INT_MAX) { |
100 |
-+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); |
101 |
-+ return OPJ_FALSE; |
102 |
-+ } |
103 |
-+ l_br_prc_x_end = (OPJ_INT32)tmp; |
104 |
-+ } |
105 |
-+ { |
106 |
-+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, |
107 |
-+ (OPJ_INT32)l_pdy)) << l_pdy; |
108 |
-+ if (tmp > (OPJ_UINT32)INT_MAX) { |
109 |
-+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); |
110 |
-+ return OPJ_FALSE; |
111 |
-+ } |
112 |
-+ l_br_prc_y_end = (OPJ_INT32)tmp; |
113 |
-+ } |
114 |
- /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ |
115 |
- |
116 |
- l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( |
117 |
|
118 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch |
119 |
deleted file mode 100644 |
120 |
index 7eb393b8922..00000000000 |
121 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch |
122 |
+++ /dev/null |
123 |
@@ -1,495 +0,0 @@ |
124 |
-From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001 |
125 |
-From: Andreas Sturmlechner <asturm@g.o> |
126 |
-Date: Thu, 11 Apr 2019 13:10:57 +0200 |
127 |
-Subject: [PATCH] Use GNUInstallDirs for standard installation directories |
128 |
- |
129 |
-Raises minimum cmake version by a little. |
130 |
---- |
131 |
- CMakeLists.txt | 61 +++++------------------- |
132 |
- cmake/OpenJPEGConfig.cmake.in | 2 +- |
133 |
- doc/CMakeLists.txt | 2 +- |
134 |
- src/bin/jp2/CMakeLists.txt | 4 +- |
135 |
- src/bin/jp3d/CMakeLists.txt | 2 +- |
136 |
- src/bin/jpip/CMakeLists.txt | 10 ++-- |
137 |
- src/bin/jpwl/CMakeLists.txt | 2 +- |
138 |
- src/bin/mj2/CMakeLists.txt | 2 +- |
139 |
- src/lib/openjp2/CMakeLists.txt | 12 ++--- |
140 |
- src/lib/openjp2/libopenjp2.pc.cmake.in | 10 ++-- |
141 |
- src/lib/openjp3d/CMakeLists.txt | 4 +- |
142 |
- src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++-- |
143 |
- src/lib/openjpip/CMakeLists.txt | 8 ++-- |
144 |
- src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++-- |
145 |
- src/lib/openjpwl/CMakeLists.txt | 6 +-- |
146 |
- src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++-- |
147 |
- src/lib/openmj2/CMakeLists.txt | 4 +- |
148 |
- wrapping/java/openjp2/CMakeLists.txt | 2 +- |
149 |
- 18 files changed, 61 insertions(+), 100 deletions(-) |
150 |
- |
151 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
152 |
-index 3ea2424a..1f70226a 100644 |
153 |
---- a/CMakeLists.txt |
154 |
-+++ b/CMakeLists.txt |
155 |
-@@ -7,7 +7,7 @@ |
156 |
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like |
157 |
- # e.g.: |
158 |
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") |
159 |
--cmake_minimum_required(VERSION 2.8.2) |
160 |
-+cmake_minimum_required(VERSION 2.8.5) |
161 |
- |
162 |
- if(COMMAND CMAKE_POLICY) |
163 |
- cmake_policy(SET CMP0003 NEW) |
164 |
-@@ -103,59 +103,28 @@ endif() |
165 |
- |
166 |
- # -------------------------------------------------------------------------- |
167 |
- # Install directories |
168 |
-+include(GNUInstallDirs) |
169 |
-+ |
170 |
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) |
171 |
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) |
172 |
- |
173 |
- string(TOLOWER ${PROJECT_NAME} projectname) |
174 |
- set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") |
175 |
- |
176 |
--if(NOT OPENJPEG_INSTALL_BIN_DIR) |
177 |
-- set(OPENJPEG_INSTALL_BIN_DIR "bin") |
178 |
--endif() |
179 |
-- |
180 |
--if(NOT OPENJPEG_INSTALL_LIB_DIR) |
181 |
-- set(OPENJPEG_INSTALL_LIB_DIR "lib") |
182 |
--endif() |
183 |
-- |
184 |
--if(NOT OPENJPEG_INSTALL_SHARE_DIR) |
185 |
-- set(OPENJPEG_INSTALL_SHARE_DIR "share") |
186 |
--endif() |
187 |
-- |
188 |
--if(NOT OPENJPEG_INSTALL_DATA_DIR) |
189 |
-- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
190 |
--endif() |
191 |
-- |
192 |
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) |
193 |
-- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") |
194 |
--endif() |
195 |
-- |
196 |
--if(BUILD_DOC) |
197 |
--if(NOT OPENJPEG_INSTALL_MAN_DIR) |
198 |
-- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") |
199 |
--endif() |
200 |
-- |
201 |
--if(NOT OPENJPEG_INSTALL_DOC_DIR) |
202 |
-- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") |
203 |
--endif() |
204 |
--endif() |
205 |
-- |
206 |
- if(NOT OPENJPEG_INSTALL_JNI_DIR) |
207 |
- if(WIN32) |
208 |
-- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) |
209 |
-+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) |
210 |
- else() |
211 |
-- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) |
212 |
-+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) |
213 |
- endif() |
214 |
- endif() |
215 |
- |
216 |
- if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) |
217 |
-- # We could install *.cmake files in share/ however those files contains |
218 |
-- # hardcoded path to libraries on a multi-arch system (fedora/debian) those |
219 |
-- # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) |
220 |
-- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
221 |
-+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") |
222 |
- endif() |
223 |
- |
224 |
- if (APPLE) |
225 |
-- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") |
226 |
-+ list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") |
227 |
- option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) |
228 |
- endif() |
229 |
- |
230 |
-@@ -339,14 +308,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake |
231 |
- ) |
232 |
- |
233 |
- #----------------------------------------------------------------------------- |
234 |
--# install CHANGES and LICENSE |
235 |
--if(BUILD_DOC) |
236 |
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) |
237 |
-- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
238 |
--endif() |
239 |
-- |
240 |
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
241 |
--endif() |
242 |
- |
243 |
- include (cmake/OpenJPEGCPack.cmake) |
244 |
- |
245 |
-@@ -363,14 +324,14 @@ if(BUILD_PKGCONFIG_FILES) |
246 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in |
247 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) |
248 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION |
249 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
250 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
251 |
- # |
252 |
- if(BUILD_JPWL) |
253 |
- # install in lib and not share (see multi-arch note above) |
254 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
255 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) |
256 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION |
257 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
258 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
259 |
- endif() |
260 |
- # |
261 |
- if(BUILD_JPIP) |
262 |
-@@ -378,7 +339,7 @@ if(BUILD_PKGCONFIG_FILES) |
263 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in |
264 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) |
265 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION |
266 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
267 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
268 |
- endif() |
269 |
- # |
270 |
- if(BUILD_JP3D) |
271 |
-@@ -386,7 +347,7 @@ if(BUILD_PKGCONFIG_FILES) |
272 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
273 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) |
274 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION |
275 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
276 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
277 |
- endif() |
278 |
- endif() |
279 |
- |
280 |
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
281 |
-index 2925108a..702e2790 100644 |
282 |
---- a/cmake/OpenJPEGConfig.cmake.in |
283 |
-+++ b/cmake/OpenJPEGConfig.cmake.in |
284 |
-@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
285 |
- |
286 |
- # We find a relative path from the PKG directory to header files. |
287 |
- set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") |
288 |
-- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") |
289 |
-+ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") |
290 |
- file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") |
291 |
- |
292 |
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) |
293 |
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt |
294 |
-index d4f3ddbe..ed5cb44c 100644 |
295 |
---- a/doc/CMakeLists.txt |
296 |
-+++ b/doc/CMakeLists.txt |
297 |
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) |
298 |
- |
299 |
- # install HTML documentation (install png files too): |
300 |
- install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html |
301 |
-- DESTINATION share/doc |
302 |
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR} |
303 |
- PATTERN ".svn" EXCLUDE |
304 |
- ) |
305 |
- else() |
306 |
-diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt |
307 |
-index 4d4bd952..29b4dd20 100644 |
308 |
---- a/src/bin/jp2/CMakeLists.txt |
309 |
-+++ b/src/bin/jp2/CMakeLists.txt |
310 |
-@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) |
311 |
- # Install exe |
312 |
- install(TARGETS ${exe} |
313 |
- EXPORT OpenJPEGTargets |
314 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
315 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
316 |
- ) |
317 |
- if(OPJ_USE_DSYMUTIL) |
318 |
- add_custom_command(TARGET ${exe} POST_BUILD |
319 |
-@@ -83,6 +83,6 @@ install( |
320 |
- FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 |
321 |
- ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 |
322 |
- ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 |
323 |
-- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) |
324 |
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
325 |
- # |
326 |
- endif() |
327 |
-diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt |
328 |
-index 3cac1a8f..ed62b4f3 100644 |
329 |
---- a/src/bin/jp3d/CMakeLists.txt |
330 |
-+++ b/src/bin/jp3d/CMakeLists.txt |
331 |
-@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) |
332 |
- # Install exe |
333 |
- install(TARGETS ${exe} |
334 |
- EXPORT OpenJP3DTargets |
335 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
336 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
337 |
- ) |
338 |
- endforeach() |
339 |
-diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt |
340 |
-index 301d885b..ddd867dc 100644 |
341 |
---- a/src/bin/jpip/CMakeLists.txt |
342 |
-+++ b/src/bin/jpip/CMakeLists.txt |
343 |
-@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) |
344 |
- # Install exe |
345 |
- install(TARGETS opj_jpip_addxml |
346 |
- EXPORT OpenJPEGTargets |
347 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
348 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
349 |
- ) |
350 |
- |
351 |
- if(BUILD_JPIP_SERVER) |
352 |
-@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) |
353 |
- # Install exe |
354 |
- install(TARGETS opj_server |
355 |
- EXPORT OpenJPEGTargets |
356 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
357 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
358 |
- ) |
359 |
- endif() |
360 |
- |
361 |
-@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) |
362 |
- target_link_libraries(${exe} openjpip) |
363 |
- install(TARGETS ${exe} |
364 |
- EXPORT OpenJPEGTargets |
365 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
366 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
367 |
- ) |
368 |
- endforeach() |
369 |
- |
370 |
-@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
371 |
- ) |
372 |
- |
373 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
374 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
375 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
376 |
- ) |
377 |
- else() |
378 |
- # opj_viewer (simple, no xerces) |
379 |
-@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
380 |
- ) |
381 |
- |
382 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
383 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
384 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
385 |
- ) |
386 |
- endif() |
387 |
- else() |
388 |
-diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt |
389 |
-index 5df225de..8a798e61 100644 |
390 |
---- a/src/bin/jpwl/CMakeLists.txt |
391 |
-+++ b/src/bin/jpwl/CMakeLists.txt |
392 |
-@@ -57,6 +57,6 @@ foreach(exe decompress compress) |
393 |
- endif() |
394 |
- |
395 |
- install(TARGETS ${jpwl_exe} |
396 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
397 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
398 |
- ) |
399 |
- endforeach() |
400 |
-diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt |
401 |
-index 5d3e288b..6669c502 100644 |
402 |
---- a/src/bin/mj2/CMakeLists.txt |
403 |
-+++ b/src/bin/mj2/CMakeLists.txt |
404 |
-@@ -43,5 +43,5 @@ foreach(exe |
405 |
- endif() |
406 |
- |
407 |
- install(TARGETS ${exe} |
408 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) |
409 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR}) |
410 |
- endforeach() |
411 |
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt |
412 |
-index b2714858..9cbc4c3f 100644 |
413 |
---- a/src/lib/openjp2/CMakeLists.txt |
414 |
-+++ b/src/lib/openjp2/CMakeLists.txt |
415 |
-@@ -2,7 +2,7 @@ include_regular_expression("^.*$") |
416 |
- |
417 |
- # |
418 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h |
419 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) |
420 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers) |
421 |
- |
422 |
- include_directories( |
423 |
- ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h |
424 |
-@@ -114,21 +114,21 @@ endif() |
425 |
- # Install library |
426 |
- install(TARGETS ${INSTALL_LIBS} |
427 |
- EXPORT OpenJPEGTargets |
428 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
429 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
430 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
431 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
432 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
433 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
434 |
- ) |
435 |
- |
436 |
- # Install includes files |
437 |
- install(FILES openjpeg.h opj_stdint.h |
438 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers |
439 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers |
440 |
- ) |
441 |
- |
442 |
- if(BUILD_DOC) |
443 |
- # install man page of the library |
444 |
- install( |
445 |
- FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 |
446 |
-- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) |
447 |
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) |
448 |
- endif() |
449 |
- |
450 |
- if(BUILD_LUTS_GENERATOR) |
451 |
-diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in |
452 |
-index 62159b00..ebad9578 100644 |
453 |
---- a/src/lib/openjp2/libopenjp2.pc.cmake.in |
454 |
-+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in |
455 |
-@@ -1,9 +1,9 @@ |
456 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
457 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
458 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
459 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
460 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
461 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
462 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
463 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
464 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
465 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
466 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
467 |
- |
468 |
- Name: openjp2 |
469 |
- Description: JPEG2000 library (Part 1 and 2) |
470 |
-diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt |
471 |
-index b0469af1..6e251984 100644 |
472 |
---- a/src/lib/openjp3d/CMakeLists.txt |
473 |
-+++ b/src/lib/openjp3d/CMakeLists.txt |
474 |
-@@ -34,12 +34,12 @@ endif() |
475 |
- # Install library |
476 |
- install(TARGETS ${OPENJP3D_LIBRARY_NAME} |
477 |
- EXPORT OpenJP3DTargets |
478 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
479 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
480 |
- COMPONENT Libraries |
481 |
- ) |
482 |
- |
483 |
- # Install includes files |
484 |
- install(FILES openjp3d.h |
485 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} |
486 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
487 |
- COMPONENT Headers |
488 |
- ) |
489 |
-diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
490 |
-index e9b6c404..866a0174 100644 |
491 |
---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
492 |
-+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
493 |
-@@ -1,9 +1,9 @@ |
494 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
495 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
496 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
497 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
498 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
499 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
500 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
501 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
502 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
503 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
504 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
505 |
- |
506 |
- Name: openjp3d |
507 |
- Description: JPEG2000 Extensions for three-dimensional data (Part 10) |
508 |
-diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt |
509 |
-index b3cb8ce8..aace36d4 100644 |
510 |
---- a/src/lib/openjpip/CMakeLists.txt |
511 |
-+++ b/src/lib/openjpip/CMakeLists.txt |
512 |
-@@ -74,9 +74,9 @@ endif() |
513 |
- # Install library |
514 |
- install(TARGETS openjpip |
515 |
- EXPORT OpenJPEGTargets |
516 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
517 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
518 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
519 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
520 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
521 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
522 |
- ) |
523 |
- |
524 |
- if(BUILD_JPIP_SERVER) |
525 |
-@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) |
526 |
- PROPERTIES COMPILE_FLAGS "-DSERVER") |
527 |
- install(TARGETS openjpip_server |
528 |
- EXPORT OpenJPEGTargets |
529 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
530 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
531 |
- ) |
532 |
- endif() |
533 |
-diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in |
534 |
-index 7c3f29af..4cfa6fce 100644 |
535 |
---- a/src/lib/openjpip/libopenjpip.pc.cmake.in |
536 |
-+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in |
537 |
-@@ -1,9 +1,9 @@ |
538 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
539 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
540 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
541 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
542 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
543 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
544 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
545 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
546 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
547 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
548 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
549 |
- |
550 |
- Name: openjpip |
551 |
- Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) |
552 |
-diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt |
553 |
-index 1b33adbe..bb90c87c 100644 |
554 |
---- a/src/lib/openjpwl/CMakeLists.txt |
555 |
-+++ b/src/lib/openjpwl/CMakeLists.txt |
556 |
-@@ -58,7 +58,7 @@ endif() |
557 |
- # Install library |
558 |
- install(TARGETS openjpwl |
559 |
- EXPORT OpenJPEGTargets |
560 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
561 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
562 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
563 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
564 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
565 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
566 |
- ) |
567 |
-diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
568 |
-index b1244197..8acc1457 100644 |
569 |
---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
570 |
-+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
571 |
-@@ -1,9 +1,9 @@ |
572 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
573 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
574 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
575 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
576 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
577 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
578 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
579 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
580 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
581 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
582 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
583 |
- |
584 |
- Name: openjpwl |
585 |
- Description: JPEG2000 Wireless library (Part 11) |
586 |
-diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt |
587 |
-index 25294b20..dced53f6 100644 |
588 |
---- a/src/lib/openmj2/CMakeLists.txt |
589 |
-+++ b/src/lib/openmj2/CMakeLists.txt |
590 |
-@@ -53,12 +53,12 @@ endif() |
591 |
- # Install library |
592 |
- install(TARGETS ${OPENMJ2_LIBRARY_NAME} |
593 |
- EXPORT OpenMJ2Targets |
594 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
595 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
596 |
- COMPONENT Libraries |
597 |
- ) |
598 |
- |
599 |
- # Install includes files |
600 |
- #install(FILES mj2.h |
601 |
--# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} |
602 |
-+# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
603 |
- # COMPONENT Headers |
604 |
- #) |
605 |
-diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt |
606 |
-index eb3da0ed..4504da5f 100644 |
607 |
---- a/wrapping/java/openjp2/CMakeLists.txt |
608 |
-+++ b/wrapping/java/openjp2/CMakeLists.txt |
609 |
-@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL |
610 |
- ) |
611 |
- |
612 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar |
613 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
614 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
615 |
- ) |
616 |
--- |
617 |
-2.21.0 |
618 |
- |
619 |
|
620 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch |
621 |
deleted file mode 100644 |
622 |
index 53985b19093..00000000000 |
623 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch |
624 |
+++ /dev/null |
625 |
@@ -1,210 +0,0 @@ |
626 |
-From b5cb419faff300fdbc0b4e98dab5c9010db6f39d Mon Sep 17 00:00:00 2001 |
627 |
-From: Even Rouault <even.rouault@×××××××××.com> |
628 |
-Date: Fri, 7 Feb 2020 21:53:10 +0100 |
629 |
-Subject: [PATCH] tests: add alternate checksums for libtiff 4.1 |
630 |
- |
631 |
-Fixes #1233 |
632 |
- |
633 |
-libtiff 4.1 slightly modifies the way it generates files. So |
634 |
-add the new expected md5sum. |
635 |
- |
636 |
-Not super elegant solution admitedly. |
637 |
---- |
638 |
- tests/nonregression/checkmd5refs.cmake | 5 ++ |
639 |
- tests/nonregression/md5refs.txt | 86 +++++++++++++++++++++++-- |
640 |
- tests/nonregression/test_suite.ctest.in | 16 ++--- |
641 |
- 3 files changed, 93 insertions(+), 14 deletions(-) |
642 |
- |
643 |
-diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake |
644 |
-index 75afbed05..76e2f245f 100644 |
645 |
---- a/tests/nonregression/checkmd5refs.cmake |
646 |
-+++ b/tests/nonregression/checkmd5refs.cmake |
647 |
-@@ -46,10 +46,15 @@ foreach(pgxfullpath ${globfiles}) |
648 |
- |
649 |
- string(REGEX MATCH "[0-9a-f]+ ${pgxfile}" output_var "${variable}") |
650 |
- |
651 |
-+ # Search for variant md5sum for libtiff >= 4.1 |
652 |
-+ string(REGEX MATCH "libtiff_4_1:[0-9a-f]+ ${pgxfile}" alternate_output_var "${variable}") |
653 |
-+ |
654 |
- set(output "${output} ${pgxfile}") |
655 |
- |
656 |
- if("${output_var}" STREQUAL "${output}") |
657 |
- message(STATUS "equal: [${output_var}] vs [${output}]") |
658 |
-+ elseif("${alternate_output_var}" STREQUAL "libtiff_4_1:${output}") |
659 |
-+ message(STATUS "equal: [${alternate_output_var}] vs [libtiff_4_1:${output}]") |
660 |
- else() |
661 |
- message(SEND_ERROR "not equal: [${output_var}] vs [${output}]") |
662 |
- endif() |
663 |
-diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt |
664 |
-index a33e82a12..95d3d74cb 100644 |
665 |
---- a/tests/nonregression/md5refs.txt |
666 |
-+++ b/tests/nonregression/md5refs.txt |
667 |
-@@ -180,6 +180,7 @@ dacaf60e4c430916a8c2a9ebec32e71c issue458.jp2_3.pgx |
668 |
- d33fb5dbddb9b9b4438eb51fa27445a3 issue495.jp2_0.pgx |
669 |
- 27db8c35e12a5d5eb94d403d2aae2909 issue495.jp2_1.pgx |
670 |
- 97da625d2f2d0b75bf891d8083ce8bfb issue495.jp2_2.pgx |
671 |
-+ |
672 |
- 86729c5f2b74b2dfd42cb0d8e47aef79 a1_mono_tif-1.tif |
673 |
- fa9b7b896536b25a7a1d8eeeacb59141 a1_mono_tif-10.tif |
674 |
- e1f194f69d1c58ce8bed62cd4f1d5b6a a1_mono_tif-11.tif |
675 |
-@@ -196,6 +197,24 @@ de53251a33356e206a793fbdbaf90db2 a1_mono_tif-13.tif |
676 |
- e164a6c0219737ee05a3d55d6e3a3104 a1_mono_tif-7.tif |
677 |
- c3ebfcf478b1c4fc786748813f2b5d53 a1_mono_tif-8.tif |
678 |
- 67adb084f1fe234f240a1d0b2698507e a1_mono_tif-9.tif |
679 |
-+ |
680 |
-+libtiff_4_1:fc19057ff2d65c24daf9c9e25e34a48a a1_mono_tif-1.tif |
681 |
-+libtiff_4_1:66246b6bbc83c06962f034235acb9924 a1_mono_tif-10.tif |
682 |
-+libtiff_4_1:ce1e07bdafe83a84a5df87fce2ffde6a a1_mono_tif-11.tif |
683 |
-+libtiff_4_1:614f1ab59ca8473f5f8b1772b7a19d24 a1_mono_tif-12.tif |
684 |
-+libtiff_4_1:941bdcdf9103a22f7b6f66aaca3276d1 a1_mono_tif-13.tif |
685 |
-+libtiff_4_1:38df45296861df2b44879e8a0787d43c a1_mono_tif-14.tif |
686 |
-+libtiff_4_1:387575ff38bed3d177776891e1b2804e a1_mono_tif-15.tif |
687 |
-+libtiff_4_1:ee4838fbd88ddcb73ef26df523a3bb5d a1_mono_tif-16.tif |
688 |
-+libtiff_4_1:6de7e8cbd95e2c465b587f2273daf9dc a1_mono_tif-2.tif |
689 |
-+libtiff_4_1:e1e026d7ed26e8f3334cf25a8884abbd a1_mono_tif-3.tif |
690 |
-+libtiff_4_1:c120fac03d1b3756a2deb9b92ba519d4 a1_mono_tif-4.tif |
691 |
-+libtiff_4_1:3a7b84ed9061e0b13996660fc2910e8a a1_mono_tif-5.tif |
692 |
-+libtiff_4_1:7ac8316261d54f22e6c847fbac01542b a1_mono_tif-6.tif |
693 |
-+libtiff_4_1:d714670f6746931c4e7defbfbe38b249 a1_mono_tif-7.tif |
694 |
-+libtiff_4_1:b28f4b92be5e3481d44f50f2cd7626aa a1_mono_tif-8.tif |
695 |
-+libtiff_4_1:2a12dcda3e9927384e7344c4ecabdcf1 a1_mono_tif-9.tif |
696 |
-+ |
697 |
- 31650ec40241737634179fff6ad306f8 basn4a08_tif-1.tif |
698 |
- abf884080bcfbf58c044a9d86bfa5e5d basn4a08_tif-10.tif |
699 |
- b0d82c12aa2c9b3ecd96c6a5b5663a8c basn4a08_tif-11.tif |
700 |
-@@ -212,6 +231,24 @@ fb5cf848d63c61dc485c87c9246ee9c7 basn4a08_tif-16.tif |
701 |
- 18a59ac6036ee64e92af19b7e3cd3d64 basn4a08_tif-7.tif |
702 |
- dc40cc1da6de28e7e973c8ba796ca189 basn4a08_tif-8.tif |
703 |
- 824b776a5aa3459b77894b5f77621311 basn4a08_tif-9.tif |
704 |
-+ |
705 |
-+libtiff_4_1:4c50df5b25e006041b05e8a6fb77c95e basn4a08_tif-1.tif |
706 |
-+libtiff_4_1:68cc9a9bc5f95474744d06ea4efb2cf3 basn4a08_tif-10.tif |
707 |
-+libtiff_4_1:f643c00bd0673c8f6092125e38759a35 basn4a08_tif-11.tif |
708 |
-+libtiff_4_1:cfcefece2fb08a437876d85941cdaa27 basn4a08_tif-12.tif |
709 |
-+libtiff_4_1:1c3850831691aa8b565e4cd0d13166f9 basn4a08_tif-13.tif |
710 |
-+libtiff_4_1:06059e0429956946ecd3b1893ad39d18 basn4a08_tif-14.tif |
711 |
-+libtiff_4_1:71557ba6728e6641ad289b1d142acade basn4a08_tif-15.tif |
712 |
-+libtiff_4_1:150c663277b43d0331112f24d47fd34e basn4a08_tif-16.tif |
713 |
-+libtiff_4_1:9b43011e7a19079c21d65318b4a1139b basn4a08_tif-2.tif |
714 |
-+libtiff_4_1:125ca7b2e45fafa4e003f5adc9f11da8 basn4a08_tif-3.tif |
715 |
-+libtiff_4_1:9fbc1a8f4d12c8152cde3e004cebd191 basn4a08_tif-4.tif |
716 |
-+libtiff_4_1:51c6b54e9d8b53355c3f73ad813bdeef basn4a08_tif-5.tif |
717 |
-+libtiff_4_1:604ac42b1a9e7a75d63e97ce40e43442 basn4a08_tif-6.tif |
718 |
-+libtiff_4_1:360d1ce74faffa1a736d5f30c22976ed basn4a08_tif-7.tif |
719 |
-+libtiff_4_1:2059aaa9e54c09f36d16107870c1546a basn4a08_tif-8.tif |
720 |
-+libtiff_4_1:07496859507882401d66d70dcf392505 basn4a08_tif-9.tif |
721 |
-+ |
722 |
- 59e32c45591fd3bb44fe99381a116ba1 basn6a08_tif-1.tif |
723 |
- 630e6fb6deba0b3efd93b610561d607a basn6a08_tif-10.tif |
724 |
- 5419fec92f0e0e5907d838dacf9712b4 basn6a08_tif-11.tif |
725 |
-@@ -228,6 +265,24 @@ d60864a6a5c8a49a202d98ae6f5165c7 basn6a08_tif-6.tif |
726 |
- 086fd12fec963995fe2e405dcef7e477 basn6a08_tif-7.tif |
727 |
- c3e93f61125f82a9832d0b9440468034 basn6a08_tif-8.tif |
728 |
- a9723dcc0732e74c9e8cd2bf93474a7d basn6a08_tif-9.tif |
729 |
-+ |
730 |
-+libtiff_4_1:98f777ca80a132d8ab820d4533daa5b6 basn6a08_tif-1.tif |
731 |
-+libtiff_4_1:9c5873a1fa5571aad9e73d36d5a4206a basn6a08_tif-10.tif |
732 |
-+libtiff_4_1:c05dac7d4c19bc4b78cea426e5e52430 basn6a08_tif-11.tif |
733 |
-+libtiff_4_1:0223432f61df2508d0195f696988ddeb basn6a08_tif-12.tif |
734 |
-+libtiff_4_1:ccc64d14279063ed9daf371be62077f7 basn6a08_tif-13.tif |
735 |
-+libtiff_4_1:ace0bab2c2fbb5f92a8214600df9159f basn6a08_tif-14.tif |
736 |
-+libtiff_4_1:9b54bda92a09bcac9870fa02b428b7e6 basn6a08_tif-15.tif |
737 |
-+libtiff_4_1:178665d070f54f2920521c4e1cb9d5d0 basn6a08_tif-16.tif |
738 |
-+libtiff_4_1:c4b1e96d19429137cd8871833af2ea5a basn6a08_tif-2.tif |
739 |
-+libtiff_4_1:44e8b5591740289d0ca52a3e19f19c22 basn6a08_tif-3.tif |
740 |
-+libtiff_4_1:70b4f469dd29c8e99d3f0525301286b8 basn6a08_tif-4.tif |
741 |
-+libtiff_4_1:bf7c35a2b05eecb406aab7959431a842 basn6a08_tif-5.tif |
742 |
-+libtiff_4_1:7d2ecb1c35869ddbafd11b4896357b81 basn6a08_tif-6.tif |
743 |
-+libtiff_4_1:2cd6ec32a0256806f46706c0ca564d9d basn6a08_tif-7.tif |
744 |
-+libtiff_4_1:116b611b7a358bee2c4f2695732ec357 basn6a08_tif-8.tif |
745 |
-+libtiff_4_1:ed9ca54d25fb5b0cd5339eedfa16cbea basn6a08_tif-9.tif |
746 |
-+ |
747 |
- cfe04d15cf9d615fc36357dcb3b3956b p0_14_tif-1.tif |
748 |
- 9ad87e7fddc77ac85e2e92509bee2365 p0_14_tif-10.tif |
749 |
- f144e26d6d5aa24d98f0415f10751025 p0_14_tif-11.tif |
750 |
-@@ -244,6 +299,24 @@ b6f71c941e3a5b8d2547792ccec58d54 p0_14_tif-4.tif |
751 |
- 951c99efbd922d8f3feb015e9ef8e350 p0_14_tif-7.tif |
752 |
- 6808377b760b4ef3559ba8b14ed9b91a p0_14_tif-8.tif |
753 |
- 96aa7dafa873d0ce33f84bb1ff78fa9b p0_14_tif-9.tif |
754 |
-+ |
755 |
-+libtiff_4_1:5f97d4bbab138f99b6b125e5a5bf96bd p0_14_tif-1.tif |
756 |
-+libtiff_4_1:686c7a1561d73e53c000800ec0c5fa0a p0_14_tif-10.tif |
757 |
-+libtiff_4_1:a8585d901cc1b7cbbda6e524ecb5db35 p0_14_tif-11.tif |
758 |
-+libtiff_4_1:17b5497c9b8a0c68739c0beae90aa432 p0_14_tif-12.tif |
759 |
-+libtiff_4_1:a024a04b96ccb13c81cd57a5ee6ad07a p0_14_tif-13.tif |
760 |
-+libtiff_4_1:aabadca3f87437a32878fef7e265b23a p0_14_tif-14.tif |
761 |
-+libtiff_4_1:5390a77296962268b73a793467092633 p0_14_tif-15.tif |
762 |
-+libtiff_4_1:47dc7cc71832e5739c32794a713966c3 p0_14_tif-16.tif |
763 |
-+libtiff_4_1:1a9247cd1fb26f5fffa870e8543f6d30 p0_14_tif-2.tif |
764 |
-+libtiff_4_1:e4c0c9481d4032ea6b7e6a08a39e9030 p0_14_tif-3.tif |
765 |
-+libtiff_4_1:c7d6ec9b235aaff146228875e69edbaa p0_14_tif-4.tif |
766 |
-+libtiff_4_1:d3b8110b2284a09cfb7d5c4ffd451aff p0_14_tif-5.tif |
767 |
-+libtiff_4_1:6189ee17c4a276f99302ac7e296b3daa p0_14_tif-6.tif |
768 |
-+libtiff_4_1:b4a3b9b63681448abb7c460702de4df9 p0_14_tif-7.tif |
769 |
-+libtiff_4_1:04deb4e9679e7971c2cd0449fcd255b7 p0_14_tif-8.tif |
770 |
-+libtiff_4_1:254443e438ed6a5b0631d6188cc84789 p0_14_tif-9.tif |
771 |
-+ |
772 |
- dd15b3d487d36a3682be0679300a4319 issue235.jp2_0.pgx |
773 |
- b9cd6dc76b141fb1fec15f50c1f70e01 issue235.jp2_1.pgx |
774 |
- 3edef2ae197ef30b08deda1b28825399 issue235.jp2_2.pgx |
775 |
-@@ -288,6 +361,7 @@ fc2844a9f3c8e924e349180ba9e122dd p0_14_png-2.png |
776 |
- 8d7685f1569d446787476c0a56c93750 dwt_interleave_h.gsr105.jp2_1.pgx |
777 |
- ddfff2ce2df4a9102518c92a362e6d25 dwt_interleave_h.gsr105.jp2_2.pgx |
778 |
- 63bf755af5a1f8a478d65079dc7c8964 issue205-tif.jp2.tif |
779 |
-+libtiff_4_1:f9678a9e12d540f768ebebaee2af8f14 issue205-tif.jp2.tif |
780 |
- b01ed87dbac424bc820b2ac590e4884e issue236-ESYCC-CDEF.jp2_0.pgx |
781 |
- 2635cc00b1e18ef11adcba09e845d459 issue236-ESYCC-CDEF.jp2_1.pgx |
782 |
- f9c95d0aec2f6e7b814fa1d09edcdbda issue236-ESYCC-CDEF.jp2_2.pgx |
783 |
-@@ -310,11 +384,11 @@ d1bb7f93f4c0eb984b2e9c54e544b7e9 broken.jpc_1.pgx |
784 |
- b704ad4c0cfefffd78c20a54f5541265 dwt_interleave_h.gsr105.jp2_d_1_1_33_33_0.pgx |
785 |
- 9d7fe43cd7a50b7bbaf712926ee11980 dwt_interleave_h.gsr105.jp2_d_1_1_33_33_1.pgx |
786 |
- 0960b580f991ff10f693b24aa41ad58b dwt_interleave_h.gsr105.jp2_d_1_1_33_33_2.pgx |
787 |
--fa7382fd8b2e788b28b807e200dd95b9 file1.jp2-c0.tif |
788 |
--ed79b7fe443955cdefba2b039ddc846a file1.jp2-c0_1_2.tif |
789 |
--ac8f6ab3acc9c692ed7c41bd62a0e1e8 file1.jp2-c0-r1.tif |
790 |
--fbfcf662b6f7549574b2885490fbcf12 file1.jp2-c0-d10_20_30_40.tif |
791 |
--fa7382fd8b2e788b28b807e200dd95b9 file1.jp2-c0-t0.tif |
792 |
--ac8f6ab3acc9c692ed7c41bd62a0e1e8 file1.jp2-c0-t0-r1.tif |
793 |
-+6e23ded7d3ca0b1dd8405448e3ff931b file1.jp2-c0.png |
794 |
-+5acabea0ef6d09d2c1f681773e886935 file1.jp2-c0_1_2.png |
795 |
-+1150acbee2c1e33c57592c05c76e565a file1.jp2-c0-r1.png |
796 |
-+1b8ab42d8ee4e28d2868c04a815fb569 file1.jp2-c0-d10_20_30_40.png |
797 |
-+6e23ded7d3ca0b1dd8405448e3ff931b file1.jp2-c0-t0.png |
798 |
-+1150acbee2c1e33c57592c05c76e565a file1.jp2-c0-t0-r1.png |
799 |
- f31bcb01c771f829054cdb013575e86a issue1043.png |
800 |
- 62bc654c830efddf1b23d6e208447dab tnsot_zero.png |
801 |
-diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in |
802 |
-index c42bad162..bda0681f7 100644 |
803 |
---- a/tests/nonregression/test_suite.ctest.in |
804 |
-+++ b/tests/nonregression/test_suite.ctest.in |
805 |
-@@ -612,22 +612,22 @@ opj_decompress -i @INPUT_NR_PATH@/issue979.j2k -o @TEMP_PATH@/issue979.j2k.pgx |
806 |
- opj_decompress -i @INPUT_NR_PATH@/dwt_interleave_h.gsr105.jp2 -o @TEMP_PATH@/dwt_interleave_h.gsr105.jp2_d_1_1_33_33.pgx -d 1,1,33,33 |
807 |
- |
808 |
- # partial component decoding with opj_decode(): one component |
809 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.tif -c 0 |
810 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.png -c 0 |
811 |
- # partial component decoding with opj_decode(): 3 components without MCT |
812 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.tif -c 0,1,2 |
813 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.png -c 0,1,2 |
814 |
- # partial component decoding with opj_decode() and opj_set_decode_area() |
815 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.tif -c 0 -d 10,20,30,40 |
816 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.png -c 0 -d 10,20,30,40 |
817 |
- # partial component decoding with opj_decode() and reduced resolution |
818 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.tif -c 0 -r 1 |
819 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.png -c 0 -r 1 |
820 |
- # partial component decoding with opj_get_decoded_tile() |
821 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.tif -c 0 -t 0 |
822 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.png -c 0 -t 0 |
823 |
- # partial component decoding with opj_get_decoded_tile() and reduced resolution |
824 |
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.tif -c 0 -t 0 -r 1 |
825 |
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.png -c 0 -t 0 -r 1 |
826 |
- |
827 |
- # try to map the same component several times |
828 |
--!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.tif -c 0,0 |
829 |
-+!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.png -c 0,0 |
830 |
- # try to map an invalid component |
831 |
--!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.tif -c 10 |
832 |
-+!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.png -c 10 |
833 |
- |
834 |
- opj_decompress -i @INPUT_NR_PATH@/db11217111510058.jp2 -o @TEMP_PATH@/issue1043.png |
835 |
- |
836 |
|
837 |
diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild |
838 |
deleted file mode 100644 |
839 |
index 07ed6a38acd..00000000000 |
840 |
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild |
841 |
+++ /dev/null |
842 |
@@ -1,136 +0,0 @@ |
843 |
-# Copyright 1999-2021 Gentoo Authors |
844 |
-# Distributed under the terms of the GNU General Public License v2 |
845 |
- |
846 |
-EAPI=7 |
847 |
- |
848 |
-CMAKE_ECLASS=cmake |
849 |
-inherit cmake-multilib |
850 |
- |
851 |
-# Make sure that test data are not newer than release; |
852 |
-# otherwise we will see "Found-But-No-Test" test failures! |
853 |
-MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e" |
854 |
- |
855 |
-DESCRIPTION="Open-source JPEG 2000 library" |
856 |
-HOMEPAGE="https://www.openjpeg.org" |
857 |
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
858 |
- test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20180620.tar.gz )" |
859 |
- |
860 |
-LICENSE="BSD-2" |
861 |
-SLOT="2/7" # based on SONAME |
862 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
863 |
-IUSE="doc static-libs test" |
864 |
-RESTRICT="!test? ( test )" |
865 |
- |
866 |
-RDEPEND=" |
867 |
- media-libs/lcms:2 |
868 |
- media-libs/libpng:0= |
869 |
- media-libs/tiff:0 |
870 |
- sys-libs/zlib:=" |
871 |
-DEPEND="${RDEPEND}" |
872 |
-BDEPEND=" |
873 |
- doc? ( app-doc/doxygen )" |
874 |
- |
875 |
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) |
876 |
- |
877 |
-PATCHES=( |
878 |
- "${FILESDIR}/${PN}-2.3.1-gnuinstalldirs.patch" # bug 667150 |
879 |
- "${FILESDIR}/${P}-CVE-2020-6851.patch" |
880 |
- "${FILESDIR}/${P}-CVE-2020-8112.patch" |
881 |
- "${FILESDIR}/${P}-libtiff-4.1-compat.patch" |
882 |
-) |
883 |
- |
884 |
-src_prepare() { |
885 |
- if use test; then |
886 |
- mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || |
887 |
- die "Failed to rename test data" |
888 |
- fi |
889 |
- |
890 |
- cmake_src_prepare |
891 |
-} |
892 |
- |
893 |
-multilib_src_configure() { |
894 |
- local mycmakeargs=( |
895 |
- -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 |
896 |
- -DBUILD_TESTING="$(multilib_native_usex test)" |
897 |
- -DBUILD_DOC=$(multilib_native_usex doc ON OFF) |
898 |
- -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) |
899 |
- -DBUILD_STATIC_LIBS=$(usex static-libs) |
900 |
- ) |
901 |
- |
902 |
- cmake_src_configure |
903 |
-} |
904 |
- |
905 |
-multilib_src_test() { |
906 |
- if ! multilib_is_native_abi ; then |
907 |
- elog "Cannot run tests for non-multilib abi." |
908 |
- return 0 |
909 |
- fi |
910 |
- |
911 |
- local myctestargs= |
912 |
- |
913 |
- pushd "${BUILD_DIR}" > /dev/null || die |
914 |
- [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" |
915 |
- |
916 |
- [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) |
917 |
- |
918 |
- echo ctest "${myctestargs[@]}" "$@" |
919 |
- if ctest "${myctestargs[@]}" "$@" ; then |
920 |
- einfo "Tests succeeded." |
921 |
- popd > /dev/null || die |
922 |
- return 0 |
923 |
- else |
924 |
- local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" |
925 |
- |
926 |
- if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then |
927 |
- # Should never happen |
928 |
- die "Cannot analyze test failures: LastTestsFailed.log is missing!" |
929 |
- fi |
930 |
- |
931 |
- echo "" |
932 |
- einfo "Note: Upstream is maintaining a list of known test failures." |
933 |
- einfo "We will now compare our test results against this list and sort out any known failure." |
934 |
- |
935 |
- local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" |
936 |
- cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die |
937 |
- |
938 |
- local ARCH_SPECIFIC_FAILURES= |
939 |
- if use amd64 ; then |
940 |
- ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" |
941 |
- elif use x86 || use arm || use arm64; then |
942 |
- ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" |
943 |
- fi |
944 |
- |
945 |
- if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then |
946 |
- einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." |
947 |
- cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die |
948 |
- fi |
949 |
- |
950 |
- # Logic copied from $S/tools/travis-ci/run.sh |
951 |
- local FAILEDTEST= |
952 |
- local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" |
953 |
- local HAS_UNKNOWN_TEST_FAILURES=0 |
954 |
- |
955 |
- echo "" |
956 |
- |
957 |
- awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" |
958 |
- while read FAILEDTEST; do |
959 |
- # is this failure known? |
960 |
- if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then |
961 |
- ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." |
962 |
- continue |
963 |
- fi |
964 |
- |
965 |
- eerror "New/unknown test failure found: '${FAILEDTEST}'" |
966 |
- HAS_UNKNOWN_TEST_FAILURES=1 |
967 |
- done < "${FAILURES_LOG}" |
968 |
- |
969 |
- if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then |
970 |
- die "Test suite failed. New/unknown test failure(s) found!" |
971 |
- else |
972 |
- echo "" |
973 |
- einfo "Test suite passed. No new/unknown test failure(s) found!" |
974 |
- fi |
975 |
- |
976 |
- return 0 |
977 |
- fi |
978 |
-} |