Gentoo Archives: gentoo-commits

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