1 |
commit: 96b0c167e73c6230e4e77336b9e8bb602a8c5c04 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 20 06:53:39 2015 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 20 06:56:20 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b0c167 |
7 |
|
8 |
Revert "sci-visualization/paraview: Only keep version 4.3.1" |
9 |
|
10 |
This reverts commit 781fdf38053da604fcb269c354ad3cd86bd0e0ec. |
11 |
|
12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
13 |
|
14 |
sci-visualization/paraview/Manifest | 2 + |
15 |
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 +++ |
16 |
.../files/paraview-4.0.1-removesqlite.patch | 517 +++++++++++++++++++++ |
17 |
.../files/paraview-4.0.1-vtk-cg-path.patch | 36 ++ |
18 |
.../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 ++++ |
19 |
.../files/paraview-4.1.0-glxext-legacy.patch | 9 + |
20 |
.../files/paraview-4.1.0-vtk-freetype.patch | 22 + |
21 |
.../paraview/paraview-4.1.0-r2.ebuild | 302 ++++++++++++ |
22 |
.../paraview/paraview-4.2.0-r1.ebuild | 300 ++++++++++++ |
23 |
9 files changed, 1339 insertions(+) |
24 |
|
25 |
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest |
26 |
index 011c260..4b660f9 100644 |
27 |
--- a/sci-visualization/paraview/Manifest |
28 |
+++ b/sci-visualization/paraview/Manifest |
29 |
@@ -1,2 +1,4 @@ |
30 |
+DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96 |
31 |
+DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7 |
32 |
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0 |
33 |
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b |
34 |
|
35 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch |
36 |
new file mode 100644 |
37 |
index 0000000..6a09a1a |
38 |
--- /dev/null |
39 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch |
40 |
@@ -0,0 +1,72 @@ |
41 |
+http://paraview.org/Bug/view.php?id=13656 |
42 |
+ |
43 |
+diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt |
44 |
+--- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 |
45 |
++++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-13 15:17:53.980027098 -0700 |
46 |
+@@ -81,16 +81,24 @@ |
47 |
+ #------------------------------------------------------------------------------ |
48 |
+ # Generate the protbuf message file. |
49 |
+ #------------------------------------------------------------------------------ |
50 |
+-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) |
51 |
++if (VTK_USE_SYSTEM_PROTOBUF) |
52 |
++ set (_PROTOC_COMPILER protoc) |
53 |
++ set (_PROTOC_DEPEND "") |
54 |
++else() |
55 |
++ set (_PROTOC_COMPILER protoc_compiler) |
56 |
++ set (_PROTOC_DEPEND ${_PROTOC_COMPILER}) |
57 |
++endif() |
58 |
++ |
59 |
++get_target_property(PROTOC_LOCATION ${_PROTOC_COMPILER} LOCATION) |
60 |
+ add_custom_command( |
61 |
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h |
62 |
+ ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc |
63 |
+ |
64 |
+- COMMAND protoc_compiler |
65 |
++ COMMAND ${_PROTOC_COMPILER} |
66 |
+ "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}" |
67 |
+ --proto_path "@CMAKE_CURRENT_SOURCE_DIR@" |
68 |
+ "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto" |
69 |
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler |
70 |
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto ${_PROTOC_DEPEND} |
71 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
72 |
+ ) |
73 |
+ |
74 |
+@@ -109,5 +117,9 @@ |
75 |
+ vtk_module_library(vtkPVServerImplementationCore |
76 |
+ ${Module_SRCS}) |
77 |
+ |
78 |
++if (VTK_USE_SYSTEM_PROTOBUF) |
79 |
++ target_link_libraries(vtkPVServerImplementationCore ${CMAKE_THREAD_LIBS_INIT}) |
80 |
++endif() |
81 |
++ |
82 |
+ add_dependencies(vtkPVServerImplementationCore |
83 |
+ protobuf_code_generation) |
84 |
+diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt |
85 |
+--- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 |
86 |
++++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-13 15:09:31.526673020 -0700 |
87 |
+@@ -34,7 +34,7 @@ |
88 |
+ set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR}) |
89 |
+ set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME}) |
90 |
+ |
91 |
+-vtk_module_third_party(protobuf |
92 |
++vtk_module_third_party(Protobuf |
93 |
+ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src |
94 |
+ LIBRARIES protobuf |
95 |
+ ) |
96 |
+@@ -42,10 +42,12 @@ |
97 |
+ # protobuf exports it's build-dir targets to a custom file |
98 |
+ # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export |
99 |
+ # build-dir targets ourselves. |
100 |
+-vtk_target_export(protobuf) |
101 |
+-vtk_target_export(protobuf-lite) |
102 |
+-if (NOT CMAKE_CROSSCOMPILING) |
103 |
+- vtk_compile_tools_target_export(protoc_compiler) |
104 |
++if (NOT VTK_USE_SYSTEM_PROTOBUF) |
105 |
++ vtk_target_export(protobuf) |
106 |
++ vtk_target_export(protobuf-lite) |
107 |
++ if (NOT CMAKE_CROSSCOMPILING) |
108 |
++ vtk_compile_tools_target_export(protoc_compiler) |
109 |
++ endif() |
110 |
+ endif() |
111 |
+ |
112 |
+ # All these exports don't add any install rules. However we make protobuf itself |
113 |
|
114 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
115 |
new file mode 100644 |
116 |
index 0000000..be495b4 |
117 |
--- /dev/null |
118 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
119 |
@@ -0,0 +1,517 @@ |
120 |
+Description: Import patch from VTK to remove sqlite |
121 |
+Author: Mathieu Malaterre <mathieu.malaterre@×××××.com> |
122 |
+Last-Update: Mon Feb 11 14:58:03 UTC 2013 |
123 |
+ |
124 |
+remove the internal copy of sqlite (vtksqlite) |
125 |
+http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch |
126 |
+ |
127 |
+--- VTK/IO/SQL/vtkSQLiteDatabase.cxx |
128 |
++++ VTK/IO/SQL/vtkSQLiteDatabase.cxx |
129 |
+@@ -29,7 +29,7 @@ |
130 |
+ #include <vtksys/ios/fstream> |
131 |
+ #include <vtksys/ios/sstream> |
132 |
+ |
133 |
+-#include <vtksqlite/vtk_sqlite3.h> |
134 |
++#include <sqlite3.h> |
135 |
+ |
136 |
+ vtkStandardNewMacro(vtkSQLiteDatabase); |
137 |
+ |
138 |
+@@ -307,15 +307,15 @@ |
139 |
+ } |
140 |
+ } |
141 |
+ |
142 |
+- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
143 |
++ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
144 |
+ |
145 |
+- if (result != VTK_SQLITE_OK) |
146 |
++ if (result != SQLITE_OK) |
147 |
+ { |
148 |
+ vtkDebugMacro(<<"SQLite open() failed. Error code is " |
149 |
+ << result << " and message is " |
150 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
151 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
152 |
+ |
153 |
+- vtk_sqlite3_close(this->SQLiteInstance); |
154 |
++ sqlite3_close(this->SQLiteInstance); |
155 |
+ return false; |
156 |
+ } |
157 |
+ else |
158 |
+@@ -334,8 +334,8 @@ |
159 |
+ } |
160 |
+ else |
161 |
+ { |
162 |
+- int result = vtk_sqlite3_close(this->SQLiteInstance); |
163 |
+- if (result != VTK_SQLITE_OK) |
164 |
++ int result = sqlite3_close(this->SQLiteInstance); |
165 |
++ if (result != SQLITE_OK) |
166 |
+ { |
167 |
+ vtkWarningMacro(<< "Close(): SQLite returned result code " << result); |
168 |
+ } |
169 |
+@@ -374,7 +374,7 @@ |
170 |
+ if (!status) |
171 |
+ { |
172 |
+ vtkErrorMacro(<< "GetTables(): Database returned error: " |
173 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
174 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
175 |
+ query->Delete(); |
176 |
+ return this->Tables; |
177 |
+ } |
178 |
+@@ -403,7 +403,7 @@ |
179 |
+ if (!status) |
180 |
+ { |
181 |
+ vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " |
182 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
183 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
184 |
+ query->Delete(); |
185 |
+ return NULL; |
186 |
+ } |
187 |
+@@ -467,10 +467,10 @@ |
188 |
+ // ---------------------------------------------------------------------- |
189 |
+ bool vtkSQLiteDatabase::HasError() |
190 |
+ { |
191 |
+- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); |
192 |
++ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); |
193 |
+ } |
194 |
+ |
195 |
+ const char* vtkSQLiteDatabase::GetLastErrorText() |
196 |
+ { |
197 |
+- return vtk_sqlite3_errmsg(this->SQLiteInstance); |
198 |
++ return sqlite3_errmsg(this->SQLiteInstance); |
199 |
+ } |
200 |
+--- VTK/IO/SQL/vtkSQLiteQuery.cxx |
201 |
++++ VTK/IO/SQL/vtkSQLiteQuery.cxx |
202 |
+@@ -25,7 +25,7 @@ |
203 |
+ #include "vtkVariant.h" |
204 |
+ #include "vtkVariantArray.h" |
205 |
+ |
206 |
+-#include <vtksqlite/vtk_sqlite3.h> |
207 |
++#include <sqlite3.h> |
208 |
+ |
209 |
+ #include <assert.h> |
210 |
+ |
211 |
+@@ -43,7 +43,7 @@ |
212 |
+ { |
213 |
+ this->Statement = NULL; |
214 |
+ this->InitialFetch = true; |
215 |
+- this->InitialFetchResult=VTK_SQLITE_DONE; |
216 |
++ this->InitialFetchResult=SQLITE_DONE; |
217 |
+ this->LastErrorText = NULL; |
218 |
+ this->TransactionInProgress = false; |
219 |
+ } |
220 |
+@@ -61,7 +61,7 @@ |
221 |
+ { |
222 |
+ if (this->Database != NULL) |
223 |
+ { |
224 |
+- vtk_sqlite3_finalize(this->Statement); |
225 |
++ sqlite3_finalize(this->Statement); |
226 |
+ this->Statement = NULL; |
227 |
+ } |
228 |
+ } |
229 |
+@@ -131,8 +131,8 @@ |
230 |
+ if (this->Statement) |
231 |
+ { |
232 |
+ vtkDebugMacro(<<"Finalizing old statement"); |
233 |
+- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); |
234 |
+- if (finalizeStatus != VTK_SQLITE_OK) |
235 |
++ int finalizeStatus = sqlite3_finalize(this->Statement); |
236 |
++ if (finalizeStatus != SQLITE_OK) |
237 |
+ { |
238 |
+ vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " |
239 |
+ << finalizeStatus); |
240 |
+@@ -151,19 +151,19 @@ |
241 |
+ return false; |
242 |
+ } |
243 |
+ |
244 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
245 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
246 |
+ const char *unused_statement; |
247 |
+ |
248 |
+- int prepareStatus = vtk_sqlite3_prepare_v2(db, |
249 |
++ int prepareStatus = sqlite3_prepare_v2(db, |
250 |
+ this->Query, |
251 |
+ static_cast<int>(strlen(this->Query)), |
252 |
+ &this->Statement, |
253 |
+ &unused_statement); |
254 |
+ |
255 |
+- if (prepareStatus != VTK_SQLITE_OK) |
256 |
++ if (prepareStatus != SQLITE_OK) |
257 |
+ { |
258 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
259 |
+- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " |
260 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
261 |
++ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " |
262 |
+ << this->GetLastErrorText() |
263 |
+ << " on statement: '" |
264 |
+ << this->Query << "'"); |
265 |
+@@ -194,31 +194,31 @@ |
266 |
+ } |
267 |
+ else |
268 |
+ { |
269 |
+- vtk_sqlite3_reset(this->Statement); |
270 |
++ sqlite3_reset(this->Statement); |
271 |
+ } |
272 |
+ |
273 |
+ vtkDebugMacro(<<"Execute(): Query ready to execute."); |
274 |
+ |
275 |
+ this->InitialFetch = true; |
276 |
+- int result = vtk_sqlite3_step(this->Statement); |
277 |
++ int result = sqlite3_step(this->Statement); |
278 |
+ this->InitialFetchResult = result; |
279 |
+ |
280 |
+- if (result == VTK_SQLITE_DONE) |
281 |
++ if (result == SQLITE_DONE) |
282 |
+ { |
283 |
+ this->SetLastErrorText(NULL); |
284 |
+ this->Active = true; |
285 |
+ return true; |
286 |
+ } |
287 |
+- else if (result != VTK_SQLITE_ROW) |
288 |
++ else if (result != SQLITE_ROW) |
289 |
+ { |
290 |
+ vtkSQLiteDatabase *dbContainer = |
291 |
+ vtkSQLiteDatabase::SafeDownCast(this->Database); |
292 |
+ assert(dbContainer != NULL); |
293 |
+ |
294 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
295 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
296 |
+ |
297 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
298 |
+- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " |
299 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
300 |
++ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " |
301 |
+ << this->GetLastErrorText()); |
302 |
+ this->Active = false; |
303 |
+ return false; |
304 |
+@@ -239,7 +239,7 @@ |
305 |
+ } |
306 |
+ else |
307 |
+ { |
308 |
+- return vtk_sqlite3_column_count(this->Statement); |
309 |
++ return sqlite3_column_count(this->Statement); |
310 |
+ } |
311 |
+ } |
312 |
+ |
313 |
+@@ -259,7 +259,7 @@ |
314 |
+ } |
315 |
+ else |
316 |
+ { |
317 |
+- return vtk_sqlite3_column_name(this->Statement, column); |
318 |
++ return sqlite3_column_name(this->Statement, column); |
319 |
+ } |
320 |
+ } |
321 |
+ |
322 |
+@@ -279,22 +279,22 @@ |
323 |
+ } |
324 |
+ else |
325 |
+ { |
326 |
+- switch (vtk_sqlite3_column_type(this->Statement, column)) |
327 |
++ switch (sqlite3_column_type(this->Statement, column)) |
328 |
+ { |
329 |
+- case VTK_SQLITE_INTEGER: |
330 |
++ case SQLITE_INTEGER: |
331 |
+ return VTK_INT; |
332 |
+- case VTK_SQLITE_FLOAT: |
333 |
++ case SQLITE_FLOAT: |
334 |
+ return VTK_FLOAT; |
335 |
+- case VTK_SQLITE_TEXT: |
336 |
++ case SQLITE_TEXT: |
337 |
+ return VTK_STRING; |
338 |
+- case VTK_SQLITE_BLOB: |
339 |
++ case SQLITE_BLOB: |
340 |
+ return VTK_STRING; // until we have a BLOB type of our own |
341 |
+- case VTK_SQLITE_NULL: |
342 |
++ case SQLITE_NULL: |
343 |
+ return VTK_VOID; // ??? what makes sense here? |
344 |
+ default: |
345 |
+ { |
346 |
+ vtkErrorMacro(<<"GetFieldType(): Unknown data type " |
347 |
+- << vtk_sqlite3_column_type(this->Statement, column) |
348 |
++ << sqlite3_column_type(this->Statement, column) |
349 |
+ <<" from SQLite."); |
350 |
+ return VTK_VOID; |
351 |
+ } |
352 |
+@@ -315,7 +315,7 @@ |
353 |
+ { |
354 |
+ vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); |
355 |
+ this->InitialFetch = false; |
356 |
+- if (this->InitialFetchResult == VTK_SQLITE_DONE) |
357 |
++ if (this->InitialFetchResult == SQLITE_DONE) |
358 |
+ { |
359 |
+ return false; |
360 |
+ } |
361 |
+@@ -326,12 +326,12 @@ |
362 |
+ } |
363 |
+ else |
364 |
+ { |
365 |
+- int result = vtk_sqlite3_step(this->Statement); |
366 |
+- if (result == VTK_SQLITE_DONE) |
367 |
++ int result = sqlite3_step(this->Statement); |
368 |
++ if (result == SQLITE_DONE) |
369 |
+ { |
370 |
+ return false; |
371 |
+ } |
372 |
+- else if (result == VTK_SQLITE_ROW) |
373 |
++ else if (result == SQLITE_ROW) |
374 |
+ { |
375 |
+ return true; |
376 |
+ } |
377 |
+@@ -339,8 +339,8 @@ |
378 |
+ { |
379 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
380 |
+ assert(dbContainer != NULL); |
381 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
382 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
383 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
384 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
385 |
+ vtkErrorMacro(<<"NextRow(): Database returned error code " |
386 |
+ << result << " with the following message: " |
387 |
+ << this->GetLastErrorText()); |
388 |
+@@ -366,33 +366,33 @@ |
389 |
+ } |
390 |
+ else |
391 |
+ { |
392 |
+- switch (vtk_sqlite3_column_type(this->Statement, column)) |
393 |
++ switch (sqlite3_column_type(this->Statement, column)) |
394 |
+ { |
395 |
+- case VTK_SQLITE_INTEGER: |
396 |
+- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); |
397 |
++ case SQLITE_INTEGER: |
398 |
++ return vtkVariant(sqlite3_column_int(this->Statement, column)); |
399 |
+ |
400 |
+- case VTK_SQLITE_FLOAT: |
401 |
+- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); |
402 |
++ case SQLITE_FLOAT: |
403 |
++ return vtkVariant(sqlite3_column_double(this->Statement, column)); |
404 |
+ |
405 |
+- case VTK_SQLITE_TEXT: |
406 |
++ case SQLITE_TEXT: |
407 |
+ { |
408 |
+ vtksys_ios::ostringstream str; |
409 |
+- str << vtk_sqlite3_column_text(this->Statement, column); |
410 |
++ str << sqlite3_column_text(this->Statement, column); |
411 |
+ return vtkVariant(vtkStdString(str.str())); |
412 |
+ } |
413 |
+ |
414 |
+- case VTK_SQLITE_BLOB: |
415 |
++ case SQLITE_BLOB: |
416 |
+ { |
417 |
+ // This is a hack ... by passing the BLOB to vtkStdString with an explicit |
418 |
+ // byte count, we ensure that the string will store all of the BLOB's bytes, |
419 |
+ // even if there are NULL values. |
420 |
+ |
421 |
+ return vtkVariant(vtkStdString( |
422 |
+- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), |
423 |
+- vtk_sqlite3_column_bytes(this->Statement, column))); |
424 |
++ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), |
425 |
++ sqlite3_column_bytes(this->Statement, column))); |
426 |
+ } |
427 |
+ |
428 |
+- case VTK_SQLITE_NULL: |
429 |
++ case SQLITE_NULL: |
430 |
+ default: |
431 |
+ return vtkVariant(); |
432 |
+ } |
433 |
+@@ -423,11 +423,11 @@ |
434 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
435 |
+ assert(dbContainer != NULL); |
436 |
+ |
437 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
438 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
439 |
+ char *errorMessage = NULL; |
440 |
+- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
441 |
++ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
442 |
+ |
443 |
+- if (result == VTK_SQLITE_OK) |
444 |
++ if (result == SQLITE_OK) |
445 |
+ { |
446 |
+ this->TransactionInProgress = true; |
447 |
+ this->SetLastErrorText(NULL); |
448 |
+@@ -451,7 +451,7 @@ |
449 |
+ { |
450 |
+ if (this->Statement) |
451 |
+ { |
452 |
+- vtk_sqlite3_finalize(this->Statement); |
453 |
++ sqlite3_finalize(this->Statement); |
454 |
+ this->Statement = NULL; |
455 |
+ } |
456 |
+ |
457 |
+@@ -463,11 +463,11 @@ |
458 |
+ |
459 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
460 |
+ assert(dbContainer != NULL); |
461 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
462 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
463 |
+ char *errorMessage = NULL; |
464 |
+- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
465 |
++ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
466 |
+ |
467 |
+- if (result == VTK_SQLITE_OK) |
468 |
++ if (result == SQLITE_OK) |
469 |
+ { |
470 |
+ this->TransactionInProgress = false; |
471 |
+ this->SetLastErrorText(NULL); |
472 |
+@@ -499,11 +499,11 @@ |
473 |
+ |
474 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
475 |
+ assert(dbContainer != NULL); |
476 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
477 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
478 |
+ char *errorMessage = NULL; |
479 |
+- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
480 |
++ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
481 |
+ |
482 |
+- if (result == VTK_SQLITE_OK) |
483 |
++ if (result == SQLITE_OK) |
484 |
+ { |
485 |
+ this->TransactionInProgress = false; |
486 |
+ this->SetLastErrorText(NULL); |
487 |
+@@ -647,11 +647,11 @@ |
488 |
+ if (this->Active) |
489 |
+ { |
490 |
+ this->Active = false; |
491 |
+- vtk_sqlite3_reset(this->Statement); |
492 |
++ sqlite3_reset(this->Statement); |
493 |
+ } |
494 |
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); |
495 |
++ int status = sqlite3_bind_int(this->Statement, index+1, value); |
496 |
+ |
497 |
+- if (status != VTK_SQLITE_OK) |
498 |
++ if (status != SQLITE_OK) |
499 |
+ { |
500 |
+ vtksys_ios::ostringstream errormessage; |
501 |
+ errormessage << "sqlite_bind_int returned error: " << status; |
502 |
+@@ -676,11 +676,11 @@ |
503 |
+ if (this->Active) |
504 |
+ { |
505 |
+ this->Active = false; |
506 |
+- vtk_sqlite3_reset(this->Statement); |
507 |
++ sqlite3_reset(this->Statement); |
508 |
+ } |
509 |
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); |
510 |
++ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); |
511 |
+ |
512 |
+- if (status != VTK_SQLITE_OK) |
513 |
++ if (status != SQLITE_OK) |
514 |
+ { |
515 |
+ vtksys_ios::ostringstream errormessage; |
516 |
+ errormessage << "sqlite_bind_int64 returned error: " << status; |
517 |
+@@ -705,12 +705,12 @@ |
518 |
+ if (this->Active) |
519 |
+ { |
520 |
+ this->Active = false; |
521 |
+- vtk_sqlite3_reset(this->Statement); |
522 |
++ sqlite3_reset(this->Statement); |
523 |
+ } |
524 |
+ |
525 |
+- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); |
526 |
++ int status = sqlite3_bind_double(this->Statement, index+1, value); |
527 |
+ |
528 |
+- if (status != VTK_SQLITE_OK) |
529 |
++ if (status != SQLITE_OK) |
530 |
+ { |
531 |
+ vtksys_ios::ostringstream errormessage; |
532 |
+ errormessage << "sqlite_bind_double returned error: " << status; |
533 |
+@@ -734,12 +734,12 @@ |
534 |
+ if (this->Active) |
535 |
+ { |
536 |
+ this->Active = false; |
537 |
+- vtk_sqlite3_reset(this->Statement); |
538 |
++ sqlite3_reset(this->Statement); |
539 |
+ } |
540 |
+ |
541 |
+- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); |
542 |
++ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); |
543 |
+ |
544 |
+- if (status != VTK_SQLITE_OK) |
545 |
++ if (status != SQLITE_OK) |
546 |
+ { |
547 |
+ vtksys_ios::ostringstream errormessage; |
548 |
+ errormessage << "sqlite_bind_text returned error: " << status; |
549 |
+@@ -763,17 +763,17 @@ |
550 |
+ if (this->Active) |
551 |
+ { |
552 |
+ this->Active = false; |
553 |
+- vtk_sqlite3_reset(this->Statement); |
554 |
++ sqlite3_reset(this->Statement); |
555 |
+ } |
556 |
+ |
557 |
+ int status = |
558 |
+- vtk_sqlite3_bind_blob(this->Statement, |
559 |
++ sqlite3_bind_blob(this->Statement, |
560 |
+ index+1, |
561 |
+ data, |
562 |
+ length, |
563 |
+- VTK_SQLITE_TRANSIENT); |
564 |
++ SQLITE_TRANSIENT); |
565 |
+ |
566 |
+- if (status != VTK_SQLITE_OK) |
567 |
++ if (status != SQLITE_OK) |
568 |
+ { |
569 |
+ vtksys_ios::ostringstream errormessage; |
570 |
+ errormessage << "sqlite_bind_blob returned error: " << status; |
571 |
+@@ -797,12 +797,12 @@ |
572 |
+ if (this->Active) |
573 |
+ { |
574 |
+ this->Active = false; |
575 |
+- vtk_sqlite3_reset(this->Statement); |
576 |
++ sqlite3_reset(this->Statement); |
577 |
+ } |
578 |
+ |
579 |
+- int status = vtk_sqlite3_clear_bindings(this->Statement); |
580 |
++ int status = sqlite3_clear_bindings(this->Statement); |
581 |
+ |
582 |
+- if (status != VTK_SQLITE_OK) |
583 |
++ if (status != SQLITE_OK) |
584 |
+ { |
585 |
+ vtksys_ios::ostringstream errormessage; |
586 |
+ errormessage << "sqlite_clear_bindings returned error: " << status; |
587 |
+--- VTK/IO/SQL/vtkSQLiteDatabase.h |
588 |
++++ VTK/IO/SQL/vtkSQLiteDatabase.h |
589 |
+@@ -49,7 +49,7 @@ |
590 |
+ class vtkSQLQuery; |
591 |
+ class vtkSQLiteQuery; |
592 |
+ class vtkStringArray; |
593 |
+-struct vtk_sqlite3; |
594 |
++struct sqlite3; |
595 |
+ |
596 |
+ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase |
597 |
+ { |
598 |
+@@ -147,7 +147,7 @@ |
599 |
+ virtual bool ParseURL(const char* url); |
600 |
+ |
601 |
+ private: |
602 |
+- vtk_sqlite3 *SQLiteInstance; |
603 |
++ sqlite3 *SQLiteInstance; |
604 |
+ |
605 |
+ // We want this to be private, a user of this class |
606 |
+ // should not be setting this for any reason |
607 |
+--- VTK/IO/SQL/vtkSQLiteQuery.h |
608 |
++++ VTK/IO/SQL/vtkSQLiteQuery.h |
609 |
+@@ -47,7 +47,7 @@ |
610 |
+ class vtkSQLiteDatabase; |
611 |
+ class vtkVariant; |
612 |
+ class vtkVariantArray; |
613 |
+-struct vtk_sqlite3_stmt; |
614 |
++struct sqlite3_stmt; |
615 |
+ |
616 |
+ class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery |
617 |
+ { |
618 |
+@@ -155,7 +155,7 @@ |
619 |
+ vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. |
620 |
+ void operator=(const vtkSQLiteQuery &); // Not implemented. |
621 |
+ |
622 |
+- vtk_sqlite3_stmt *Statement; |
623 |
++ sqlite3_stmt *Statement; |
624 |
+ bool InitialFetch; |
625 |
+ int InitialFetchResult; |
626 |
+ char *LastErrorText; |
627 |
+--- VTK/ThirdParty/sqlite/CMakeLists.txt |
628 |
++++ VTK/ThirdParty/sqlite/CMakeLists.txt |
629 |
+@@ -1,4 +1,4 @@ |
630 |
+-set(vtksqlite_THIRD_PARTY 1) |
631 |
+-set(vtksqlite_LIBRARIES vtksqlite) |
632 |
++#set(vtksqlite_THIRD_PARTY 1) |
633 |
++set(vtksqlite_LIBRARIES sqlite3) |
634 |
+ vtk_module_export_info() |
635 |
+-add_subdirectory(vtksqlite) |
636 |
++#add_subdirectory(vtksqlite) |
637 |
|
638 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch |
639 |
new file mode 100644 |
640 |
index 0000000..58ddde9 |
641 |
--- /dev/null |
642 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch |
643 |
@@ -0,0 +1,36 @@ |
644 |
+--- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
645 |
++++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
646 |
+@@ -82,6 +82,7 @@ |
647 |
+ FIND_PROGRAM( CG_COMPILER cgc |
648 |
+ /usr/bin |
649 |
+ /usr/local/bin |
650 |
++ /opt/nvidia-cg-toolkit/bin |
651 |
+ DOC "The Cg Compiler" |
652 |
+ ) |
653 |
+ GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
654 |
+@@ -89,6 +90,7 @@ |
655 |
+ FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
656 |
+ /usr/include |
657 |
+ /usr/local/include |
658 |
++ /opt/nvidia-cg-toolkit/include |
659 |
+ ${CG_COMPILER_SUPER_DIR}/include |
660 |
+ DOC "The directory where Cg/cg.h resides" |
661 |
+ ) |
662 |
+@@ -98,6 +100,8 @@ |
663 |
+ /usr/lib |
664 |
+ /usr/local/lib64 |
665 |
+ /usr/local/lib |
666 |
++ /opt/nvidia-cg-toolkit/lib64 |
667 |
++ /opt/nvidia-cg-toolkit/lib |
668 |
+ ${CG_COMPILER_SUPER_DIR}/lib64 |
669 |
+ ${CG_COMPILER_SUPER_DIR}/lib |
670 |
+ DOC "The Cg runtime library" |
671 |
+@@ -108,6 +112,8 @@ |
672 |
+ /usr/lib |
673 |
+ /usr/local/lib64 |
674 |
+ /usr/local/lib |
675 |
++ /opt/nvidia-cg-toolkit/lib64 |
676 |
++ /opt/nvidia-cg-toolkit/lib |
677 |
+ ${CG_COMPILER_SUPER_DIR}/lib64 |
678 |
+ ${CG_COMPILER_SUPER_DIR}/lib |
679 |
+ DOC "The Cg runtime library" |
680 |
|
681 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch |
682 |
new file mode 100644 |
683 |
index 0000000..a478b7d |
684 |
--- /dev/null |
685 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch |
686 |
@@ -0,0 +1,79 @@ |
687 |
+adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch |
688 |
+ |
689 |
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt |
690 |
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt |
691 |
+@@ -1,8 +1,8 @@ |
692 |
+-set(vtknetcdf_THIRD_PARTY 1) |
693 |
+-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) |
694 |
+-set(vtknetcdf_INCLUDE_DIRS |
695 |
+- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
696 |
+- ${vtknetcdf_BINARY_DIR}/vtknetcdf |
697 |
+- ) |
698 |
++#set(vtknetcdf_THIRD_PARTY 1) |
699 |
++set(vtknetcdf_LIBRARIES netcdf netcdf_c++) |
700 |
++#set(vtknetcdf_INCLUDE_DIRS |
701 |
++# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
702 |
++# ${vtknetcdf_BINARY_DIR}/vtknetcdf |
703 |
++# ) |
704 |
+ vtk_module_export_info() |
705 |
+-add_subdirectory(vtknetcdf) |
706 |
++#add_subdirectory(vtknetcdf) |
707 |
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h |
708 |
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h |
709 |
+@@ -16,6 +16,6 @@ |
710 |
+ #define __vtk_netcdf_h |
711 |
+ |
712 |
+ /* Use the netcdf library configured for VTK. */ |
713 |
+-#include <vtknetcdf/include/netcdf.h> |
714 |
++#include <netcdf.h> |
715 |
+ |
716 |
+ #endif |
717 |
+--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h |
718 |
++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h |
719 |
+@@ -16,6 +16,6 @@ |
720 |
+ #define __vtk_netcdfcpp_h |
721 |
+ |
722 |
+ /* Use the netcdf library configured for VTK. */ |
723 |
+-#include <vtknetcdf/cxx/netcdfcpp.h> |
724 |
++#include <netcdfcpp.h> |
725 |
+ |
726 |
+ #endif |
727 |
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt |
728 |
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt |
729 |
+@@ -21,7 +21,7 @@ |
730 |
+ ) |
731 |
+ |
732 |
+ add_executable(ExoIICTests ${ExoIICTests}) |
733 |
+-target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF) |
734 |
++target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf) |
735 |
+ |
736 |
+ set(TestsToRun ${ExoIICTests}) |
737 |
+ remove(TestsToRun ExoIICTests.cxx) |
738 |
+--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt |
739 |
++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt |
740 |
+@@ -241,7 +241,7 @@ |
741 |
+ |
742 |
+ |
743 |
+ VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) |
744 |
+-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) |
745 |
++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) |
746 |
+ |
747 |
+ IF(NOT VTK_INSTALL_NO_DEVELOPMENT) |
748 |
+ # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h |
749 |
+--- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt |
750 |
++++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt |
751 |
+@@ -10,5 +10,5 @@ |
752 |
+ |
753 |
+ vtk_module_library(vtkIONetCDF ${Module_SRCS}) |
754 |
+ |
755 |
+-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) |
756 |
++target_link_libraries(vtkIONetCDF netcdf netcdf_c++) |
757 |
+ set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") |
758 |
+--- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt |
759 |
++++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt |
760 |
+@@ -8,4 +8,4 @@ |
761 |
+ |
762 |
+ vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) |
763 |
+ |
764 |
+-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) |
765 |
++target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++) |
766 |
|
767 |
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch |
768 |
new file mode 100644 |
769 |
index 0000000..65a5b20 |
770 |
--- /dev/null |
771 |
+++ b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch |
772 |
@@ -0,0 +1,9 @@ |
773 |
+--- a/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx_orig 2014-01-11 15:02:10.000000000 +0100 |
774 |
++++ b/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2014-11-11 13:12:25.000000000 +0100 |
775 |
+@@ -28,5 +28,5 @@ |
776 |
+ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by |
777 |
+ // the system |
778 |
+-//#define GLX_GLXEXT_LEGACY |
779 |
++#define GLX_GLXEXT_LEGACY |
780 |
+ #include "GL/glx.h" |
781 |
+ |
782 |
|
783 |
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch |
784 |
new file mode 100644 |
785 |
index 0000000..b7d3e40 |
786 |
--- /dev/null |
787 |
+++ b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch |
788 |
@@ -0,0 +1,22 @@ |
789 |
+--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 |
790 |
++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 |
791 |
+@@ -1185,7 +1185,7 @@ |
792 |
+ if (bitmap) |
793 |
+ { |
794 |
+ metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); |
795 |
+- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), |
796 |
++ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), |
797 |
+ metaData.descent); |
798 |
+ } |
799 |
+ ++heightString; |
800 |
+@@ -1952,8 +1952,8 @@ |
801 |
+ if (bitmap) |
802 |
+ { |
803 |
+ bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); |
804 |
+- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); |
805 |
+- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); |
806 |
++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width)); |
807 |
++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); |
808 |
+ bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); |
809 |
+ } |
810 |
+ else |
811 |
|
812 |
diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
813 |
new file mode 100644 |
814 |
index 0000000..20bed18 |
815 |
--- /dev/null |
816 |
+++ b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
817 |
@@ -0,0 +1,302 @@ |
818 |
+# Copyright 1999-2015 Gentoo Foundation |
819 |
+# Distributed under the terms of the GNU General Public License v2 |
820 |
+# $Id$ |
821 |
+ |
822 |
+EAPI=5 |
823 |
+ |
824 |
+PYTHON_COMPAT=( python2_7 ) |
825 |
+inherit eutils multilib versionator python-single-r1 cmake-utils |
826 |
+ |
827 |
+MAIN_PV=$(get_major_version) |
828 |
+MAJOR_PV=$(get_version_component_range 1-2) |
829 |
+MY_P="ParaView-v${PV}-source" |
830 |
+ |
831 |
+DESCRIPTION="ParaView is a powerful scientific data visualization application" |
832 |
+HOMEPAGE="http://www.paraview.org" |
833 |
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" |
834 |
+RESTRICT="mirror" |
835 |
+ |
836 |
+LICENSE="paraview GPL-2" |
837 |
+KEYWORDS="~amd64 ~x86" |
838 |
+SLOT="0" |
839 |
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" |
840 |
+RESTRICT="test" |
841 |
+ |
842 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
843 |
+ mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" |
844 |
+ |
845 |
+RDEPEND=" |
846 |
+ dev-libs/expat |
847 |
+ dev-libs/jsoncpp |
848 |
+ dev-libs/libxml2:2 |
849 |
+ <dev-libs/protobuf-2.6 |
850 |
+ media-libs/freetype |
851 |
+ media-libs/libpng:0 |
852 |
+ media-libs/libtheora |
853 |
+ media-libs/tiff:0= |
854 |
+ sci-libs/hdf5[mpi=] |
855 |
+ >=sci-libs/netcdf-4.2[hdf5] |
856 |
+ >=sci-libs/netcdf-cxx-4.2:3 |
857 |
+ sys-libs/zlib |
858 |
+ virtual/jpeg:0 |
859 |
+ virtual/opengl |
860 |
+ >=x11-libs/gl2ps-1.3.8 |
861 |
+ x11-libs/libX11 |
862 |
+ x11-libs/libXext |
863 |
+ x11-libs/libXmu |
864 |
+ x11-libs/libXt |
865 |
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) |
866 |
+ coprocessing? ( |
867 |
+ plugins? ( |
868 |
+ dev-python/PyQt4 |
869 |
+ dev-qt/qtgui:4 |
870 |
+ ) |
871 |
+ ) |
872 |
+ ffmpeg? ( virtual/ffmpeg ) |
873 |
+ mpi? ( virtual/mpi[cxx,romio] ) |
874 |
+ mysql? ( virtual/mysql ) |
875 |
+ python? ( |
876 |
+ ${PYTHON_DEPS} |
877 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
878 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
879 |
+ dev-python/sip[${PYTHON_USEDEP}] |
880 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
881 |
+ dev-python/zope-interface[${PYTHON_USEDEP}] |
882 |
+ mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
883 |
+ qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) |
884 |
+ ) |
885 |
+ qt4? ( |
886 |
+ dev-qt/designer:4 |
887 |
+ dev-qt/qtgui:4 |
888 |
+ dev-qt/qtopengl:4 |
889 |
+ dev-qt/qthelp:4[compat] |
890 |
+ dev-qt/qtsql:4 |
891 |
+ dev-qt/qtwebkit:4 |
892 |
+ ) |
893 |
+ sqlite? ( dev-db/sqlite:3 ) |
894 |
+ tcl? ( dev-lang/tcl:0= ) |
895 |
+ tk? ( dev-lang/tk:0= )" |
896 |
+DEPEND="${RDEPEND} |
897 |
+ doc? ( app-doc/doxygen )" |
898 |
+ |
899 |
+S=${WORKDIR}/${MY_P%-source} |
900 |
+ |
901 |
+pkg_setup() { |
902 |
+ python-single-r1_pkg_setup |
903 |
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} |
904 |
+} |
905 |
+ |
906 |
+src_prepare() { |
907 |
+ # see patch headers for description |
908 |
+ epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ |
909 |
+ "${FILESDIR}"/${PN}-4.0.1-removesqlite.patch \ |
910 |
+ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ |
911 |
+ "${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \ |
912 |
+ "${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \ |
913 |
+ "${FILESDIR}"/${P}-glxext-legacy.patch \ |
914 |
+ "${FILESDIR}"/${P}-no-fatal-warnings.patch \ |
915 |
+ "${FILESDIR}"/${P}-vtk-freetype.patch |
916 |
+ |
917 |
+ # lib64 fixes |
918 |
+ sed -i \ |
919 |
+ -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
920 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die |
921 |
+ sed -i \ |
922 |
+ -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ |
923 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die |
924 |
+ sed -i \ |
925 |
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ |
926 |
+ CMakeLists.txt \ |
927 |
+ Plugins/SciberQuestToolKit/CMakeLists.txt \ |
928 |
+ ParaViewConfig.cmake.in \ |
929 |
+ CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ |
930 |
+ ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ |
931 |
+ ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ |
932 |
+ Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ |
933 |
+ Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die |
934 |
+ |
935 |
+ # no proper switch |
936 |
+ use nvcontrol || { |
937 |
+ sed -i \ |
938 |
+ -e '/VTK_USE_NVCONTROL/s#1#0#' \ |
939 |
+ VTK/Rendering/OpenGL/CMakeLists.txt || die |
940 |
+ } |
941 |
+} |
942 |
+ |
943 |
+src_configure() { |
944 |
+ local mysql_lib mysql_includedir |
945 |
+ |
946 |
+ if use mysql ; then |
947 |
+ if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
948 |
+ mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
949 |
+ mysql_includedir="/usr/include/mysql" |
950 |
+ else |
951 |
+ mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
952 |
+ mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
953 |
+ fi |
954 |
+ fi |
955 |
+ |
956 |
+ # TODO: use system jsoncpp |
957 |
+ # VTK_USE_SYSTEM_QTTESTING |
958 |
+ # PARAVIEW_USE_SYSTEM_AUTOBAHN |
959 |
+ local mycmakeargs=( |
960 |
+ -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" |
961 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
962 |
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include |
963 |
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so |
964 |
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so |
965 |
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so |
966 |
+ -DBUILD_SHARED_LIBS=ON |
967 |
+ -DVTK_USE_SYSTEM_EXPAT=ON |
968 |
+ -DVTK_USE_SYSTEM_FREETYPE=ON |
969 |
+ -DVTK_USE_SYSTEM_GL2PS=ON |
970 |
+ -DVTK_USE_SYSTEM_HDF5=ON |
971 |
+ -DVTK_USE_SYSTEM_JPEG=ON |
972 |
+ -DVTK_USE_SYSTEM_JSONCPP=ON |
973 |
+ -DVTK_USE_SYSTEM_LIBXML2=ON |
974 |
+ -DVTK_USE_SYSTEM_NETCDF=ON |
975 |
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON |
976 |
+ -DVTK_USE_SYSTEM_PNG=ON |
977 |
+ -DVTK_USE_SYSTEM_PROTOBUF=ON |
978 |
+ -DVTK_USE_SYSTEM_TIFF=ON |
979 |
+ -DVTK_USE_SYSTEM_XDMF2=OFF |
980 |
+ -DVTK_USE_SYSTEM_ZLIB=ON |
981 |
+ -DPARAVIEW_USE_SYSTEM_MPI4PY=ON |
982 |
+ -DVTK_USE_SYSTEM_ZOPE=ON |
983 |
+ -DVTK_USE_SYSTEM_TWISTED=ON |
984 |
+ -DCMAKE_VERBOSE_MAKEFILE=ON |
985 |
+ -DCMAKE_COLOR_MAKEFILE=TRUE |
986 |
+ -DVTK_USE_OFFSCREEN=TRUE |
987 |
+ -DCMAKE_USE_PTHREADS=ON |
988 |
+ -DVTK_USE_FFMPEG_ENCODER=OFF |
989 |
+ -DPROTOC_LOCATION=$(type -P protoc) |
990 |
+ -DVTK_Group_StandAlone=ON |
991 |
+ -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
992 |
+ -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
993 |
+ # force this module due to incorrect build system deps |
994 |
+ # wrt bug 460528 |
995 |
+ -DModule_vtkUtilitiesProcessXML=ON |
996 |
+ ) |
997 |
+ |
998 |
+ # TODO: XDMF_USE_MYSQL? |
999 |
+ # VTK_WRAP_JAVA |
1000 |
+ mycmakeargs+=( |
1001 |
+ $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
1002 |
+ $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) |
1003 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) |
1004 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) |
1005 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) |
1006 |
+ $(cmake-utils_use qt4 Module_vtkRenderingQt) |
1007 |
+ $(cmake-utils_use qt4 Module_vtkViewsQt) |
1008 |
+ $(cmake-utils_use qt4 VTK_Group_ParaViewQt) |
1009 |
+ $(cmake-utils_use qt4 VTK_Group_Qt) |
1010 |
+ $(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT) |
1011 |
+ $(cmake-utils_use boost Module_vtkInfovisBoost) |
1012 |
+ $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) |
1013 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI) |
1014 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) |
1015 |
+ $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) |
1016 |
+ $(cmake-utils_use mpi VTK_Group_MPI) |
1017 |
+ $(cmake-utils_use mpi VTK_XDMF_USE_MPI) |
1018 |
+ $(cmake-utils_use mpi XDMF_BUILD_MPI) |
1019 |
+ $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) |
1020 |
+ $(cmake-utils_use python VTK_Group_ParaViewPython) |
1021 |
+ $(cmake-utils_use python XDMF_WRAP_PYTHON) |
1022 |
+ $(cmake-utils_use python Module_vtkPython) |
1023 |
+ $(cmake-utils_use python Module_pqPython) |
1024 |
+ $(cmake-utils_use python Module_vtkWrappingPythonCore) |
1025 |
+ $(cmake-utils_use python Module_vtkPVPythonSupport) |
1026 |
+ $(cmake-utils_use python Module_AutobahnPython) |
1027 |
+ $(cmake-utils_use python Module_Twisted) |
1028 |
+ $(cmake-utils_use python Module_ZopeInterface) |
1029 |
+ $(cmake-utils_use python Module_vtkmpi4py) |
1030 |
+ $(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") |
1031 |
+ $(cmake-utils_use doc BUILD_DOCUMENTATION) |
1032 |
+ $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) |
1033 |
+ $(cmake-utils_use examples BUILD_EXAMPLES) |
1034 |
+ $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1035 |
+ $(cmake-utils_use mysql Module_vtkIOMySQL) |
1036 |
+ $(cmake-utils_use sqlite Module_vtksqlite) |
1037 |
+ $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) |
1038 |
+ $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) |
1039 |
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1040 |
+ $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) |
1041 |
+ $(cmake-utils_use tk VTK_Group_Tk) |
1042 |
+ $(cmake-utils_use tk VTK_USE_TK) |
1043 |
+ $(cmake-utils_use tk Module_vtkRenderingTk) |
1044 |
+ $(cmake-utils_use tcl Module_vtkTclTk) |
1045 |
+ $(cmake-utils_use tcl Module_vtkWrappingTcl) |
1046 |
+ $(cmake-utils_use test BUILD_TESTING) |
1047 |
+ ) |
1048 |
+ |
1049 |
+ if use qt4 ; then |
1050 |
+ mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) |
1051 |
+ if use python ; then |
1052 |
+ # paraview cannot guess sip directory properly |
1053 |
+ mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) |
1054 |
+ fi |
1055 |
+ fi |
1056 |
+ |
1057 |
+ # TODO: MantaView VaporPlugin VRPlugin |
1058 |
+ mycmakeargs+=( |
1059 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) |
1060 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) |
1061 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) |
1062 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) |
1063 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) |
1064 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) |
1065 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |
1066 |
+ $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) |
1067 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) |
1068 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) |
1069 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) |
1070 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) |
1071 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) |
1072 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) |
1073 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) |
1074 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) |
1075 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) |
1076 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) |
1077 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) |
1078 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) |
1079 |
+ # these are always needed for plugins |
1080 |
+ $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) |
1081 |
+ $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) |
1082 |
+ ) |
1083 |
+ |
1084 |
+ cmake-utils_src_configure |
1085 |
+} |
1086 |
+ |
1087 |
+src_compile() { |
1088 |
+ cmake-utils_src_compile |
1089 |
+} |
1090 |
+ |
1091 |
+src_install() { |
1092 |
+ cmake-utils_src_install |
1093 |
+ |
1094 |
+ # set up the environment |
1095 |
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} |
1096 |
+ |
1097 |
+ newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png |
1098 |
+ make_desktop_entry paraview "Paraview" paraview |
1099 |
+ |
1100 |
+ use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} |
1101 |
+} |
1102 |
+ |
1103 |
+pkg_postinst() { |
1104 |
+ # with Qt4.5 there seem to be issues reading data files |
1105 |
+ # under certain locales. Setting LC_ALL=C should fix these. |
1106 |
+ elog "" |
1107 |
+ elog "If you experience data corruption during parsing of" |
1108 |
+ elog "data files with paraview please try setting your" |
1109 |
+ elog "locale to LC_ALL=C." |
1110 |
+ elog "If you plan to use paraview component from an existing shell" |
1111 |
+ elog "you should run env-update and . /etc/profile first" |
1112 |
+ elog "" |
1113 |
+ elog "paraview no longer exports bundled python modules in PYTHONPATH" |
1114 |
+ elog "globally due to clashes of bundled packages with system-wide" |
1115 |
+ elog "site-packages. If you want to use paraview's python modules" |
1116 |
+ elog "export" |
1117 |
+ elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" |
1118 |
+ elog "as needed." |
1119 |
+} |
1120 |
|
1121 |
diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild |
1122 |
new file mode 100644 |
1123 |
index 0000000..7777925 |
1124 |
--- /dev/null |
1125 |
+++ b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild |
1126 |
@@ -0,0 +1,300 @@ |
1127 |
+# Copyright 1999-2015 Gentoo Foundation |
1128 |
+# Distributed under the terms of the GNU General Public License v2 |
1129 |
+# $Id$ |
1130 |
+ |
1131 |
+EAPI=5 |
1132 |
+ |
1133 |
+PYTHON_COMPAT=( python2_7 ) |
1134 |
+inherit eutils multilib versionator python-single-r1 cmake-utils |
1135 |
+ |
1136 |
+MAIN_PV=$(get_major_version) |
1137 |
+MAJOR_PV=$(get_version_component_range 1-2) |
1138 |
+MY_P="ParaView-v${PV}-source" |
1139 |
+ |
1140 |
+DESCRIPTION="ParaView is a powerful scientific data visualization application" |
1141 |
+HOMEPAGE="http://www.paraview.org" |
1142 |
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" |
1143 |
+RESTRICT="mirror" |
1144 |
+ |
1145 |
+LICENSE="paraview GPL-2" |
1146 |
+KEYWORDS="~amd64 ~x86" |
1147 |
+SLOT="0" |
1148 |
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" |
1149 |
+RESTRICT="test" |
1150 |
+ |
1151 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
1152 |
+ mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" |
1153 |
+ |
1154 |
+RDEPEND=" |
1155 |
+ dev-libs/expat |
1156 |
+ dev-libs/jsoncpp |
1157 |
+ dev-libs/libxml2:2 |
1158 |
+ <dev-libs/protobuf-2.6 |
1159 |
+ media-libs/freetype |
1160 |
+ media-libs/libpng:0 |
1161 |
+ media-libs/libtheora |
1162 |
+ media-libs/tiff:0= |
1163 |
+ sci-libs/hdf5[mpi=] |
1164 |
+ >=sci-libs/netcdf-4.2[hdf5] |
1165 |
+ >=sci-libs/netcdf-cxx-4.2:3 |
1166 |
+ sys-libs/zlib |
1167 |
+ virtual/jpeg:0 |
1168 |
+ virtual/opengl |
1169 |
+ >=x11-libs/gl2ps-1.3.8 |
1170 |
+ x11-libs/libX11 |
1171 |
+ x11-libs/libXext |
1172 |
+ x11-libs/libXmu |
1173 |
+ x11-libs/libXt |
1174 |
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) |
1175 |
+ coprocessing? ( |
1176 |
+ plugins? ( |
1177 |
+ dev-python/PyQt4 |
1178 |
+ dev-qt/qtgui:4 |
1179 |
+ ) |
1180 |
+ ) |
1181 |
+ ffmpeg? ( virtual/ffmpeg ) |
1182 |
+ mpi? ( virtual/mpi[cxx,romio] ) |
1183 |
+ mysql? ( virtual/mysql ) |
1184 |
+ python? ( |
1185 |
+ ${PYTHON_DEPS} |
1186 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
1187 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
1188 |
+ dev-python/sip[${PYTHON_USEDEP}] |
1189 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
1190 |
+ dev-python/zope-interface[${PYTHON_USEDEP}] |
1191 |
+ mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
1192 |
+ qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) |
1193 |
+ ) |
1194 |
+ qt4? ( |
1195 |
+ dev-qt/designer:4 |
1196 |
+ dev-qt/qtgui:4 |
1197 |
+ dev-qt/qtopengl:4 |
1198 |
+ dev-qt/qthelp:4[compat] |
1199 |
+ dev-qt/qtsql:4 |
1200 |
+ dev-qt/qtwebkit:4 |
1201 |
+ ) |
1202 |
+ sqlite? ( dev-db/sqlite:3 ) |
1203 |
+ tcl? ( dev-lang/tcl:0= ) |
1204 |
+ tk? ( dev-lang/tk:0= )" |
1205 |
+DEPEND="${RDEPEND} |
1206 |
+ doc? ( app-doc/doxygen )" |
1207 |
+ |
1208 |
+S="${WORKDIR}/${MY_P}" |
1209 |
+ |
1210 |
+pkg_setup() { |
1211 |
+ python-single-r1_pkg_setup |
1212 |
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} |
1213 |
+} |
1214 |
+ |
1215 |
+src_prepare() { |
1216 |
+ # see patch headers for description |
1217 |
+ epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ |
1218 |
+ "${FILESDIR}"/${P}-removesqlite.patch \ |
1219 |
+ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ |
1220 |
+ "${FILESDIR}"/${P}-protobuf.patch \ |
1221 |
+ "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ |
1222 |
+ "${FILESDIR}"/${P}-vtk-freetype.patch |
1223 |
+ |
1224 |
+ # lib64 fixes |
1225 |
+ sed -i \ |
1226 |
+ -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
1227 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die |
1228 |
+ sed -i \ |
1229 |
+ -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ |
1230 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die |
1231 |
+ sed -i \ |
1232 |
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ |
1233 |
+ CMakeLists.txt \ |
1234 |
+ Plugins/SciberQuestToolKit/CMakeLists.txt \ |
1235 |
+ ParaViewConfig.cmake.in \ |
1236 |
+ CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ |
1237 |
+ ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ |
1238 |
+ ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ |
1239 |
+ Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ |
1240 |
+ Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die |
1241 |
+ |
1242 |
+ # no proper switch |
1243 |
+ use nvcontrol || { |
1244 |
+ sed -i \ |
1245 |
+ -e '/VTK_USE_NVCONTROL/s#1#0#' \ |
1246 |
+ VTK/Rendering/OpenGL/CMakeLists.txt || die |
1247 |
+ } |
1248 |
+} |
1249 |
+ |
1250 |
+src_configure() { |
1251 |
+ local mysql_lib mysql_includedir |
1252 |
+ |
1253 |
+ if use mysql ; then |
1254 |
+ if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
1255 |
+ mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
1256 |
+ mysql_includedir="/usr/include/mysql" |
1257 |
+ else |
1258 |
+ mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
1259 |
+ mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
1260 |
+ fi |
1261 |
+ fi |
1262 |
+ |
1263 |
+ # TODO: use system jsoncpp |
1264 |
+ # VTK_USE_SYSTEM_QTTESTING |
1265 |
+ # PARAVIEW_USE_SYSTEM_AUTOBAHN |
1266 |
+ local mycmakeargs=( |
1267 |
+ -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" |
1268 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
1269 |
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include |
1270 |
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so |
1271 |
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so |
1272 |
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so |
1273 |
+ -DBUILD_SHARED_LIBS=ON |
1274 |
+ -DVTK_USE_SYSTEM_EXPAT=ON |
1275 |
+ -DVTK_USE_SYSTEM_FREETYPE=ON |
1276 |
+ -DVTK_USE_SYSTEM_GL2PS=ON |
1277 |
+ -DVTK_USE_SYSTEM_HDF5=ON |
1278 |
+ -DVTK_USE_SYSTEM_JPEG=ON |
1279 |
+ -DVTK_USE_SYSTEM_JSONCPP=ON |
1280 |
+ -DVTK_USE_SYSTEM_LIBXML2=ON |
1281 |
+ -DVTK_USE_SYSTEM_NETCDF=ON |
1282 |
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON |
1283 |
+ -DVTK_USE_SYSTEM_PNG=ON |
1284 |
+ -DVTK_USE_SYSTEM_PROTOBUF=ON |
1285 |
+ -DVTK_USE_SYSTEM_TIFF=ON |
1286 |
+ -DVTK_USE_SYSTEM_XDMF2=OFF |
1287 |
+ -DVTK_USE_SYSTEM_ZLIB=ON |
1288 |
+ -DPARAVIEW_USE_SYSTEM_MPI4PY=ON |
1289 |
+ -DVTK_USE_SYSTEM_ZOPE=ON |
1290 |
+ -DVTK_USE_SYSTEM_TWISTED=ON |
1291 |
+ -DCMAKE_VERBOSE_MAKEFILE=ON |
1292 |
+ -DCMAKE_COLOR_MAKEFILE=TRUE |
1293 |
+ -DVTK_USE_OFFSCREEN=TRUE |
1294 |
+ -DCMAKE_USE_PTHREADS=ON |
1295 |
+ -DVTK_USE_FFMPEG_ENCODER=OFF |
1296 |
+ -DPROTOC_LOCATION=$(type -P protoc) |
1297 |
+ -DVTK_Group_StandAlone=ON |
1298 |
+ -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
1299 |
+ -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
1300 |
+ # force this module due to incorrect build system deps |
1301 |
+ # wrt bug 460528 |
1302 |
+ -DModule_vtkUtilitiesProcessXML=ON |
1303 |
+ ) |
1304 |
+ |
1305 |
+ # TODO: XDMF_USE_MYSQL? |
1306 |
+ # VTK_WRAP_JAVA |
1307 |
+ mycmakeargs+=( |
1308 |
+ $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
1309 |
+ $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) |
1310 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) |
1311 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) |
1312 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) |
1313 |
+ $(cmake-utils_use qt4 Module_vtkRenderingQt) |
1314 |
+ $(cmake-utils_use qt4 Module_vtkViewsQt) |
1315 |
+ $(cmake-utils_use qt4 VTK_Group_ParaViewQt) |
1316 |
+ $(cmake-utils_use qt4 VTK_Group_Qt) |
1317 |
+ $(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT) |
1318 |
+ $(cmake-utils_use boost Module_vtkInfovisBoost) |
1319 |
+ $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) |
1320 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI) |
1321 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) |
1322 |
+ $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) |
1323 |
+ $(cmake-utils_use mpi VTK_Group_MPI) |
1324 |
+ $(cmake-utils_use mpi VTK_XDMF_USE_MPI) |
1325 |
+ $(cmake-utils_use mpi XDMF_BUILD_MPI) |
1326 |
+ $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) |
1327 |
+ $(cmake-utils_use python VTK_Group_ParaViewPython) |
1328 |
+ $(cmake-utils_use python XDMF_WRAP_PYTHON) |
1329 |
+ $(cmake-utils_use python Module_vtkPython) |
1330 |
+ $(cmake-utils_use python Module_pqPython) |
1331 |
+ $(cmake-utils_use python Module_vtkWrappingPythonCore) |
1332 |
+ $(cmake-utils_use python Module_vtkPVPythonSupport) |
1333 |
+ $(cmake-utils_use python Module_AutobahnPython) |
1334 |
+ $(cmake-utils_use python Module_Twisted) |
1335 |
+ $(cmake-utils_use python Module_ZopeInterface) |
1336 |
+ $(cmake-utils_use python Module_vtkmpi4py) |
1337 |
+ $(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") |
1338 |
+ $(cmake-utils_use doc BUILD_DOCUMENTATION) |
1339 |
+ $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) |
1340 |
+ $(cmake-utils_use examples BUILD_EXAMPLES) |
1341 |
+ $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1342 |
+ $(cmake-utils_use mysql Module_vtkIOMySQL) |
1343 |
+ $(cmake-utils_use sqlite Module_vtksqlite) |
1344 |
+ $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) |
1345 |
+ $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) |
1346 |
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1347 |
+ $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) |
1348 |
+ $(cmake-utils_use tk VTK_Group_Tk) |
1349 |
+ $(cmake-utils_use tk VTK_USE_TK) |
1350 |
+ $(cmake-utils_use tk Module_vtkRenderingTk) |
1351 |
+ $(cmake-utils_use tcl Module_vtkTclTk) |
1352 |
+ $(cmake-utils_use tcl Module_vtkWrappingTcl) |
1353 |
+ $(cmake-utils_use test BUILD_TESTING) |
1354 |
+ ) |
1355 |
+ |
1356 |
+ if use qt4 ; then |
1357 |
+ mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) |
1358 |
+ if use python ; then |
1359 |
+ # paraview cannot guess sip directory properly |
1360 |
+ mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) |
1361 |
+ fi |
1362 |
+ fi |
1363 |
+ |
1364 |
+ # TODO: MantaView VaporPlugin VRPlugin |
1365 |
+ mycmakeargs+=( |
1366 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) |
1367 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) |
1368 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) |
1369 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) |
1370 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) |
1371 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) |
1372 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |
1373 |
+ $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) |
1374 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) |
1375 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) |
1376 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) |
1377 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) |
1378 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) |
1379 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) |
1380 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) |
1381 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) |
1382 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) |
1383 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) |
1384 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) |
1385 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) |
1386 |
+ # these are always needed for plugins |
1387 |
+ $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) |
1388 |
+ $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) |
1389 |
+ ) |
1390 |
+ |
1391 |
+ cmake-utils_src_configure |
1392 |
+} |
1393 |
+ |
1394 |
+src_compile() { |
1395 |
+ cmake-utils_src_compile |
1396 |
+} |
1397 |
+ |
1398 |
+src_install() { |
1399 |
+ cmake-utils_src_install |
1400 |
+ |
1401 |
+ # set up the environment |
1402 |
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} |
1403 |
+ |
1404 |
+ newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png |
1405 |
+ make_desktop_entry paraview "Paraview" paraview |
1406 |
+ |
1407 |
+ use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} |
1408 |
+} |
1409 |
+ |
1410 |
+pkg_postinst() { |
1411 |
+ # with Qt4.5 there seem to be issues reading data files |
1412 |
+ # under certain locales. Setting LC_ALL=C should fix these. |
1413 |
+ elog "" |
1414 |
+ elog "If you experience data corruption during parsing of" |
1415 |
+ elog "data files with paraview please try setting your" |
1416 |
+ elog "locale to LC_ALL=C." |
1417 |
+ elog "If you plan to use paraview component from an existing shell" |
1418 |
+ elog "you should run env-update and . /etc/profile first" |
1419 |
+ elog "" |
1420 |
+ elog "paraview no longer exports bundled python modules in PYTHONPATH" |
1421 |
+ elog "globally due to clashes of bundled packages with system-wide" |
1422 |
+ elog "site-packages. If you want to use paraview's python modules" |
1423 |
+ elog "export" |
1424 |
+ elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" |
1425 |
+ elog "as needed." |
1426 |
+} |