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