1 |
commit: 9c2ee61a556c98be362dac911c952a11b1d6dd83 |
2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 28 13:22:57 2018 +0000 |
4 |
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 14:42:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2ee61a |
7 |
|
8 |
media-gfx/openvdb: bump to version 5.2.0 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/9720 |
11 |
|
12 |
media-gfx/openvdb/Manifest | 1 + |
13 |
.../files/openvdb-5.2.0-use-gnuinstalldirs.patch | 312 +++++++++++++++++++++ |
14 |
...2.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 93 ++++++ |
15 |
media-gfx/openvdb/metadata.xml | 7 +- |
16 |
media-gfx/openvdb/openvdb-5.2.0.ebuild | 71 +++++ |
17 |
5 files changed, 480 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest |
20 |
index b37baf5dcfb..5c46e65dda8 100644 |
21 |
--- a/media-gfx/openvdb/Manifest |
22 |
+++ b/media-gfx/openvdb/Manifest |
23 |
@@ -2,3 +2,4 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06 |
24 |
DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d |
25 |
DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d |
26 |
DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6 |
27 |
+DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e |
28 |
|
29 |
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..d72f835adaa |
32 |
--- /dev/null |
33 |
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch |
34 |
@@ -0,0 +1,312 @@ |
35 |
+diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake |
36 |
+--- a/cmake/FindBlosc.cmake 2018-08-13 16:33:07.000000000 +0100 |
37 |
++++ b/cmake/FindBlosc.cmake 2018-08-28 12:20:33.331930720 +0100 |
38 |
+@@ -37,7 +37,7 @@ |
39 |
+ |
40 |
+ FIND_PACKAGE ( PackageHandleStandardArgs ) |
41 |
+ |
42 |
+-FIND_PATH( BLOSC_LOCATION include/blosc.h |
43 |
++FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h |
44 |
+ "$ENV{BLOSC_ROOT}" |
45 |
+ NO_DEFAULT_PATH |
46 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
47 |
+@@ -49,7 +49,7 @@ |
48 |
+ |
49 |
+ IF ( BLOSC_FOUND ) |
50 |
+ |
51 |
+- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib |
52 |
++ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
53 |
+ CACHE STRING "Blosc library directories") |
54 |
+ |
55 |
+ SET ( _blosc_library_name "blosc" ) |
56 |
+@@ -75,6 +75,6 @@ |
57 |
+ SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} ) |
58 |
+ ENDIF() |
59 |
+ |
60 |
+- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" ) |
61 |
++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" ) |
62 |
+ |
63 |
+ ENDIF ( BLOSC_FOUND ) |
64 |
+diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake |
65 |
+--- a/cmake/FindCPPUnit.cmake 2018-08-13 16:33:07.000000000 +0100 |
66 |
++++ b/cmake/FindCPPUnit.cmake 2018-08-28 12:20:33.333930718 +0100 |
67 |
+@@ -38,7 +38,7 @@ |
68 |
+ |
69 |
+ FIND_PACKAGE ( PackageHandleStandardArgs ) |
70 |
+ |
71 |
+-FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h |
72 |
++FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h |
73 |
+ "$ENV{CPPUNIT_ROOT}" |
74 |
+ NO_DEFAULT_PATH |
75 |
+ NO_CMAKE_ENVIRONMENT_PATH |
76 |
+@@ -53,13 +53,13 @@ |
77 |
+ |
78 |
+ IF ( CPPUNIT_FOUND ) |
79 |
+ |
80 |
+- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory") |
81 |
++ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory") |
82 |
+ IF (CPPUnit_USE_STATIC_LIBS) |
83 |
+ SET( CPPUNIT_LIBRARY_NAME libcppunit.a) |
84 |
+ ELSE () |
85 |
+ SET( CPPUNIT_LIBRARY_NAME cppunit) |
86 |
+ ENDIF () |
87 |
+ FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME} |
88 |
+- PATHS ${CPPUNIT_LOCATION}/lib ) |
89 |
++ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} ) |
90 |
+ |
91 |
+ ENDIF ( CPPUNIT_FOUND ) |
92 |
+diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake |
93 |
+--- a/cmake/FindGLEW.cmake 2018-08-13 16:33:07.000000000 +0100 |
94 |
++++ b/cmake/FindGLEW.cmake 2018-08-28 12:20:33.333930718 +0100 |
95 |
+@@ -39,7 +39,7 @@ |
96 |
+ |
97 |
+ FIND_PACKAGE ( PackageHandleStandardArgs ) |
98 |
+ |
99 |
+-FIND_PATH( GLEW_LOCATION include/GL/glew.h |
100 |
++FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h |
101 |
+ "$ENV{GLEW_ROOT}" |
102 |
+ NO_DEFAULT_PATH |
103 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
104 |
+@@ -51,7 +51,7 @@ |
105 |
+ |
106 |
+ IF ( GLEW_LOCATION ) |
107 |
+ |
108 |
+- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path") |
109 |
++ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path") |
110 |
+ |
111 |
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
112 |
+ IF (GLEW_USE_STATIC_LIBS) |
113 |
+@@ -74,11 +74,11 @@ |
114 |
+ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib ) |
115 |
+ ELSE (APPLE) |
116 |
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") |
117 |
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib |
118 |
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
119 |
+ NO_DEFAULT_PATH |
120 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
121 |
+ ) |
122 |
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib |
123 |
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
124 |
+ NO_DEFAULT_PATH |
125 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
126 |
+ ) |
127 |
+@@ -107,11 +107,11 @@ |
128 |
+ ) |
129 |
+ ELSE (APPLE) |
130 |
+ # Unices |
131 |
+- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib |
132 |
++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
133 |
+ NO_DEFAULT_PATH |
134 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
135 |
+ ) |
136 |
+- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib |
137 |
++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
138 |
+ NO_DEFAULT_PATH |
139 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
140 |
+ ) |
141 |
+diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake |
142 |
+--- a/cmake/FindGLFW3.cmake 2018-08-13 16:33:07.000000000 +0100 |
143 |
++++ b/cmake/FindGLFW3.cmake 2018-08-28 12:20:33.334930718 +0100 |
144 |
+@@ -39,7 +39,7 @@ |
145 |
+ |
146 |
+ FIND_PACKAGE ( PackageHandleStandardArgs ) |
147 |
+ |
148 |
+-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h |
149 |
++FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h |
150 |
+ "$ENV{GLFW3_ROOT}" |
151 |
+ NO_DEFAULT_PATH |
152 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
153 |
+@@ -50,11 +50,11 @@ |
154 |
+ ) |
155 |
+ |
156 |
+ IF (GLFW3_FOUND) |
157 |
+- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path") |
158 |
++ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path") |
159 |
+ SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu) |
160 |
+ IF (GLFW3_USE_STATIC_LIBS) |
161 |
+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 |
162 |
+- PATHS ${GLFW3_LOCATION}/lib |
163 |
++ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
164 |
+ PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES} |
165 |
+ NO_DEFAULT_PATH |
166 |
+ NO_CMAKE_ENVIRONMENT_PATH |
167 |
+@@ -64,7 +64,7 @@ |
168 |
+ ) |
169 |
+ ELSE (GLFW3_USE_STATIC_LIBS) |
170 |
+ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw |
171 |
+- PATHS ${GLFW3_LOCATION}/lib |
172 |
++ PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
173 |
+ PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES} |
174 |
+ NO_DEFAULT_PATH |
175 |
+ NO_CMAKE_ENVIRONMENT_PATH |
176 |
+diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake |
177 |
+--- a/cmake/FindGLFW.cmake 2018-08-13 16:33:07.000000000 +0100 |
178 |
++++ b/cmake/FindGLFW.cmake 2018-08-28 12:20:33.334930718 +0100 |
179 |
+@@ -38,12 +38,12 @@ |
180 |
+ |
181 |
+ SET ( GLFW_FOUND FALSE ) |
182 |
+ |
183 |
+-FIND_PATH( GLFW_LOCATION include/GL/glfw.h |
184 |
++FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h |
185 |
+ "$ENV{GLFW_ROOT}" |
186 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
187 |
+ ) |
188 |
+ |
189 |
+-SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path") |
190 |
++SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path") |
191 |
+ |
192 |
+ SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
193 |
+ IF (GLFW_USE_STATIC_LIBS) |
194 |
+@@ -61,7 +61,7 @@ |
195 |
+ FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib ) |
196 |
+ ELSE (APPLE) |
197 |
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") |
198 |
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64 |
199 |
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
200 |
+ NO_DEFAULT_PATH |
201 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
202 |
+ ) |
203 |
+@@ -84,7 +84,7 @@ |
204 |
+ ) |
205 |
+ ELSE (APPLE) |
206 |
+ # Unices |
207 |
+- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64 |
208 |
++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
209 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
210 |
+ ) |
211 |
+ ENDIF (APPLE) |
212 |
+diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake |
213 |
+--- a/cmake/FindOpenVDB.cmake 2018-08-13 16:33:07.000000000 +0100 |
214 |
++++ b/cmake/FindOpenVDB.cmake 2018-08-28 12:20:33.334930718 +0100 |
215 |
+@@ -45,7 +45,7 @@ |
216 |
+ |
217 |
+ FIND_PACKAGE( PackageHandleStandardArgs ) |
218 |
+ |
219 |
+-FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h |
220 |
++FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h |
221 |
+ "$ENV{OPENVDB_ROOT}" |
222 |
+ NO_DEFAULT_PATH |
223 |
+ NO_SYSTEM_ENVIRONMENT_PATH |
224 |
+@@ -56,10 +56,10 @@ |
225 |
+ ) |
226 |
+ |
227 |
+ IF( OpenVDB_FOUND ) |
228 |
+- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include |
229 |
++ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR} |
230 |
+ CACHE PATH "OpenVDB include directory") |
231 |
+ |
232 |
+- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib |
233 |
++ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR} |
234 |
+ CACHE PATH "OpenVDB library directory" ) |
235 |
+ |
236 |
+ FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb |
237 |
+diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake |
238 |
+--- a/cmake/FindTBB.cmake 2018-08-13 16:33:07.000000000 +0100 |
239 |
++++ b/cmake/FindTBB.cmake 2018-08-28 12:20:33.335930717 +0100 |
240 |
+@@ -42,7 +42,7 @@ |
241 |
+ |
242 |
+ # SET ( TBB_FOUND FALSE ) |
243 |
+ |
244 |
+-FIND_PATH( TBB_LOCATION include/tbb/tbb.h |
245 |
++FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h |
246 |
+ "$ENV{TBB_ROOT}" |
247 |
+ NO_DEFAULT_PATH |
248 |
+ NO_CMAKE_ENVIRONMENT_PATH |
249 |
+@@ -57,7 +57,7 @@ |
250 |
+ |
251 |
+ IF ( TBB_FOUND ) |
252 |
+ |
253 |
+- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory") |
254 |
++ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory") |
255 |
+ |
256 |
+ IF (APPLE) |
257 |
+ IF (TBB_FOR_CLANG) |
258 |
+@@ -86,7 +86,7 @@ |
259 |
+ LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} ) |
260 |
+ ELSE (APPLE) |
261 |
+ # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}") |
262 |
+- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory") |
263 |
++ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory") |
264 |
+ IF (${CMAKE_COMPILER_IS_GNUCXX}) |
265 |
+ IF ( TBB_MATCH_COMPILER_VERSION ) |
266 |
+ STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION}) |
267 |
+diff -urN a/CMakeLists.txt b/CMakeLists.txt |
268 |
+--- a/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100 |
269 |
++++ b/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100 |
270 |
+@@ -32,6 +32,8 @@ |
271 |
+ |
272 |
+ ENABLE_TESTING() |
273 |
+ |
274 |
++INCLUDE ( GNUInstallDirs ) |
275 |
++ |
276 |
+ find_program(CCACHE_FOUND ccache) |
277 |
+ if(CCACHE_FOUND) |
278 |
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) |
279 |
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt |
280 |
+--- a/openvdb/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100 |
281 |
++++ b/openvdb/CMakeLists.txt 2018-08-28 12:20:33.335930717 +0100 |
282 |
+@@ -414,7 +414,7 @@ |
283 |
+ ) |
284 |
+ |
285 |
+ INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)") |
286 |
+- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs) |
287 |
++ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR}) |
288 |
+ |
289 |
+ ENDIF () |
290 |
+ |
291 |
+@@ -423,37 +423,37 @@ |
292 |
+ INSTALL ( TARGETS |
293 |
+ vdb_view |
294 |
+ DESTINATION |
295 |
+- bin |
296 |
++ ${CMAKE_INSTALL_BINDIR} |
297 |
+ ) |
298 |
+ ENDIF () |
299 |
+ INSTALL ( TARGETS |
300 |
+ vdb_print |
301 |
+ vdb_render |
302 |
+ DESTINATION |
303 |
+- bin |
304 |
++ ${CMAKE_INSTALL_BINDIR} |
305 |
+ ) |
306 |
+ |
307 |
+ INSTALL ( TARGETS |
308 |
+ openvdb_static |
309 |
+ DESTINATION |
310 |
+- lib |
311 |
++ ${CMAKE_INSTALL_LIBDIR} |
312 |
+ ) |
313 |
+ |
314 |
+ IF (WIN32) |
315 |
+ INSTALL ( TARGETS |
316 |
+ openvdb_shared |
317 |
+- RUNTIME DESTINATION bin COMPONENT Runtime |
318 |
+- ARCHIVE DESTINATION lib COMPONENT Runtime |
319 |
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime |
320 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime |
321 |
+ ) |
322 |
+ ELSE() |
323 |
+ INSTALL ( TARGETS |
324 |
+ openvdb_shared |
325 |
+ DESTINATION |
326 |
+- lib |
327 |
++ ${CMAKE_INSTALL_LIBDIR} |
328 |
+ ) |
329 |
+ ENDIF () |
330 |
+ |
331 |
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include |
332 |
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
333 |
+ FILES_MATCHING PATTERN "*.h" |
334 |
+ PATTERN "python" EXCLUDE |
335 |
+ PATTERN "cmd" EXCLUDE |
336 |
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt |
337 |
+--- a/openvdb/python/CMakeLists.txt 2018-08-13 16:33:07.000000000 +0100 |
338 |
++++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.336930716 +0100 |
339 |
+@@ -107,6 +107,6 @@ |
340 |
+ ${PYOPENVDB_INSTALL_DIRECTORY} |
341 |
+ ) |
342 |
+ |
343 |
+-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include |
344 |
++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
345 |
+ FILES_MATCHING PATTERN "*.h" |
346 |
+ ) |
347 |
|
348 |
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch |
349 |
new file mode 100644 |
350 |
index 00000000000..c3999e54f9c |
351 |
--- /dev/null |
352 |
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch |
353 |
@@ -0,0 +1,93 @@ |
354 |
+diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt |
355 |
+--- a/openvdb/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100 |
356 |
++++ b/openvdb/CMakeLists.txt 2018-08-28 12:25:19.807755722 +0100 |
357 |
+@@ -83,11 +83,12 @@ |
358 |
+ ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB ) |
359 |
+ ENDIF () |
360 |
+ |
361 |
++FIND_PACKAGE ( PkgConfig REQUIRED ) |
362 |
+ FIND_PACKAGE ( Blosc REQUIRED ) |
363 |
+ FIND_PACKAGE ( TBB REQUIRED ) |
364 |
+ FIND_PACKAGE ( ZLIB REQUIRED ) |
365 |
+-FIND_PACKAGE ( ILMBase REQUIRED ) |
366 |
+-FIND_PACKAGE ( OpenEXR REQUIRED ) |
367 |
++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase ) |
368 |
++PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR ) |
369 |
+ FIND_PACKAGE ( OpenGL REQUIRED ) |
370 |
+ IF (OPENVDB_BUILD_DOCS) |
371 |
+ FIND_PACKAGE ( Doxygen REQUIRED ) |
372 |
+@@ -111,8 +112,8 @@ |
373 |
+ INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} ) |
374 |
+ ENDIF () |
375 |
+ |
376 |
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} ) |
377 |
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} ) |
378 |
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} ) |
379 |
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} ) |
380 |
+ INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} ) |
381 |
+ |
382 |
+ IF (WIN32) |
383 |
+@@ -184,7 +185,7 @@ |
384 |
+ ${Boost_IOSTREAMS_LIBRARY} |
385 |
+ ${Boost_SYSTEM_LIBRARY} |
386 |
+ ${Tbb_TBB_LIBRARY} |
387 |
+- ${Ilmbase_HALF_LIBRARY} |
388 |
++ ${ILMBASE_LIBS_LDFLAGS} |
389 |
+ ${ZLIB_LIBRARY} |
390 |
+ ${BLOSC_blosc_LIBRARY} |
391 |
+ ) |
392 |
+@@ -192,7 +193,7 @@ |
393 |
+ ${Boost_IOSTREAMS_LIBRARY} |
394 |
+ ${Boost_SYSTEM_LIBRARY} |
395 |
+ ${Tbb_TBB_LIBRARY} |
396 |
+- ${Ilmbase_HALF_LIBRARY} |
397 |
++ ${ILMBASE_LIBS_LDFLAGS} |
398 |
+ ${ZLIB_LIBRARY} |
399 |
+ ${BLOSC_blosc_LIBRARY} |
400 |
+ ) |
401 |
+@@ -246,9 +247,8 @@ |
402 |
+ openvdb_shared |
403 |
+ ${CMAKE_THREAD_LIBS_INIT} |
404 |
+ ${BLOSC_blosc_LIBRARY} |
405 |
+- ${Openexr_ILMIMF_LIBRARY} |
406 |
+- ${Ilmbase_ILMTHREAD_LIBRARY} |
407 |
+- ${Ilmbase_IEX_LIBRARY} |
408 |
++ ${OPENEXR_LIBS_LDFLAGS} |
409 |
++ ${ILMBASE_LIBS_LDFLAGS} |
410 |
+ m |
411 |
+ stdc++ |
412 |
+ ) |
413 |
+diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt |
414 |
+--- a/openvdb/python/CMakeLists.txt 2018-08-28 12:20:33.000000000 +0100 |
415 |
++++ b/openvdb/python/CMakeLists.txt 2018-08-28 12:25:19.808755721 +0100 |
416 |
+@@ -9,8 +9,8 @@ |
417 |
+ IF ( NOT OPENVDB_BUILD_CORE ) |
418 |
+ FIND_PACKAGE ( OpenVDB REQUIRED ) |
419 |
+ |
420 |
+- FIND_PACKAGE ( ILMBase REQUIRED ) |
421 |
+- FIND_PACKAGE ( OpenEXR REQUIRED ) |
422 |
++ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase ) |
423 |
++ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR ) |
424 |
+ FIND_PACKAGE ( Blosc REQUIRED ) |
425 |
+ FIND_PACKAGE ( TBB REQUIRED ) |
426 |
+ FIND_PACKAGE ( ZLIB REQUIRED ) |
427 |
+@@ -29,8 +29,8 @@ |
428 |
+ SET ( OPENVDB_LIB openvdb_shared) |
429 |
+ ENDIF ( NOT OPENVDB_BUILD_CORE ) |
430 |
+ |
431 |
+-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} ) |
432 |
+-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} ) |
433 |
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} ) |
434 |
++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} ) |
435 |
+ INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} ) |
436 |
+ INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} ) |
437 |
+ INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} ) |
438 |
+@@ -91,7 +91,7 @@ |
439 |
+ ${GLEW_GLEW_LIBRARY} |
440 |
+ ${Boost_PYTHON_LIBRARY} |
441 |
+ ${PYTHON_LIBRARY} |
442 |
+- ${Ilmbase_HALF_LIBRARY} |
443 |
++ ${ILMBASE_LIBS_LDFLAGS} |
444 |
+ ) |
445 |
+ |
446 |
+ SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES |
447 |
|
448 |
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml |
449 |
index 71a04b9d558..b059b111063 100644 |
450 |
--- a/media-gfx/openvdb/metadata.xml |
451 |
+++ b/media-gfx/openvdb/metadata.xml |
452 |
@@ -9,10 +9,6 @@ |
453 |
<email>agrigo2001@×××××××××.au</email> |
454 |
<name>Adrian Grigo</name> |
455 |
</maintainer> |
456 |
- <maintainer type="project"> |
457 |
- <email>proxy-maint@g.o</email> |
458 |
- <name>Proxy Maintainers</name> |
459 |
- </maintainer> |
460 |
<longdescription> |
461 |
Libraries from Dreamworks Animation for the efficient manipulation |
462 |
of volumetric data used in big budget movies like 'Cloudy with a |
463 |
@@ -22,6 +18,9 @@ |
464 |
<flag restrict="<media-gfx/openvdb-5.0.0" name="abi3-compat"> |
465 |
Disables newer features to maintain compatibility with ABI3. Enabled by default. |
466 |
</flag> |
467 |
+ <flag restrict=">=media-gfx/openvdb-5.0.0" name="abi4-compat"> |
468 |
+ Disables newer features to maintain compatibility with ABI4. Enabled by default. |
469 |
+ </flag> |
470 |
</use> |
471 |
<upstream> |
472 |
<remote-id type="github">dreamworksanimation/openvdb</remote-id> |
473 |
|
474 |
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild |
475 |
new file mode 100644 |
476 |
index 00000000000..eb5d399b7a6 |
477 |
--- /dev/null |
478 |
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild |
479 |
@@ -0,0 +1,71 @@ |
480 |
+# Copyright 1999-2018 Gentoo Foundation |
481 |
+# Distributed under the terms of the GNU General Public License v2 |
482 |
+ |
483 |
+EAPI=6 |
484 |
+ |
485 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
486 |
+ |
487 |
+inherit cmake-utils flag-o-matic python-single-r1 |
488 |
+ |
489 |
+DESCRIPTION="Libs for the efficient manipulation of volumetric data" |
490 |
+HOMEPAGE="http://www.openvdb.org" |
491 |
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
492 |
+ |
493 |
+LICENSE="MPL-2.0" |
494 |
+SLOT="0" |
495 |
+KEYWORDS="~amd64 ~x86" |
496 |
+IUSE="+abi4-compat doc python test" |
497 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
498 |
+ |
499 |
+RDEPEND=" |
500 |
+ >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] |
501 |
+ >=dev-libs/c-blosc-1.5.0 |
502 |
+ dev-libs/jemalloc |
503 |
+ dev-libs/log4cplus |
504 |
+ media-libs/glfw:= |
505 |
+ media-libs/openexr:= |
506 |
+ sys-libs/zlib:= |
507 |
+ x11-libs/libXcursor |
508 |
+ x11-libs/libXi |
509 |
+ x11-libs/libXinerama |
510 |
+ x11-libs/libXrandr |
511 |
+ python? ( |
512 |
+ ${PYTHON_DEPS} |
513 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
514 |
+ )" |
515 |
+ |
516 |
+DEPEND="${RDEPEND} |
517 |
+ dev-cpp/tbb |
518 |
+ virtual/pkgconfig |
519 |
+ doc? ( app-doc/doxygen[latex] ) |
520 |
+ test? ( dev-util/cppunit )" |
521 |
+ |
522 |
+PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch" |
523 |
+ "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch" |
524 |
+) |
525 |
+ |
526 |
+pkg_setup() { |
527 |
+ use python && python-single-r1_pkg_setup |
528 |
+} |
529 |
+ |
530 |
+src_configure() { |
531 |
+ local myprefix="${EPREFIX}/usr/" |
532 |
+ |
533 |
+ local mycmakeargs=( |
534 |
+ -DBLOSC_LOCATION="${myprefix}" |
535 |
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
536 |
+ -DGLFW3_LOCATION="${myprefix}" |
537 |
+ -DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5) |
538 |
+ -DOPENVDB_BUILD_DOCS=$(usex doc) |
539 |
+ -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) |
540 |
+ -DOPENVDB_BUILD_UNITTESTS=$(usex test) |
541 |
+ -DOPENVDB_ENABLE_RPATH=OFF |
542 |
+ -DTBB_LOCATION="${myprefix}" |
543 |
+ -DUSE_GLFW3=ON |
544 |
+ ) |
545 |
+ |
546 |
+ use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) |
547 |
+ use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) |
548 |
+ |
549 |
+ cmake-utils_src_configure |
550 |
+} |