1 |
commit: d1f0d027ec3be50b66a9ce69aed19cb795c23460 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 3 21:10:38 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 3 21:30:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f0d027 |
7 |
|
8 |
media-libs/openjpeg: Use GNUInstallDirs |
9 |
|
10 |
Patches pending upstream: https://github.com/uclouvain/openjpeg/pull/1165 |
11 |
|
12 |
Bug: https://bugs.gentoo.org/667150 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
15 |
|
16 |
.../files/openjpeg-2.3.0-gnuinstalldirs.patch | 501 +++++++++++++++++++++ |
17 |
media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 8 +- |
18 |
2 files changed, 502 insertions(+), 7 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..41942e45155 |
23 |
--- /dev/null |
24 |
+++ b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch |
25 |
@@ -0,0 +1,501 @@ |
26 |
+From: Andreas Sturmlechner <asturm@××××××.com> |
27 |
+Date: Fri, 2 Nov 2018 17:23:49 +0100 |
28 |
+Subject: Use GNUInstallDirs for standard installation directories |
29 |
+ |
30 |
+Raises minimum cmake version by a little. |
31 |
+ |
32 |
+ |
33 |
+commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97 |
34 |
+Author: Libor Bukata <libor.bukata@××××××.com> |
35 |
+Date: Fri Aug 31 12:57:40 2018 +0200 |
36 |
+ |
37 |
+ The change makes a relative path to header files |
38 |
+ always correct regardless of the number of sub- |
39 |
+ directories in OPENJPEG_INSTALL_PACKAGE_DIR variable. |
40 |
+ |
41 |
+diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
42 |
+index b20294ca..2925108a 100644 |
43 |
+--- a/cmake/OpenJPEGConfig.cmake.in |
44 |
++++ b/cmake/OpenJPEGConfig.cmake.in |
45 |
+@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) |
46 |
+ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
47 |
+ # This is an install tree |
48 |
+ include(${SELF_DIR}/OpenJPEGTargets.cmake) |
49 |
+- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
50 |
+- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) |
51 |
++ |
52 |
++ # We find a relative path from the PKG directory to header files. |
53 |
++ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") |
54 |
++ set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") |
55 |
++ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") |
56 |
++ |
57 |
++ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) |
58 |
+ |
59 |
+ else() |
60 |
+ if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) |
61 |
+ |
62 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
63 |
+index cb545666..2ff3b00a 100644 |
64 |
+--- a/CMakeLists.txt |
65 |
++++ b/CMakeLists.txt |
66 |
+@@ -7,7 +7,7 @@ |
67 |
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like |
68 |
+ # e.g.: |
69 |
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") |
70 |
+-cmake_minimum_required(VERSION 2.8.2) |
71 |
++cmake_minimum_required(VERSION 2.8.5) |
72 |
+ |
73 |
+ if(COMMAND CMAKE_POLICY) |
74 |
+ cmake_policy(SET CMP0003 NEW) |
75 |
+@@ -102,59 +102,28 @@ endif() |
76 |
+ |
77 |
+ # -------------------------------------------------------------------------- |
78 |
+ # Install directories |
79 |
++include(GNUInstallDirs) |
80 |
++ |
81 |
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) |
82 |
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) |
83 |
+ |
84 |
+ string(TOLOWER ${PROJECT_NAME} projectname) |
85 |
+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") |
86 |
+ |
87 |
+-if(NOT OPENJPEG_INSTALL_BIN_DIR) |
88 |
+- set(OPENJPEG_INSTALL_BIN_DIR "bin") |
89 |
+-endif() |
90 |
+- |
91 |
+-if(NOT OPENJPEG_INSTALL_LIB_DIR) |
92 |
+- set(OPENJPEG_INSTALL_LIB_DIR "lib") |
93 |
+-endif() |
94 |
+- |
95 |
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR) |
96 |
+- set(OPENJPEG_INSTALL_SHARE_DIR "share") |
97 |
+-endif() |
98 |
+- |
99 |
+-if(NOT OPENJPEG_INSTALL_DATA_DIR) |
100 |
+- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
101 |
+-endif() |
102 |
+- |
103 |
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) |
104 |
+- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") |
105 |
+-endif() |
106 |
+- |
107 |
+-if(BUILD_DOC) |
108 |
+-if(NOT OPENJPEG_INSTALL_MAN_DIR) |
109 |
+- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") |
110 |
+-endif() |
111 |
+- |
112 |
+-if(NOT OPENJPEG_INSTALL_DOC_DIR) |
113 |
+- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") |
114 |
+-endif() |
115 |
+-endif() |
116 |
+- |
117 |
+ if(NOT OPENJPEG_INSTALL_JNI_DIR) |
118 |
+ if(WIN32) |
119 |
+- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) |
120 |
++ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) |
121 |
+ else() |
122 |
+- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) |
123 |
++ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) |
124 |
+ endif() |
125 |
+ endif() |
126 |
+ |
127 |
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) |
128 |
+- # We could install *.cmake files in share/ however those files contains |
129 |
+- # hardcoded path to libraries on a multi-arch system (fedora/debian) those |
130 |
+- # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) |
131 |
+- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
132 |
++ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") |
133 |
+ endif() |
134 |
+ |
135 |
+ if (APPLE) |
136 |
+- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") |
137 |
++ list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") |
138 |
+ option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) |
139 |
+ endif() |
140 |
+ |
141 |
+@@ -338,14 +307,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake |
142 |
+ ) |
143 |
+ |
144 |
+ #----------------------------------------------------------------------------- |
145 |
+-# install CHANGES and LICENSE |
146 |
+-if(BUILD_DOC) |
147 |
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) |
148 |
+- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
149 |
+-endif() |
150 |
+- |
151 |
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
152 |
+-endif() |
153 |
+ |
154 |
+ include (cmake/OpenJPEGCPack.cmake) |
155 |
+ |
156 |
+@@ -362,14 +323,14 @@ if(BUILD_PKGCONFIG_FILES) |
157 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in |
158 |
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) |
159 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION |
160 |
+- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
161 |
++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
162 |
+ # |
163 |
+ if(BUILD_JPWL) |
164 |
+ # install in lib and not share (see multi-arch note above) |
165 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
166 |
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) |
167 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION |
168 |
+- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
169 |
++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
170 |
+ endif() |
171 |
+ # |
172 |
+ if(BUILD_JPIP) |
173 |
+@@ -377,7 +338,7 @@ if(BUILD_PKGCONFIG_FILES) |
174 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in |
175 |
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) |
176 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION |
177 |
+- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
178 |
++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
179 |
+ endif() |
180 |
+ # |
181 |
+ if(BUILD_JP3D) |
182 |
+@@ -385,7 +346,7 @@ if(BUILD_PKGCONFIG_FILES) |
183 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
184 |
+ ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) |
185 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION |
186 |
+- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
187 |
++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
188 |
+ endif() |
189 |
+ endif() |
190 |
+ |
191 |
+diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
192 |
+index 2925108a..702e2790 100644 |
193 |
+--- a/cmake/OpenJPEGConfig.cmake.in |
194 |
++++ b/cmake/OpenJPEGConfig.cmake.in |
195 |
+@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
196 |
+ |
197 |
+ # We find a relative path from the PKG directory to header files. |
198 |
+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") |
199 |
+- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") |
200 |
++ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") |
201 |
+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") |
202 |
+ |
203 |
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) |
204 |
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt |
205 |
+index d4f3ddbe..ed5cb44c 100644 |
206 |
+--- a/doc/CMakeLists.txt |
207 |
++++ b/doc/CMakeLists.txt |
208 |
+@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) |
209 |
+ |
210 |
+ # install HTML documentation (install png files too): |
211 |
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html |
212 |
+- DESTINATION share/doc |
213 |
++ DESTINATION ${CMAKE_INSTALL_DOCDIR} |
214 |
+ PATTERN ".svn" EXCLUDE |
215 |
+ ) |
216 |
+ else() |
217 |
+diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt |
218 |
+index 4d4bd952..29b4dd20 100644 |
219 |
+--- a/src/bin/jp2/CMakeLists.txt |
220 |
++++ b/src/bin/jp2/CMakeLists.txt |
221 |
+@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) |
222 |
+ # Install exe |
223 |
+ install(TARGETS ${exe} |
224 |
+ EXPORT OpenJPEGTargets |
225 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
226 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
227 |
+ ) |
228 |
+ if(OPJ_USE_DSYMUTIL) |
229 |
+ add_custom_command(TARGET ${exe} POST_BUILD |
230 |
+@@ -83,6 +83,6 @@ install( |
231 |
+ FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 |
232 |
+ ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 |
233 |
+ ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 |
234 |
+- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) |
235 |
++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
236 |
+ # |
237 |
+ endif() |
238 |
+diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt |
239 |
+index 3cac1a8f..ed62b4f3 100644 |
240 |
+--- a/src/bin/jp3d/CMakeLists.txt |
241 |
++++ b/src/bin/jp3d/CMakeLists.txt |
242 |
+@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) |
243 |
+ # Install exe |
244 |
+ install(TARGETS ${exe} |
245 |
+ EXPORT OpenJP3DTargets |
246 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
247 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
248 |
+ ) |
249 |
+ endforeach() |
250 |
+diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt |
251 |
+index 301d885b..ddd867dc 100644 |
252 |
+--- a/src/bin/jpip/CMakeLists.txt |
253 |
++++ b/src/bin/jpip/CMakeLists.txt |
254 |
+@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) |
255 |
+ # Install exe |
256 |
+ install(TARGETS opj_jpip_addxml |
257 |
+ EXPORT OpenJPEGTargets |
258 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
259 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
260 |
+ ) |
261 |
+ |
262 |
+ if(BUILD_JPIP_SERVER) |
263 |
+@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) |
264 |
+ # Install exe |
265 |
+ install(TARGETS opj_server |
266 |
+ EXPORT OpenJPEGTargets |
267 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
268 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
269 |
+ ) |
270 |
+ endif() |
271 |
+ |
272 |
+@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) |
273 |
+ target_link_libraries(${exe} openjpip) |
274 |
+ install(TARGETS ${exe} |
275 |
+ EXPORT OpenJPEGTargets |
276 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
277 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
278 |
+ ) |
279 |
+ endforeach() |
280 |
+ |
281 |
+@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
282 |
+ ) |
283 |
+ |
284 |
+ install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
285 |
+- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
286 |
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
287 |
+ ) |
288 |
+ else() |
289 |
+ # opj_viewer (simple, no xerces) |
290 |
+@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
291 |
+ ) |
292 |
+ |
293 |
+ install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
294 |
+- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
295 |
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
296 |
+ ) |
297 |
+ endif() |
298 |
+ else() |
299 |
+diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt |
300 |
+index 5df225de..8a798e61 100644 |
301 |
+--- a/src/bin/jpwl/CMakeLists.txt |
302 |
++++ b/src/bin/jpwl/CMakeLists.txt |
303 |
+@@ -57,6 +57,6 @@ foreach(exe decompress compress) |
304 |
+ endif() |
305 |
+ |
306 |
+ install(TARGETS ${jpwl_exe} |
307 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
308 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
309 |
+ ) |
310 |
+ endforeach() |
311 |
+diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt |
312 |
+index 5d3e288b..6669c502 100644 |
313 |
+--- a/src/bin/mj2/CMakeLists.txt |
314 |
++++ b/src/bin/mj2/CMakeLists.txt |
315 |
+@@ -43,5 +43,5 @@ foreach(exe |
316 |
+ endif() |
317 |
+ |
318 |
+ install(TARGETS ${exe} |
319 |
+- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) |
320 |
++ DESTINATION ${CMAKE_INSTALL_BINDIR}) |
321 |
+ endforeach() |
322 |
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt |
323 |
+index b2714858..9cbc4c3f 100644 |
324 |
+--- a/src/lib/openjp2/CMakeLists.txt |
325 |
++++ b/src/lib/openjp2/CMakeLists.txt |
326 |
+@@ -2,7 +2,7 @@ include_regular_expression("^.*$") |
327 |
+ |
328 |
+ # |
329 |
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h |
330 |
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) |
331 |
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers) |
332 |
+ |
333 |
+ include_directories( |
334 |
+ ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h |
335 |
+@@ -114,21 +114,21 @@ endif() |
336 |
+ # Install library |
337 |
+ install(TARGETS ${INSTALL_LIBS} |
338 |
+ EXPORT OpenJPEGTargets |
339 |
+- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
340 |
+- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
341 |
+- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
342 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
343 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
344 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
345 |
+ ) |
346 |
+ |
347 |
+ # Install includes files |
348 |
+ install(FILES openjpeg.h opj_stdint.h |
349 |
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers |
350 |
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers |
351 |
+ ) |
352 |
+ |
353 |
+ if(BUILD_DOC) |
354 |
+ # install man page of the library |
355 |
+ install( |
356 |
+ FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 |
357 |
+- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) |
358 |
++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) |
359 |
+ endif() |
360 |
+ |
361 |
+ if(BUILD_LUTS_GENERATOR) |
362 |
+diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in |
363 |
+index 62159b00..ebad9578 100644 |
364 |
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in |
365 |
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in |
366 |
+@@ -1,9 +1,9 @@ |
367 |
+ prefix=@CMAKE_INSTALL_PREFIX@ |
368 |
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
369 |
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
370 |
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
371 |
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
372 |
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
373 |
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
374 |
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
375 |
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
376 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
377 |
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
378 |
+ |
379 |
+ Name: openjp2 |
380 |
+ Description: JPEG2000 library (Part 1 and 2) |
381 |
+diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt |
382 |
+index b0469af1..6e251984 100644 |
383 |
+--- a/src/lib/openjp3d/CMakeLists.txt |
384 |
++++ b/src/lib/openjp3d/CMakeLists.txt |
385 |
+@@ -34,12 +34,12 @@ endif() |
386 |
+ # Install library |
387 |
+ install(TARGETS ${OPENJP3D_LIBRARY_NAME} |
388 |
+ EXPORT OpenJP3DTargets |
389 |
+- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
390 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
391 |
+ COMPONENT Libraries |
392 |
+ ) |
393 |
+ |
394 |
+ # Install includes files |
395 |
+ install(FILES openjp3d.h |
396 |
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} |
397 |
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
398 |
+ COMPONENT Headers |
399 |
+ ) |
400 |
+diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
401 |
+index e9b6c404..866a0174 100644 |
402 |
+--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
403 |
++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
404 |
+@@ -1,9 +1,9 @@ |
405 |
+ prefix=@CMAKE_INSTALL_PREFIX@ |
406 |
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
407 |
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
408 |
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
409 |
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
410 |
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
411 |
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
412 |
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
413 |
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
414 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
415 |
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
416 |
+ |
417 |
+ Name: openjp3d |
418 |
+ Description: JPEG2000 Extensions for three-dimensional data (Part 10) |
419 |
+diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt |
420 |
+index b3cb8ce8..aace36d4 100644 |
421 |
+--- a/src/lib/openjpip/CMakeLists.txt |
422 |
++++ b/src/lib/openjpip/CMakeLists.txt |
423 |
+@@ -74,9 +74,9 @@ endif() |
424 |
+ # Install library |
425 |
+ install(TARGETS openjpip |
426 |
+ EXPORT OpenJPEGTargets |
427 |
+- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
428 |
+- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
429 |
+- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
430 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
431 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
432 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
433 |
+ ) |
434 |
+ |
435 |
+ if(BUILD_JPIP_SERVER) |
436 |
+@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) |
437 |
+ PROPERTIES COMPILE_FLAGS "-DSERVER") |
438 |
+ install(TARGETS openjpip_server |
439 |
+ EXPORT OpenJPEGTargets |
440 |
+- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
441 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
442 |
+ ) |
443 |
+ endif() |
444 |
+diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in |
445 |
+index 7c3f29af..4cfa6fce 100644 |
446 |
+--- a/src/lib/openjpip/libopenjpip.pc.cmake.in |
447 |
++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in |
448 |
+@@ -1,9 +1,9 @@ |
449 |
+ prefix=@CMAKE_INSTALL_PREFIX@ |
450 |
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
451 |
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
452 |
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
453 |
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
454 |
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
455 |
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
456 |
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
457 |
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
458 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
459 |
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
460 |
+ |
461 |
+ Name: openjpip |
462 |
+ Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) |
463 |
+diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt |
464 |
+index 1b33adbe..bb90c87c 100644 |
465 |
+--- a/src/lib/openjpwl/CMakeLists.txt |
466 |
++++ b/src/lib/openjpwl/CMakeLists.txt |
467 |
+@@ -58,7 +58,7 @@ endif() |
468 |
+ # Install library |
469 |
+ install(TARGETS openjpwl |
470 |
+ EXPORT OpenJPEGTargets |
471 |
+- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
472 |
+- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
473 |
+- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
474 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
475 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
476 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
477 |
+ ) |
478 |
+diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
479 |
+index b1244197..8acc1457 100644 |
480 |
+--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
481 |
++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
482 |
+@@ -1,9 +1,9 @@ |
483 |
+ prefix=@CMAKE_INSTALL_PREFIX@ |
484 |
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
485 |
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
486 |
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
487 |
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
488 |
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
489 |
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
490 |
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
491 |
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
492 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
493 |
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
494 |
+ |
495 |
+ Name: openjpwl |
496 |
+ Description: JPEG2000 Wireless library (Part 11) |
497 |
+diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt |
498 |
+index 25294b20..dced53f6 100644 |
499 |
+--- a/src/lib/openmj2/CMakeLists.txt |
500 |
++++ b/src/lib/openmj2/CMakeLists.txt |
501 |
+@@ -53,12 +53,12 @@ endif() |
502 |
+ # Install library |
503 |
+ install(TARGETS ${OPENMJ2_LIBRARY_NAME} |
504 |
+ EXPORT OpenMJ2Targets |
505 |
+- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
506 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
507 |
+ COMPONENT Libraries |
508 |
+ ) |
509 |
+ |
510 |
+ # Install includes files |
511 |
+ #install(FILES mj2.h |
512 |
+-# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} |
513 |
++# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
514 |
+ # COMPONENT Headers |
515 |
+ #) |
516 |
+diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt |
517 |
+index eb3da0ed..4504da5f 100644 |
518 |
+--- a/wrapping/java/openjp2/CMakeLists.txt |
519 |
++++ b/wrapping/java/openjp2/CMakeLists.txt |
520 |
+@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL |
521 |
+ ) |
522 |
+ |
523 |
+ install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar |
524 |
+- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
525 |
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
526 |
+ ) |
527 |
|
528 |
diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild |
529 |
index 4dd04ca70f2..8d15446c08e 100644 |
530 |
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild |
531 |
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild |
532 |
@@ -31,6 +31,7 @@ DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) |
533 |
|
534 |
PATCHES=( |
535 |
"${FILESDIR}/${P}-fix-disable-static-libs.patch" # bug 650322 |
536 |
+ "${FILESDIR}/${P}-gnuinstalldirs.patch" # bug 667150 |
537 |
) |
538 |
|
539 |
src_prepare() { |
540 |
@@ -40,18 +41,11 @@ src_prepare() { |
541 |
fi |
542 |
|
543 |
cmake-utils_src_prepare |
544 |
- |
545 |
- # Stop installing LICENSE file, and install CHANGES from DOCS instead: |
546 |
- sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die |
547 |
- |
548 |
- # Install doxygen docs to the right directory: |
549 |
- sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die |
550 |
} |
551 |
|
552 |
multilib_src_configure() { |
553 |
local mycmakeargs=( |
554 |
-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 |
555 |
- -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)" |
556 |
-DBUILD_TESTING="$(multilib_native_usex test)" |
557 |
-DBUILD_DOC=$(multilib_native_usex doc ON OFF) |
558 |
-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) |