1 |
commit: 3f46a67d297bf991e69daf558a55bf367d62f9e6 |
2 |
Author: Slawomir Lis <slis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 27 07:27:21 2016 +0000 |
4 |
Commit: Slawek Lis <slis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 27 07:27:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f46a67d |
7 |
|
8 |
sci-visualization/visit: version bump to 2.10.3 |
9 |
|
10 |
Reported-by: Andreas Schäfer <gentryx <AT> gmx.de> |
11 |
|
12 |
Package-Manager: portage-2.3.0_rc1 |
13 |
|
14 |
sci-visualization/visit/Manifest | 1 + |
15 |
.../visit/files/visit-2.10.3-cmakelist.patch | 10 ++ |
16 |
.../visit-2.10.3-dont_symlink_visit_dir.patch | 18 +++ |
17 |
.../visit/files/visit-2.10.3-findpython.patch | 19 +++ |
18 |
.../visit/files/visit-2.10.3-findsilo.patch | 12 ++ |
19 |
.../visit/files/visit-2.10.3-findvtk.patch | 29 +++++ |
20 |
.../visit/files/visit-2.10.3-vtklibs.patch | 133 +++++++++++++++++++++ |
21 |
.../visit/files/visit-2.10.3-vtkmpi.patch | 46 +++++++ |
22 |
sci-visualization/visit/visit-2.10.3.ebuild | 103 ++++++++++++++++ |
23 |
9 files changed, 371 insertions(+) |
24 |
|
25 |
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest |
26 |
index 2479dc6..620a03f 100644 |
27 |
--- a/sci-visualization/visit/Manifest |
28 |
+++ b/sci-visualization/visit/Manifest |
29 |
@@ -1,3 +1,4 @@ |
30 |
+DIST visit2.10.3.tar.gz 89181392 SHA256 05018215c4727eb42d47bb5cc4ff937b2a2ccaca90d141bc7fa426a0843a5dbc SHA512 f7e74191e4ac07da3a1323f1e60581c4a2f8ef439c23a26156e45d8ec2fb4f6decc5593ba4556209ad275ceeb6ffaaccc87d5d623e341771ab97e382cf406c59 WHIRLPOOL 948edb4113f4c5b16e231429c9decc8207d5e9502e0b4ecb47abacc8594187509899cce1e2ee04a4f7ff8e678f8ded047d6ffabe95d92eca493336a943112050 |
31 |
DIST visit2.7.3.tar.gz 82475238 SHA256 e4ed7b20c4c0fb5aac49181f8ddeae3d2d5a73b1662756ddcaa9d08776a7c39f SHA512 5eea2667482a9b70cf4794446da69595c1145839dfae0afdf961589a09b0f3ad41c44b607f96dbb3e4a3c1ba77161d77a1e0342d6a4e2df8bc73040110c7e8f1 WHIRLPOOL a1157d2424d93037e1ffd8dd10ebc47ae9f3d074a63a811bcadf6db5349dea348432e63d414d4a62a156c9423a1d5fdb240f34b2ec4262e8647def40d999759a |
32 |
DIST visit2.8.2.tar.gz 88008002 SHA256 43d652dde540e3a5db34a2105d89432fa1d018b104ed0508dfb18f4287a43eb3 SHA512 1c2c2b6cad49b32b5cbc7f7ffba5c6ffb98ee88dfeae5c51af5e581ad53fb1efb8fc222b796696e607abd4b748855141de072414bdec1b1ad4e7ac01a928db8d WHIRLPOOL dadfd48bf9522fc67547f2d7fc4332f300d06e3f04f1bd23189f4a6d806286b46420e4caecaba616bf9f954ea3e202efcee7e899d10444304f7f79809e8fc6d9 |
33 |
DIST visit2.9.0.tar.gz 87058013 SHA256 98d7a80d95f4083fffc23a65cff28abd126e2eb0fff43591663818aaa1338fcf SHA512 889a6ff6f0c45064c0705a8a41fd268ad865619e42eb7a3302a520bcb2a3c182a40bc6870ec80c0994fa649f3030f6283b9783fab37b938d4b77fd3c1ab10d15 WHIRLPOOL 8d6e9370fddda7d28c16882a04ac2c196b0c42ffd72436ca601413b7483c72d4b33691a9dc7340d71d536fead3d6692f1491c2bed32ed27ceba0c745b9555380 |
34 |
|
35 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch |
36 |
new file mode 100644 |
37 |
index 0000000..8c8618a |
38 |
--- /dev/null |
39 |
+++ b/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch |
40 |
@@ -0,0 +1,10 @@ |
41 |
+--- CMakeLists.txt.orig 2015-06-25 07:30:40.907149341 +0200 |
42 |
++++ CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200 |
43 |
+@@ -991,7 +991,6 @@ |
44 |
+ DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
45 |
+ GROUP_READ GROUP_WRITE GROUP_EXECUTE |
46 |
+ WORLD_READ WORLD_EXECUTE |
47 |
+- CONFIGURATIONS "" None Debug Release RelWithDebInfo MinSizeRel |
48 |
+ FILES_MATCHING PATTERN "*.h" |
49 |
+ PATTERN "*.hpp" |
50 |
+ PATTERN ".svn" EXCLUDE |
51 |
|
52 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch |
53 |
new file mode 100644 |
54 |
index 0000000..0953e5b |
55 |
--- /dev/null |
56 |
+++ b/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch |
57 |
@@ -0,0 +1,18 @@ |
58 |
+diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt |
59 |
+--- visit2.7.1.old2/src/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100 |
60 |
++++ visit2.7.1/src/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100 |
61 |
+@@ -807,14 +807,6 @@ |
62 |
+ \"${VISIT_VERSION}\" |
63 |
+ \"${CMAKE_INSTALL_PREFIX}/beta\") |
64 |
+ ") |
65 |
+- ELSE(VISIT_INSTALL_AS_BETA) |
66 |
+- INSTALL(CODE " |
67 |
+- MESSAGE(\"Symlinking current to ${VISIT_VERSION}\") |
68 |
+- EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX} |
69 |
+- COMMAND \${CMAKE_COMMAND} -E create_symlink |
70 |
+- \"${VISIT_VERSION}\" |
71 |
+- \"${CMAKE_INSTALL_PREFIX}/current\") |
72 |
+- ") |
73 |
+ ENDIF(VISIT_INSTALL_AS_BETA) |
74 |
+ ENDIF(WIN32) |
75 |
+ MARK_AS_ADVANCED( |
76 |
|
77 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-findpython.patch b/sci-visualization/visit/files/visit-2.10.3-findpython.patch |
78 |
new file mode 100644 |
79 |
index 0000000..180ffbf |
80 |
--- /dev/null |
81 |
+++ b/sci-visualization/visit/files/visit-2.10.3-findpython.patch |
82 |
@@ -0,0 +1,19 @@ |
83 |
+diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake |
84 |
+--- visit2.7.1.old/src/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200 |
85 |
++++ visit2.7.1.new/src/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100 |
86 |
+@@ -141,11 +141,12 @@ |
87 |
+ FIND_LIBRARY(PYTHON_LIBRARY |
88 |
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} |
89 |
+ PATHS |
90 |
+- ${PYTHON_DIR}/lib |
91 |
+- ${PYTHON_DIR}/libs |
92 |
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs |
93 |
++ ${PYTHON_DIR}/lib |
94 |
++ ${PYTHON_DIR}/lib64 |
95 |
++ ${PYTHON_DIR}/libs |
96 |
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs |
97 |
+ NO_DEFAULT_PATH |
98 |
+ NO_CMAKE_ENVIRONMENT_PATH |
99 |
+ NO_CMAKE_PATH |
100 |
+ NO_SYSTEM_ENVIRONMENT_PATH) |
101 |
+ |
102 |
|
103 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-findsilo.patch b/sci-visualization/visit/files/visit-2.10.3-findsilo.patch |
104 |
new file mode 100644 |
105 |
index 0000000..04d73c3 |
106 |
--- /dev/null |
107 |
+++ b/sci-visualization/visit/files/visit-2.10.3-findsilo.patch |
108 |
@@ -0,0 +1,12 @@ |
109 |
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake |
110 |
+--- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100 |
111 |
++++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100 |
112 |
+@@ -90,7 +90,7 @@ |
113 |
+ NO_CMAKE_PATH |
114 |
+ NO_SYSTEM_ENVIRONMENT_PATH) |
115 |
+ IF(SILOH5_LIBRARY_EXISTS) |
116 |
+- SET_UP_THIRD_PARTY(SILO lib include siloh5) |
117 |
++ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z) |
118 |
+ ELSE(SILOH5_LIBRARY_EXISTS) |
119 |
+ SET_UP_THIRD_PARTY(SILO lib include silo) |
120 |
+ ENDIF(SILOH5_LIBRARY_EXISTS) |
121 |
|
122 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-findvtk.patch b/sci-visualization/visit/files/visit-2.10.3-findvtk.patch |
123 |
new file mode 100644 |
124 |
index 0000000..2fec72e |
125 |
--- /dev/null |
126 |
+++ b/sci-visualization/visit/files/visit-2.10.3-findvtk.patch |
127 |
@@ -0,0 +1,29 @@ |
128 |
+--- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100 |
129 |
++++ visit2.8.2/src/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100 |
130 |
+@@ -234,15 +234,22 @@ |
131 |
+ |
132 |
+ # check for python wrappers |
133 |
+ IF (NOT WIN32) |
134 |
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/) |
135 |
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/) |
136 |
+ ELSE (NOT WIN32) |
137 |
+ IF(${VTK_VERSION} VERSION_LESS "6.1.0") |
138 |
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib) |
139 |
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib) |
140 |
+ ELSE() |
141 |
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*) |
142 |
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*) |
143 |
+ ENDIF() |
144 |
+ ENDIF (NOT WIN32) |
145 |
+-MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}") |
146 |
++MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}") |
147 |
++ |
148 |
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES}) |
149 |
++ IF(EXISTS "${X}/site-packages/vtk") |
150 |
++ SET(VTK_PY_WRAPPERS_DIR "${X}") |
151 |
++ ENDIF() |
152 |
++ENDFOREACH(X) |
153 |
++ |
154 |
+ |
155 |
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk) |
156 |
+ MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}") |
157 |
|
158 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch |
159 |
new file mode 100644 |
160 |
index 0000000..a6b4709 |
161 |
--- /dev/null |
162 |
+++ b/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch |
163 |
@@ -0,0 +1,133 @@ |
164 |
+diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt |
165 |
+--- visit2.8.2-old/src/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200 |
166 |
++++ visit2.8.2-new/src/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100 |
167 |
+@@ -188,8 +188,8 @@ |
168 |
+ ${engine_ser_exe_EPlot_ser} |
169 |
+ engine_ser |
170 |
+ visit_verdict |
171 |
+- vtkjpeg |
172 |
+- vtkpng |
173 |
++ jpeg |
174 |
++ png |
175 |
+ ${VTKZLIB_LIB} |
176 |
+ ${VTK_FREETYPE_LIBRARIES} |
177 |
+ vtkftgl |
178 |
+@@ -273,8 +273,8 @@ |
179 |
+ ${engine_par_exe_EPlot_par} |
180 |
+ engine_par |
181 |
+ visit_verdict |
182 |
+- vtkjpeg |
183 |
+- vtkpng |
184 |
++ jpeg |
185 |
++ png |
186 |
+ ${VTKZLIB_LIB} |
187 |
+ ${VTK_FREETYPE_LIBRARIES} |
188 |
+ vtkftgl |
189 |
+diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt |
190 |
+--- visit2.8.2-old/src/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200 |
191 |
++++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100 |
192 |
+@@ -119,10 +119,10 @@ |
193 |
+ visit_verdict |
194 |
+ vtkCommonCore |
195 |
+ vtkIOCore |
196 |
+- vtktiff |
197 |
++ tiff |
198 |
+ ${VTKZLIB_LIB} |
199 |
+- vtkpng |
200 |
+- vtkjpeg |
201 |
++ png |
202 |
++ jpeg |
203 |
+ ${ZLIB_LIB} |
204 |
+ ${CMAKE_THREAD_LIBS} |
205 |
+ ${DL_LIB} |
206 |
+diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt |
207 |
+--- visit2.8.2-old/src/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200 |
208 |
++++ visit2.8.2-new/src/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100 |
209 |
+@@ -105,8 +105,8 @@ |
210 |
+ ) |
211 |
+ |
212 |
+ SET(VTK_EXTRA_LIBS |
213 |
+-vtkjpeg |
214 |
+-vtkpng |
215 |
++jpeg |
216 |
++png |
217 |
+ ${VTKZLIB_LIB} |
218 |
+ ${VTK_FREETYPE_LIBRARIES} |
219 |
+ vtkftgl |
220 |
+diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt |
221 |
+--- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200 |
222 |
++++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100 |
223 |
+@@ -70,9 +70,9 @@ |
224 |
+ ) |
225 |
+ |
226 |
+ SET(VTK_EXTRA_LIBS |
227 |
+-vtktiff |
228 |
+-vtkjpeg |
229 |
+-vtkpng |
230 |
++tiff |
231 |
++jpeg |
232 |
++png |
233 |
+ ${VTKZLIB_LIB} |
234 |
+ ${VTK_FREETYPE_LIBRARIES} |
235 |
+ vtkftgl |
236 |
+diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt |
237 |
+--- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 |
238 |
++++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100 |
239 |
+@@ -104,9 +104,9 @@ |
240 |
+ ) |
241 |
+ |
242 |
+ SET(VTK_EXTRA_LIBS |
243 |
+-vtktiff |
244 |
+-vtkjpeg |
245 |
+-vtkpng |
246 |
++tiff |
247 |
++jpeg |
248 |
++png |
249 |
+ ${VTKZLIB_LIB} |
250 |
+ ${VTK_FREETYPE_LIBRARIES} |
251 |
+ vtkftgl |
252 |
+diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt |
253 |
+--- visit2.8.2-old/src/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200 |
254 |
++++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100 |
255 |
+@@ -76,9 +76,9 @@ |
256 |
+ ) |
257 |
+ |
258 |
+ SET(VTK_EXTRA_LIBS |
259 |
+-vtktiff |
260 |
+-vtkjpeg |
261 |
+-vtkpng |
262 |
++tiff |
263 |
++jpeg |
264 |
++png |
265 |
+ ${VTKZLIB_LIB} |
266 |
+ ${VTK_FREETYPE_LIBRARIES} |
267 |
+ vtkftgl |
268 |
+diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt |
269 |
+--- visit2.8.2-old/src/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200 |
270 |
++++ visit2.8.2-new/src/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100 |
271 |
+@@ -279,8 +279,8 @@ |
272 |
+ ${viewer_exe_IPlot} |
273 |
+ ${viewer_exe_VPlot} |
274 |
+ viewer |
275 |
+- vtkpng |
276 |
+- vtkjpeg |
277 |
++ png |
278 |
++ jpeg |
279 |
+ ${VTKZLIB_LIB} |
280 |
+ ${VTK_FREETYPE_LIBRARIES} |
281 |
+ vtkftgl |
282 |
+diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt |
283 |
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200 |
284 |
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100 |
285 |
+@@ -125,9 +125,9 @@ |
286 |
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) |
287 |
+ |
288 |
+ IF(HAVE_LIB_R) |
289 |
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR) |
290 |
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
291 |
+ ELSE(HAVE_LIB_R) |
292 |
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff) |
293 |
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
294 |
+ ENDIF(HAVE_LIB_R) |
295 |
+ # Add vtk definitions |
296 |
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}") |
297 |
|
298 |
diff --git a/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch |
299 |
new file mode 100644 |
300 |
index 0000000..40aa7b8 |
301 |
--- /dev/null |
302 |
+++ b/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch |
303 |
@@ -0,0 +1,46 @@ |
304 |
+diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt |
305 |
+--- visit2.8.2-old/src/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 |
306 |
++++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100 |
307 |
+@@ -54,9 +54,9 @@ |
308 |
+ # Specify the libraries to link against |
309 |
+ TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy) |
310 |
+ IF(HAVE_LIB_R) |
311 |
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage) |
312 |
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage) |
313 |
+ ELSE(HAVE_LIB_R) |
314 |
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage) |
315 |
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage) |
316 |
+ ENDIF(HAVE_LIB_R) |
317 |
+ # add vtk definitions |
318 |
+ ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}") |
319 |
+diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt |
320 |
+--- visit2.8.2-old/src/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200 |
321 |
++++ visit2.8.2-new/src/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100 |
322 |
+@@ -64,9 +64,9 @@ |
323 |
+ |
324 |
+ # Specify the libraries to link against on Windows & Mac |
325 |
+ IF(HAVE_LIB_R) |
326 |
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR) |
327 |
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR) |
328 |
+ ELSE(HAVE_LIB_R) |
329 |
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) |
330 |
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) |
331 |
+ ENDIF(HAVE_LIB_R) |
332 |
+ # Add vtk definitions |
333 |
+ ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}") |
334 |
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100 |
335 |
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100 |
336 |
+@@ -125,9 +125,11 @@ |
337 |
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) |
338 |
+ |
339 |
+ IF(HAVE_LIB_R) |
340 |
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
341 |
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction |
342 |
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
343 |
+ ELSE(HAVE_LIB_R) |
344 |
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
345 |
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction |
346 |
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
347 |
+ ENDIF(HAVE_LIB_R) |
348 |
+ # Add vtk definitions |
349 |
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}") |
350 |
|
351 |
diff --git a/sci-visualization/visit/visit-2.10.3.ebuild b/sci-visualization/visit/visit-2.10.3.ebuild |
352 |
new file mode 100644 |
353 |
index 0000000..26ca18b |
354 |
--- /dev/null |
355 |
+++ b/sci-visualization/visit/visit-2.10.3.ebuild |
356 |
@@ -0,0 +1,103 @@ |
357 |
+# Copyright 1999-2016 Gentoo Foundation |
358 |
+# Distributed under the terms of the GNU General Public License v2 |
359 |
+# $Id$ |
360 |
+ |
361 |
+EAPI=5 |
362 |
+PYTHON_COMPAT=( python2_7 ) |
363 |
+ |
364 |
+inherit cmake-utils python-single-r1 |
365 |
+ |
366 |
+DESCRIPTION="A software that delivers parallel interactive visualizations" |
367 |
+HOMEPAGE="https://wci.llnl.gov/codes/visit/home.html" |
368 |
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz" |
369 |
+ |
370 |
+LICENSE="BSD" |
371 |
+SLOT="0" |
372 |
+KEYWORDS="~amd64 ~x86" |
373 |
+IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads" |
374 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
375 |
+ |
376 |
+RDEPEND=" |
377 |
+ ${PYTHON_DEPS} |
378 |
+ tcmalloc? ( dev-util/google-perftools ) |
379 |
+ cgns? ( sci-libs/cgnslib ) |
380 |
+ hdf5? ( sci-libs/hdf5 ) |
381 |
+ netcdf? ( sci-libs/netcdf ) |
382 |
+ silo? ( sci-libs/silo ) |
383 |
+ >=sci-libs/vtk-6.0.0[imaging,mpi=,python,rendering,qt4,${PYTHON_USEDEP}] |
384 |
+ sys-libs/zlib" |
385 |
+DEPEND="${RDEPEND}" |
386 |
+ |
387 |
+S="${WORKDIR}/${PN}${PV}/src" |
388 |
+PATCHES=( |
389 |
+ "${FILESDIR}/${P}-findpython.patch" |
390 |
+ "${FILESDIR}/${P}-findsilo.patch" |
391 |
+ "${FILESDIR}/${P}-findvtk.patch" |
392 |
+ "${FILESDIR}/${P}-vtklibs.patch" |
393 |
+ "${FILESDIR}/${P}-dont_symlink_visit_dir.patch" |
394 |
+ "${FILESDIR}/${P}-cmakelist.patch" |
395 |
+) |
396 |
+ |
397 |
+src_prepare() { |
398 |
+ for p in ${PATCHES[@]} ; do |
399 |
+ epatch "${p}" |
400 |
+ done |
401 |
+ if use mpi ; then |
402 |
+ epatch "${FILESDIR}/${P}-vtkmpi.patch" |
403 |
+ fi |
404 |
+ |
405 |
+ sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher" |
406 |
+} |
407 |
+ |
408 |
+src_configure() { |
409 |
+ local mycmakeargs=( |
410 |
+ -DCMAKE_INSTALL_PREFIX=/opt/visit |
411 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
412 |
+ -DPYTHON_DIR="${EPREFIX}/usr" |
413 |
+ -DVISIT_PYTHON_SKIP_INSTALL=true |
414 |
+ -DVISIT_VTK_SKIP_INSTALL=true |
415 |
+ -DQT_BIN="${EPREFIX}/usr/bin" |
416 |
+ -DVISIT_ZLIB_DIR="${EPREFIX}/usr" |
417 |
+ -DVISIT_HEADERS_SKIP_INSTALL=false |
418 |
+ $(cmake-utils_use threads VISIT_THREAD) |
419 |
+ ) |
420 |
+ if use hdf5; then |
421 |
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" ) |
422 |
+ fi |
423 |
+ if use tcmalloc; then |
424 |
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" ) |
425 |
+ fi |
426 |
+ if use cgns; then |
427 |
+ mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" ) |
428 |
+ fi |
429 |
+ if use silo; then |
430 |
+ mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" ) |
431 |
+ fi |
432 |
+ if use netcdf; then |
433 |
+ mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" ) |
434 |
+ fi |
435 |
+ |
436 |
+ cmake-utils_src_configure |
437 |
+} |
438 |
+ |
439 |
+src_install() { |
440 |
+ cmake-utils_src_install |
441 |
+ |
442 |
+ PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages" |
443 |
+ cd "${ED}${PACKAGES_DIR}" |
444 |
+ for i in *; do |
445 |
+ dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i" |
446 |
+ done |
447 |
+ |
448 |
+ cat > "${T}"/99visit <<- EOF |
449 |
+ PATH=${EPREFIX}/opt/${PN}/bin |
450 |
+ LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/ |
451 |
+ EOF |
452 |
+ doenvd "${T}"/99visit |
453 |
+} |
454 |
+ |
455 |
+pkg_postinst () { |
456 |
+ ewarn "Remember to run " |
457 |
+ ewarn "env-update && source /etc/profile" |
458 |
+ ewarn "if you want to use visit in already opened session" |
459 |
+} |