1 |
commit: 90bf5122ad89011806338beb9817d5f3ed2574e8 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 20:02:20 2016 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 20:03:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bf5122 |
7 |
|
8 |
sci-visualization/paraview: reinstantiate 4.1.0 to resolve openfoam dep |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
sci-visualization/paraview/Manifest | 1 + |
13 |
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 +++ |
14 |
.../files/paraview-4.0.1-removesqlite.patch | 517 +++++++++++++++++++++ |
15 |
.../files/paraview-4.0.1-vtk-cg-path.patch | 36 ++ |
16 |
.../files/paraview-4.1.0-glxext-legacy.patch | 9 + |
17 |
.../files/paraview-4.1.0-no-fatal-warnings.patch | 19 + |
18 |
.../files/paraview-4.1.0-vtk-freetype.patch | 22 + |
19 |
.../paraview/paraview-4.1.0-r2.ebuild | 302 ++++++++++++ |
20 |
8 files changed, 978 insertions(+) |
21 |
|
22 |
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest |
23 |
index 8699b23..1e11e68 100644 |
24 |
--- a/sci-visualization/paraview/Manifest |
25 |
+++ b/sci-visualization/paraview/Manifest |
26 |
@@ -1,2 +1,3 @@ |
27 |
+DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96 |
28 |
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b |
29 |
DIST ParaView-v5.1.0.tar.gz 51613148 SHA256 1ce345e9c5533c2854ad7e89cf4f90992bafee23707ae9f85d12b38405169f2a SHA512 c9af27d8be03783c7353735718a41ee03732db0f2e4f6e2db5e1e72d3df01801bb77294713c2b96eaf17e75d1fd6a30e340b3c33f496f7e705d07badfa196e69 WHIRLPOOL 08cd669f02fd54b7fc4054f23f04a3dc274e4ba8ebdf54fb14caaa95bc0c9fb2e2e5551a9e74d88062f2230eb511b7e18d6cb75bb43f4291e19dbaa2ed53cd1f |
30 |
|
31 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch |
32 |
new file mode 100644 |
33 |
index 0000000..6a09a1a |
34 |
--- /dev/null |
35 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch |
36 |
@@ -0,0 +1,72 @@ |
37 |
+http://paraview.org/Bug/view.php?id=13656 |
38 |
+ |
39 |
+diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt |
40 |
+--- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 |
41 |
++++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-13 15:17:53.980027098 -0700 |
42 |
+@@ -81,16 +81,24 @@ |
43 |
+ #------------------------------------------------------------------------------ |
44 |
+ # Generate the protbuf message file. |
45 |
+ #------------------------------------------------------------------------------ |
46 |
+-get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) |
47 |
++if (VTK_USE_SYSTEM_PROTOBUF) |
48 |
++ set (_PROTOC_COMPILER protoc) |
49 |
++ set (_PROTOC_DEPEND "") |
50 |
++else() |
51 |
++ set (_PROTOC_COMPILER protoc_compiler) |
52 |
++ set (_PROTOC_DEPEND ${_PROTOC_COMPILER}) |
53 |
++endif() |
54 |
++ |
55 |
++get_target_property(PROTOC_LOCATION ${_PROTOC_COMPILER} LOCATION) |
56 |
+ add_custom_command( |
57 |
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h |
58 |
+ ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc |
59 |
+ |
60 |
+- COMMAND protoc_compiler |
61 |
++ COMMAND ${_PROTOC_COMPILER} |
62 |
+ "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}" |
63 |
+ --proto_path "@CMAKE_CURRENT_SOURCE_DIR@" |
64 |
+ "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto" |
65 |
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler |
66 |
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto ${_PROTOC_DEPEND} |
67 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
68 |
+ ) |
69 |
+ |
70 |
+@@ -109,5 +117,9 @@ |
71 |
+ vtk_module_library(vtkPVServerImplementationCore |
72 |
+ ${Module_SRCS}) |
73 |
+ |
74 |
++if (VTK_USE_SYSTEM_PROTOBUF) |
75 |
++ target_link_libraries(vtkPVServerImplementationCore ${CMAKE_THREAD_LIBS_INIT}) |
76 |
++endif() |
77 |
++ |
78 |
+ add_dependencies(vtkPVServerImplementationCore |
79 |
+ protobuf_code_generation) |
80 |
+diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt |
81 |
+--- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.000000000 -0700 |
82 |
++++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-13 15:09:31.526673020 -0700 |
83 |
+@@ -34,7 +34,7 @@ |
84 |
+ set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR}) |
85 |
+ set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME}) |
86 |
+ |
87 |
+-vtk_module_third_party(protobuf |
88 |
++vtk_module_third_party(Protobuf |
89 |
+ INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src |
90 |
+ LIBRARIES protobuf |
91 |
+ ) |
92 |
+@@ -42,10 +42,12 @@ |
93 |
+ # protobuf exports it's build-dir targets to a custom file |
94 |
+ # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export |
95 |
+ # build-dir targets ourselves. |
96 |
+-vtk_target_export(protobuf) |
97 |
+-vtk_target_export(protobuf-lite) |
98 |
+-if (NOT CMAKE_CROSSCOMPILING) |
99 |
+- vtk_compile_tools_target_export(protoc_compiler) |
100 |
++if (NOT VTK_USE_SYSTEM_PROTOBUF) |
101 |
++ vtk_target_export(protobuf) |
102 |
++ vtk_target_export(protobuf-lite) |
103 |
++ if (NOT CMAKE_CROSSCOMPILING) |
104 |
++ vtk_compile_tools_target_export(protoc_compiler) |
105 |
++ endif() |
106 |
+ endif() |
107 |
+ |
108 |
+ # All these exports don't add any install rules. However we make protobuf itself |
109 |
|
110 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
111 |
new file mode 100644 |
112 |
index 0000000..be495b4 |
113 |
--- /dev/null |
114 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
115 |
@@ -0,0 +1,517 @@ |
116 |
+Description: Import patch from VTK to remove sqlite |
117 |
+Author: Mathieu Malaterre <mathieu.malaterre@×××××.com> |
118 |
+Last-Update: Mon Feb 11 14:58:03 UTC 2013 |
119 |
+ |
120 |
+remove the internal copy of sqlite (vtksqlite) |
121 |
+http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch |
122 |
+ |
123 |
+--- VTK/IO/SQL/vtkSQLiteDatabase.cxx |
124 |
++++ VTK/IO/SQL/vtkSQLiteDatabase.cxx |
125 |
+@@ -29,7 +29,7 @@ |
126 |
+ #include <vtksys/ios/fstream> |
127 |
+ #include <vtksys/ios/sstream> |
128 |
+ |
129 |
+-#include <vtksqlite/vtk_sqlite3.h> |
130 |
++#include <sqlite3.h> |
131 |
+ |
132 |
+ vtkStandardNewMacro(vtkSQLiteDatabase); |
133 |
+ |
134 |
+@@ -307,15 +307,15 @@ |
135 |
+ } |
136 |
+ } |
137 |
+ |
138 |
+- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
139 |
++ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
140 |
+ |
141 |
+- if (result != VTK_SQLITE_OK) |
142 |
++ if (result != SQLITE_OK) |
143 |
+ { |
144 |
+ vtkDebugMacro(<<"SQLite open() failed. Error code is " |
145 |
+ << result << " and message is " |
146 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
147 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
148 |
+ |
149 |
+- vtk_sqlite3_close(this->SQLiteInstance); |
150 |
++ sqlite3_close(this->SQLiteInstance); |
151 |
+ return false; |
152 |
+ } |
153 |
+ else |
154 |
+@@ -334,8 +334,8 @@ |
155 |
+ } |
156 |
+ else |
157 |
+ { |
158 |
+- int result = vtk_sqlite3_close(this->SQLiteInstance); |
159 |
+- if (result != VTK_SQLITE_OK) |
160 |
++ int result = sqlite3_close(this->SQLiteInstance); |
161 |
++ if (result != SQLITE_OK) |
162 |
+ { |
163 |
+ vtkWarningMacro(<< "Close(): SQLite returned result code " << result); |
164 |
+ } |
165 |
+@@ -374,7 +374,7 @@ |
166 |
+ if (!status) |
167 |
+ { |
168 |
+ vtkErrorMacro(<< "GetTables(): Database returned error: " |
169 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
170 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
171 |
+ query->Delete(); |
172 |
+ return this->Tables; |
173 |
+ } |
174 |
+@@ -403,7 +403,7 @@ |
175 |
+ if (!status) |
176 |
+ { |
177 |
+ vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " |
178 |
+- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
179 |
++ << sqlite3_errmsg(this->SQLiteInstance) ); |
180 |
+ query->Delete(); |
181 |
+ return NULL; |
182 |
+ } |
183 |
+@@ -467,10 +467,10 @@ |
184 |
+ // ---------------------------------------------------------------------- |
185 |
+ bool vtkSQLiteDatabase::HasError() |
186 |
+ { |
187 |
+- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); |
188 |
++ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); |
189 |
+ } |
190 |
+ |
191 |
+ const char* vtkSQLiteDatabase::GetLastErrorText() |
192 |
+ { |
193 |
+- return vtk_sqlite3_errmsg(this->SQLiteInstance); |
194 |
++ return sqlite3_errmsg(this->SQLiteInstance); |
195 |
+ } |
196 |
+--- VTK/IO/SQL/vtkSQLiteQuery.cxx |
197 |
++++ VTK/IO/SQL/vtkSQLiteQuery.cxx |
198 |
+@@ -25,7 +25,7 @@ |
199 |
+ #include "vtkVariant.h" |
200 |
+ #include "vtkVariantArray.h" |
201 |
+ |
202 |
+-#include <vtksqlite/vtk_sqlite3.h> |
203 |
++#include <sqlite3.h> |
204 |
+ |
205 |
+ #include <assert.h> |
206 |
+ |
207 |
+@@ -43,7 +43,7 @@ |
208 |
+ { |
209 |
+ this->Statement = NULL; |
210 |
+ this->InitialFetch = true; |
211 |
+- this->InitialFetchResult=VTK_SQLITE_DONE; |
212 |
++ this->InitialFetchResult=SQLITE_DONE; |
213 |
+ this->LastErrorText = NULL; |
214 |
+ this->TransactionInProgress = false; |
215 |
+ } |
216 |
+@@ -61,7 +61,7 @@ |
217 |
+ { |
218 |
+ if (this->Database != NULL) |
219 |
+ { |
220 |
+- vtk_sqlite3_finalize(this->Statement); |
221 |
++ sqlite3_finalize(this->Statement); |
222 |
+ this->Statement = NULL; |
223 |
+ } |
224 |
+ } |
225 |
+@@ -131,8 +131,8 @@ |
226 |
+ if (this->Statement) |
227 |
+ { |
228 |
+ vtkDebugMacro(<<"Finalizing old statement"); |
229 |
+- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); |
230 |
+- if (finalizeStatus != VTK_SQLITE_OK) |
231 |
++ int finalizeStatus = sqlite3_finalize(this->Statement); |
232 |
++ if (finalizeStatus != SQLITE_OK) |
233 |
+ { |
234 |
+ vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " |
235 |
+ << finalizeStatus); |
236 |
+@@ -151,19 +151,19 @@ |
237 |
+ return false; |
238 |
+ } |
239 |
+ |
240 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
241 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
242 |
+ const char *unused_statement; |
243 |
+ |
244 |
+- int prepareStatus = vtk_sqlite3_prepare_v2(db, |
245 |
++ int prepareStatus = sqlite3_prepare_v2(db, |
246 |
+ this->Query, |
247 |
+ static_cast<int>(strlen(this->Query)), |
248 |
+ &this->Statement, |
249 |
+ &unused_statement); |
250 |
+ |
251 |
+- if (prepareStatus != VTK_SQLITE_OK) |
252 |
++ if (prepareStatus != SQLITE_OK) |
253 |
+ { |
254 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
255 |
+- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " |
256 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
257 |
++ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " |
258 |
+ << this->GetLastErrorText() |
259 |
+ << " on statement: '" |
260 |
+ << this->Query << "'"); |
261 |
+@@ -194,31 +194,31 @@ |
262 |
+ } |
263 |
+ else |
264 |
+ { |
265 |
+- vtk_sqlite3_reset(this->Statement); |
266 |
++ sqlite3_reset(this->Statement); |
267 |
+ } |
268 |
+ |
269 |
+ vtkDebugMacro(<<"Execute(): Query ready to execute."); |
270 |
+ |
271 |
+ this->InitialFetch = true; |
272 |
+- int result = vtk_sqlite3_step(this->Statement); |
273 |
++ int result = sqlite3_step(this->Statement); |
274 |
+ this->InitialFetchResult = result; |
275 |
+ |
276 |
+- if (result == VTK_SQLITE_DONE) |
277 |
++ if (result == SQLITE_DONE) |
278 |
+ { |
279 |
+ this->SetLastErrorText(NULL); |
280 |
+ this->Active = true; |
281 |
+ return true; |
282 |
+ } |
283 |
+- else if (result != VTK_SQLITE_ROW) |
284 |
++ else if (result != SQLITE_ROW) |
285 |
+ { |
286 |
+ vtkSQLiteDatabase *dbContainer = |
287 |
+ vtkSQLiteDatabase::SafeDownCast(this->Database); |
288 |
+ assert(dbContainer != NULL); |
289 |
+ |
290 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
291 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
292 |
+ |
293 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
294 |
+- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " |
295 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
296 |
++ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " |
297 |
+ << this->GetLastErrorText()); |
298 |
+ this->Active = false; |
299 |
+ return false; |
300 |
+@@ -239,7 +239,7 @@ |
301 |
+ } |
302 |
+ else |
303 |
+ { |
304 |
+- return vtk_sqlite3_column_count(this->Statement); |
305 |
++ return sqlite3_column_count(this->Statement); |
306 |
+ } |
307 |
+ } |
308 |
+ |
309 |
+@@ -259,7 +259,7 @@ |
310 |
+ } |
311 |
+ else |
312 |
+ { |
313 |
+- return vtk_sqlite3_column_name(this->Statement, column); |
314 |
++ return sqlite3_column_name(this->Statement, column); |
315 |
+ } |
316 |
+ } |
317 |
+ |
318 |
+@@ -279,22 +279,22 @@ |
319 |
+ } |
320 |
+ else |
321 |
+ { |
322 |
+- switch (vtk_sqlite3_column_type(this->Statement, column)) |
323 |
++ switch (sqlite3_column_type(this->Statement, column)) |
324 |
+ { |
325 |
+- case VTK_SQLITE_INTEGER: |
326 |
++ case SQLITE_INTEGER: |
327 |
+ return VTK_INT; |
328 |
+- case VTK_SQLITE_FLOAT: |
329 |
++ case SQLITE_FLOAT: |
330 |
+ return VTK_FLOAT; |
331 |
+- case VTK_SQLITE_TEXT: |
332 |
++ case SQLITE_TEXT: |
333 |
+ return VTK_STRING; |
334 |
+- case VTK_SQLITE_BLOB: |
335 |
++ case SQLITE_BLOB: |
336 |
+ return VTK_STRING; // until we have a BLOB type of our own |
337 |
+- case VTK_SQLITE_NULL: |
338 |
++ case SQLITE_NULL: |
339 |
+ return VTK_VOID; // ??? what makes sense here? |
340 |
+ default: |
341 |
+ { |
342 |
+ vtkErrorMacro(<<"GetFieldType(): Unknown data type " |
343 |
+- << vtk_sqlite3_column_type(this->Statement, column) |
344 |
++ << sqlite3_column_type(this->Statement, column) |
345 |
+ <<" from SQLite."); |
346 |
+ return VTK_VOID; |
347 |
+ } |
348 |
+@@ -315,7 +315,7 @@ |
349 |
+ { |
350 |
+ vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); |
351 |
+ this->InitialFetch = false; |
352 |
+- if (this->InitialFetchResult == VTK_SQLITE_DONE) |
353 |
++ if (this->InitialFetchResult == SQLITE_DONE) |
354 |
+ { |
355 |
+ return false; |
356 |
+ } |
357 |
+@@ -326,12 +326,12 @@ |
358 |
+ } |
359 |
+ else |
360 |
+ { |
361 |
+- int result = vtk_sqlite3_step(this->Statement); |
362 |
+- if (result == VTK_SQLITE_DONE) |
363 |
++ int result = sqlite3_step(this->Statement); |
364 |
++ if (result == SQLITE_DONE) |
365 |
+ { |
366 |
+ return false; |
367 |
+ } |
368 |
+- else if (result == VTK_SQLITE_ROW) |
369 |
++ else if (result == SQLITE_ROW) |
370 |
+ { |
371 |
+ return true; |
372 |
+ } |
373 |
+@@ -339,8 +339,8 @@ |
374 |
+ { |
375 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
376 |
+ assert(dbContainer != NULL); |
377 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
378 |
+- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
379 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
380 |
++ this->SetLastErrorText(sqlite3_errmsg(db)); |
381 |
+ vtkErrorMacro(<<"NextRow(): Database returned error code " |
382 |
+ << result << " with the following message: " |
383 |
+ << this->GetLastErrorText()); |
384 |
+@@ -366,33 +366,33 @@ |
385 |
+ } |
386 |
+ else |
387 |
+ { |
388 |
+- switch (vtk_sqlite3_column_type(this->Statement, column)) |
389 |
++ switch (sqlite3_column_type(this->Statement, column)) |
390 |
+ { |
391 |
+- case VTK_SQLITE_INTEGER: |
392 |
+- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); |
393 |
++ case SQLITE_INTEGER: |
394 |
++ return vtkVariant(sqlite3_column_int(this->Statement, column)); |
395 |
+ |
396 |
+- case VTK_SQLITE_FLOAT: |
397 |
+- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); |
398 |
++ case SQLITE_FLOAT: |
399 |
++ return vtkVariant(sqlite3_column_double(this->Statement, column)); |
400 |
+ |
401 |
+- case VTK_SQLITE_TEXT: |
402 |
++ case SQLITE_TEXT: |
403 |
+ { |
404 |
+ vtksys_ios::ostringstream str; |
405 |
+- str << vtk_sqlite3_column_text(this->Statement, column); |
406 |
++ str << sqlite3_column_text(this->Statement, column); |
407 |
+ return vtkVariant(vtkStdString(str.str())); |
408 |
+ } |
409 |
+ |
410 |
+- case VTK_SQLITE_BLOB: |
411 |
++ case SQLITE_BLOB: |
412 |
+ { |
413 |
+ // This is a hack ... by passing the BLOB to vtkStdString with an explicit |
414 |
+ // byte count, we ensure that the string will store all of the BLOB's bytes, |
415 |
+ // even if there are NULL values. |
416 |
+ |
417 |
+ return vtkVariant(vtkStdString( |
418 |
+- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), |
419 |
+- vtk_sqlite3_column_bytes(this->Statement, column))); |
420 |
++ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), |
421 |
++ sqlite3_column_bytes(this->Statement, column))); |
422 |
+ } |
423 |
+ |
424 |
+- case VTK_SQLITE_NULL: |
425 |
++ case SQLITE_NULL: |
426 |
+ default: |
427 |
+ return vtkVariant(); |
428 |
+ } |
429 |
+@@ -423,11 +423,11 @@ |
430 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
431 |
+ assert(dbContainer != NULL); |
432 |
+ |
433 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
434 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
435 |
+ char *errorMessage = NULL; |
436 |
+- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
437 |
++ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
438 |
+ |
439 |
+- if (result == VTK_SQLITE_OK) |
440 |
++ if (result == SQLITE_OK) |
441 |
+ { |
442 |
+ this->TransactionInProgress = true; |
443 |
+ this->SetLastErrorText(NULL); |
444 |
+@@ -451,7 +451,7 @@ |
445 |
+ { |
446 |
+ if (this->Statement) |
447 |
+ { |
448 |
+- vtk_sqlite3_finalize(this->Statement); |
449 |
++ sqlite3_finalize(this->Statement); |
450 |
+ this->Statement = NULL; |
451 |
+ } |
452 |
+ |
453 |
+@@ -463,11 +463,11 @@ |
454 |
+ |
455 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
456 |
+ assert(dbContainer != NULL); |
457 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
458 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
459 |
+ char *errorMessage = NULL; |
460 |
+- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
461 |
++ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
462 |
+ |
463 |
+- if (result == VTK_SQLITE_OK) |
464 |
++ if (result == SQLITE_OK) |
465 |
+ { |
466 |
+ this->TransactionInProgress = false; |
467 |
+ this->SetLastErrorText(NULL); |
468 |
+@@ -499,11 +499,11 @@ |
469 |
+ |
470 |
+ vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
471 |
+ assert(dbContainer != NULL); |
472 |
+- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
473 |
++ sqlite3 *db = dbContainer->SQLiteInstance; |
474 |
+ char *errorMessage = NULL; |
475 |
+- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
476 |
++ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
477 |
+ |
478 |
+- if (result == VTK_SQLITE_OK) |
479 |
++ if (result == SQLITE_OK) |
480 |
+ { |
481 |
+ this->TransactionInProgress = false; |
482 |
+ this->SetLastErrorText(NULL); |
483 |
+@@ -647,11 +647,11 @@ |
484 |
+ if (this->Active) |
485 |
+ { |
486 |
+ this->Active = false; |
487 |
+- vtk_sqlite3_reset(this->Statement); |
488 |
++ sqlite3_reset(this->Statement); |
489 |
+ } |
490 |
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); |
491 |
++ int status = sqlite3_bind_int(this->Statement, index+1, value); |
492 |
+ |
493 |
+- if (status != VTK_SQLITE_OK) |
494 |
++ if (status != SQLITE_OK) |
495 |
+ { |
496 |
+ vtksys_ios::ostringstream errormessage; |
497 |
+ errormessage << "sqlite_bind_int returned error: " << status; |
498 |
+@@ -676,11 +676,11 @@ |
499 |
+ if (this->Active) |
500 |
+ { |
501 |
+ this->Active = false; |
502 |
+- vtk_sqlite3_reset(this->Statement); |
503 |
++ sqlite3_reset(this->Statement); |
504 |
+ } |
505 |
+- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); |
506 |
++ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); |
507 |
+ |
508 |
+- if (status != VTK_SQLITE_OK) |
509 |
++ if (status != SQLITE_OK) |
510 |
+ { |
511 |
+ vtksys_ios::ostringstream errormessage; |
512 |
+ errormessage << "sqlite_bind_int64 returned error: " << status; |
513 |
+@@ -705,12 +705,12 @@ |
514 |
+ if (this->Active) |
515 |
+ { |
516 |
+ this->Active = false; |
517 |
+- vtk_sqlite3_reset(this->Statement); |
518 |
++ sqlite3_reset(this->Statement); |
519 |
+ } |
520 |
+ |
521 |
+- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); |
522 |
++ int status = sqlite3_bind_double(this->Statement, index+1, value); |
523 |
+ |
524 |
+- if (status != VTK_SQLITE_OK) |
525 |
++ if (status != SQLITE_OK) |
526 |
+ { |
527 |
+ vtksys_ios::ostringstream errormessage; |
528 |
+ errormessage << "sqlite_bind_double returned error: " << status; |
529 |
+@@ -734,12 +734,12 @@ |
530 |
+ if (this->Active) |
531 |
+ { |
532 |
+ this->Active = false; |
533 |
+- vtk_sqlite3_reset(this->Statement); |
534 |
++ sqlite3_reset(this->Statement); |
535 |
+ } |
536 |
+ |
537 |
+- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); |
538 |
++ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); |
539 |
+ |
540 |
+- if (status != VTK_SQLITE_OK) |
541 |
++ if (status != SQLITE_OK) |
542 |
+ { |
543 |
+ vtksys_ios::ostringstream errormessage; |
544 |
+ errormessage << "sqlite_bind_text returned error: " << status; |
545 |
+@@ -763,17 +763,17 @@ |
546 |
+ if (this->Active) |
547 |
+ { |
548 |
+ this->Active = false; |
549 |
+- vtk_sqlite3_reset(this->Statement); |
550 |
++ sqlite3_reset(this->Statement); |
551 |
+ } |
552 |
+ |
553 |
+ int status = |
554 |
+- vtk_sqlite3_bind_blob(this->Statement, |
555 |
++ sqlite3_bind_blob(this->Statement, |
556 |
+ index+1, |
557 |
+ data, |
558 |
+ length, |
559 |
+- VTK_SQLITE_TRANSIENT); |
560 |
++ SQLITE_TRANSIENT); |
561 |
+ |
562 |
+- if (status != VTK_SQLITE_OK) |
563 |
++ if (status != SQLITE_OK) |
564 |
+ { |
565 |
+ vtksys_ios::ostringstream errormessage; |
566 |
+ errormessage << "sqlite_bind_blob returned error: " << status; |
567 |
+@@ -797,12 +797,12 @@ |
568 |
+ if (this->Active) |
569 |
+ { |
570 |
+ this->Active = false; |
571 |
+- vtk_sqlite3_reset(this->Statement); |
572 |
++ sqlite3_reset(this->Statement); |
573 |
+ } |
574 |
+ |
575 |
+- int status = vtk_sqlite3_clear_bindings(this->Statement); |
576 |
++ int status = sqlite3_clear_bindings(this->Statement); |
577 |
+ |
578 |
+- if (status != VTK_SQLITE_OK) |
579 |
++ if (status != SQLITE_OK) |
580 |
+ { |
581 |
+ vtksys_ios::ostringstream errormessage; |
582 |
+ errormessage << "sqlite_clear_bindings returned error: " << status; |
583 |
+--- VTK/IO/SQL/vtkSQLiteDatabase.h |
584 |
++++ VTK/IO/SQL/vtkSQLiteDatabase.h |
585 |
+@@ -49,7 +49,7 @@ |
586 |
+ class vtkSQLQuery; |
587 |
+ class vtkSQLiteQuery; |
588 |
+ class vtkStringArray; |
589 |
+-struct vtk_sqlite3; |
590 |
++struct sqlite3; |
591 |
+ |
592 |
+ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase |
593 |
+ { |
594 |
+@@ -147,7 +147,7 @@ |
595 |
+ virtual bool ParseURL(const char* url); |
596 |
+ |
597 |
+ private: |
598 |
+- vtk_sqlite3 *SQLiteInstance; |
599 |
++ sqlite3 *SQLiteInstance; |
600 |
+ |
601 |
+ // We want this to be private, a user of this class |
602 |
+ // should not be setting this for any reason |
603 |
+--- VTK/IO/SQL/vtkSQLiteQuery.h |
604 |
++++ VTK/IO/SQL/vtkSQLiteQuery.h |
605 |
+@@ -47,7 +47,7 @@ |
606 |
+ class vtkSQLiteDatabase; |
607 |
+ class vtkVariant; |
608 |
+ class vtkVariantArray; |
609 |
+-struct vtk_sqlite3_stmt; |
610 |
++struct sqlite3_stmt; |
611 |
+ |
612 |
+ class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery |
613 |
+ { |
614 |
+@@ -155,7 +155,7 @@ |
615 |
+ vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. |
616 |
+ void operator=(const vtkSQLiteQuery &); // Not implemented. |
617 |
+ |
618 |
+- vtk_sqlite3_stmt *Statement; |
619 |
++ sqlite3_stmt *Statement; |
620 |
+ bool InitialFetch; |
621 |
+ int InitialFetchResult; |
622 |
+ char *LastErrorText; |
623 |
+--- VTK/ThirdParty/sqlite/CMakeLists.txt |
624 |
++++ VTK/ThirdParty/sqlite/CMakeLists.txt |
625 |
+@@ -1,4 +1,4 @@ |
626 |
+-set(vtksqlite_THIRD_PARTY 1) |
627 |
+-set(vtksqlite_LIBRARIES vtksqlite) |
628 |
++#set(vtksqlite_THIRD_PARTY 1) |
629 |
++set(vtksqlite_LIBRARIES sqlite3) |
630 |
+ vtk_module_export_info() |
631 |
+-add_subdirectory(vtksqlite) |
632 |
++#add_subdirectory(vtksqlite) |
633 |
|
634 |
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 |
635 |
new file mode 100644 |
636 |
index 0000000..58ddde9 |
637 |
--- /dev/null |
638 |
+++ b/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch |
639 |
@@ -0,0 +1,36 @@ |
640 |
+--- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
641 |
++++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
642 |
+@@ -82,6 +82,7 @@ |
643 |
+ FIND_PROGRAM( CG_COMPILER cgc |
644 |
+ /usr/bin |
645 |
+ /usr/local/bin |
646 |
++ /opt/nvidia-cg-toolkit/bin |
647 |
+ DOC "The Cg Compiler" |
648 |
+ ) |
649 |
+ GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
650 |
+@@ -89,6 +90,7 @@ |
651 |
+ FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
652 |
+ /usr/include |
653 |
+ /usr/local/include |
654 |
++ /opt/nvidia-cg-toolkit/include |
655 |
+ ${CG_COMPILER_SUPER_DIR}/include |
656 |
+ DOC "The directory where Cg/cg.h resides" |
657 |
+ ) |
658 |
+@@ -98,6 +100,8 @@ |
659 |
+ /usr/lib |
660 |
+ /usr/local/lib64 |
661 |
+ /usr/local/lib |
662 |
++ /opt/nvidia-cg-toolkit/lib64 |
663 |
++ /opt/nvidia-cg-toolkit/lib |
664 |
+ ${CG_COMPILER_SUPER_DIR}/lib64 |
665 |
+ ${CG_COMPILER_SUPER_DIR}/lib |
666 |
+ DOC "The Cg runtime library" |
667 |
+@@ -108,6 +112,8 @@ |
668 |
+ /usr/lib |
669 |
+ /usr/local/lib64 |
670 |
+ /usr/local/lib |
671 |
++ /opt/nvidia-cg-toolkit/lib64 |
672 |
++ /opt/nvidia-cg-toolkit/lib |
673 |
+ ${CG_COMPILER_SUPER_DIR}/lib64 |
674 |
+ ${CG_COMPILER_SUPER_DIR}/lib |
675 |
+ DOC "The Cg runtime library" |
676 |
|
677 |
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 |
678 |
new file mode 100644 |
679 |
index 0000000..65a5b20 |
680 |
--- /dev/null |
681 |
+++ b/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch |
682 |
@@ -0,0 +1,9 @@ |
683 |
+--- a/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx_orig 2014-01-11 15:02:10.000000000 +0100 |
684 |
++++ b/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2014-11-11 13:12:25.000000000 +0100 |
685 |
+@@ -28,5 +28,5 @@ |
686 |
+ // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by |
687 |
+ // the system |
688 |
+-//#define GLX_GLXEXT_LEGACY |
689 |
++#define GLX_GLXEXT_LEGACY |
690 |
+ #include "GL/glx.h" |
691 |
+ |
692 |
|
693 |
diff --git a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch |
694 |
new file mode 100644 |
695 |
index 0000000..531be2f |
696 |
--- /dev/null |
697 |
+++ b/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch |
698 |
@@ -0,0 +1,19 @@ |
699 |
+diff --git a/VTK/CMake/vtkCompilerExtras.cmake b/VTK/CMake/vtkCompilerExtras.cmake |
700 |
+index 05b2db9..48d9395 100644 |
701 |
+--- a/VTK/CMake/vtkCompilerExtras.cmake |
702 |
++++ b/VTK/CMake/vtkCompilerExtras.cmake |
703 |
+@@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
704 |
+ # If we are compiling on Linux then set some extra linker flags too |
705 |
+ if(CMAKE_SYSTEM_NAME MATCHES Linux) |
706 |
+ set(CMAKE_SHARED_LINKER_FLAGS |
707 |
+- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
708 |
++ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
709 |
+ set(CMAKE_MODULE_LINKER_FLAGS |
710 |
+- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
711 |
++ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
712 |
+ set (CMAKE_EXE_LINKER_FLAGS |
713 |
+- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
714 |
++ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
715 |
+ endif() |
716 |
+ |
717 |
+ # Now check if we can use visibility to selectively export symbols |
718 |
|
719 |
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 |
720 |
new file mode 100644 |
721 |
index 0000000..b7d3e40 |
722 |
--- /dev/null |
723 |
+++ b/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch |
724 |
@@ -0,0 +1,22 @@ |
725 |
+--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 |
726 |
++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 |
727 |
+@@ -1185,7 +1185,7 @@ |
728 |
+ if (bitmap) |
729 |
+ { |
730 |
+ metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); |
731 |
+- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), |
732 |
++ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), |
733 |
+ metaData.descent); |
734 |
+ } |
735 |
+ ++heightString; |
736 |
+@@ -1952,8 +1952,8 @@ |
737 |
+ if (bitmap) |
738 |
+ { |
739 |
+ bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); |
740 |
+- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); |
741 |
+- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); |
742 |
++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width)); |
743 |
++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); |
744 |
+ bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); |
745 |
+ } |
746 |
+ else |
747 |
|
748 |
diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
749 |
new file mode 100644 |
750 |
index 0000000..5745716 |
751 |
--- /dev/null |
752 |
+++ b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
753 |
@@ -0,0 +1,302 @@ |
754 |
+# Copyright 1999-2016 Gentoo Foundation |
755 |
+# Distributed under the terms of the GNU General Public License v2 |
756 |
+# $Id$ |
757 |
+ |
758 |
+EAPI=5 |
759 |
+ |
760 |
+PYTHON_COMPAT=( python2_7 ) |
761 |
+inherit eutils multilib versionator python-single-r1 cmake-utils |
762 |
+ |
763 |
+MAIN_PV=$(get_major_version) |
764 |
+MAJOR_PV=$(get_version_component_range 1-2) |
765 |
+MY_P="ParaView-v${PV}-source" |
766 |
+ |
767 |
+DESCRIPTION="ParaView is a powerful scientific data visualization application" |
768 |
+HOMEPAGE="http://www.paraview.org" |
769 |
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" |
770 |
+RESTRICT="mirror" |
771 |
+ |
772 |
+LICENSE="paraview GPL-2" |
773 |
+KEYWORDS="~amd64 ~x86" |
774 |
+SLOT="0" |
775 |
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" |
776 |
+RESTRICT="test" |
777 |
+ |
778 |
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) |
779 |
+ mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" |
780 |
+ |
781 |
+RDEPEND=" |
782 |
+ dev-libs/expat |
783 |
+ dev-libs/jsoncpp |
784 |
+ dev-libs/libxml2:2 |
785 |
+ <dev-libs/protobuf-2.6 |
786 |
+ media-libs/freetype |
787 |
+ media-libs/libpng:0 |
788 |
+ media-libs/libtheora |
789 |
+ media-libs/tiff:0= |
790 |
+ sci-libs/hdf5[mpi=] |
791 |
+ >=sci-libs/netcdf-4.2[hdf5] |
792 |
+ >=sci-libs/netcdf-cxx-4.2:3 |
793 |
+ sys-libs/zlib |
794 |
+ virtual/jpeg:0 |
795 |
+ virtual/opengl |
796 |
+ >=x11-libs/gl2ps-1.3.8 |
797 |
+ x11-libs/libX11 |
798 |
+ x11-libs/libXext |
799 |
+ x11-libs/libXmu |
800 |
+ x11-libs/libXt |
801 |
+ boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) |
802 |
+ coprocessing? ( |
803 |
+ plugins? ( |
804 |
+ dev-python/PyQt4 |
805 |
+ dev-qt/qtgui:4 |
806 |
+ ) |
807 |
+ ) |
808 |
+ ffmpeg? ( virtual/ffmpeg ) |
809 |
+ mpi? ( virtual/mpi[cxx,romio] ) |
810 |
+ mysql? ( virtual/mysql ) |
811 |
+ python? ( |
812 |
+ ${PYTHON_DEPS} |
813 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
814 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
815 |
+ dev-python/sip[${PYTHON_USEDEP}] |
816 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
817 |
+ dev-python/zope-interface[${PYTHON_USEDEP}] |
818 |
+ mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
819 |
+ qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) |
820 |
+ ) |
821 |
+ qt4? ( |
822 |
+ dev-qt/designer:4 |
823 |
+ dev-qt/qtgui:4 |
824 |
+ dev-qt/qtopengl:4 |
825 |
+ dev-qt/qthelp:4[compat] |
826 |
+ dev-qt/qtsql:4 |
827 |
+ dev-qt/qtwebkit:4 |
828 |
+ ) |
829 |
+ sqlite? ( dev-db/sqlite:3 ) |
830 |
+ tcl? ( dev-lang/tcl:0= ) |
831 |
+ tk? ( dev-lang/tk:0= )" |
832 |
+DEPEND="${RDEPEND} |
833 |
+ doc? ( app-doc/doxygen )" |
834 |
+ |
835 |
+S=${WORKDIR}/${MY_P%-source} |
836 |
+ |
837 |
+pkg_setup() { |
838 |
+ python-single-r1_pkg_setup |
839 |
+ PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} |
840 |
+} |
841 |
+ |
842 |
+src_prepare() { |
843 |
+ # see patch headers for description |
844 |
+ epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ |
845 |
+ "${FILESDIR}"/${PN}-4.0.1-removesqlite.patch \ |
846 |
+ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ |
847 |
+ "${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \ |
848 |
+ "${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \ |
849 |
+ "${FILESDIR}"/${P}-glxext-legacy.patch \ |
850 |
+ "${FILESDIR}"/${P}-no-fatal-warnings.patch \ |
851 |
+ "${FILESDIR}"/${P}-vtk-freetype.patch |
852 |
+ |
853 |
+ # lib64 fixes |
854 |
+ sed -i \ |
855 |
+ -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
856 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die |
857 |
+ sed -i \ |
858 |
+ -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ |
859 |
+ VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die |
860 |
+ sed -i \ |
861 |
+ -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ |
862 |
+ CMakeLists.txt \ |
863 |
+ Plugins/SciberQuestToolKit/CMakeLists.txt \ |
864 |
+ ParaViewConfig.cmake.in \ |
865 |
+ CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ |
866 |
+ ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ |
867 |
+ ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ |
868 |
+ Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ |
869 |
+ Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die |
870 |
+ |
871 |
+ # no proper switch |
872 |
+ use nvcontrol || { |
873 |
+ sed -i \ |
874 |
+ -e '/VTK_USE_NVCONTROL/s#1#0#' \ |
875 |
+ VTK/Rendering/OpenGL/CMakeLists.txt || die |
876 |
+ } |
877 |
+} |
878 |
+ |
879 |
+src_configure() { |
880 |
+ local mysql_lib mysql_includedir |
881 |
+ |
882 |
+ if use mysql ; then |
883 |
+ if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
884 |
+ mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
885 |
+ mysql_includedir="/usr/include/mysql" |
886 |
+ else |
887 |
+ mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
888 |
+ mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
889 |
+ fi |
890 |
+ fi |
891 |
+ |
892 |
+ # TODO: use system jsoncpp |
893 |
+ # VTK_USE_SYSTEM_QTTESTING |
894 |
+ # PARAVIEW_USE_SYSTEM_AUTOBAHN |
895 |
+ local mycmakeargs=( |
896 |
+ -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" |
897 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
898 |
+ -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include |
899 |
+ -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so |
900 |
+ -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so |
901 |
+ -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so |
902 |
+ -DBUILD_SHARED_LIBS=ON |
903 |
+ -DVTK_USE_SYSTEM_EXPAT=ON |
904 |
+ -DVTK_USE_SYSTEM_FREETYPE=ON |
905 |
+ -DVTK_USE_SYSTEM_GL2PS=ON |
906 |
+ -DVTK_USE_SYSTEM_HDF5=ON |
907 |
+ -DVTK_USE_SYSTEM_JPEG=ON |
908 |
+ -DVTK_USE_SYSTEM_JSONCPP=ON |
909 |
+ -DVTK_USE_SYSTEM_LIBXML2=ON |
910 |
+ -DVTK_USE_SYSTEM_NETCDF=ON |
911 |
+ -DVTK_USE_SYSTEM_OGGTHEORA=ON |
912 |
+ -DVTK_USE_SYSTEM_PNG=ON |
913 |
+ -DVTK_USE_SYSTEM_PROTOBUF=ON |
914 |
+ -DVTK_USE_SYSTEM_TIFF=ON |
915 |
+ -DVTK_USE_SYSTEM_XDMF2=OFF |
916 |
+ -DVTK_USE_SYSTEM_ZLIB=ON |
917 |
+ -DPARAVIEW_USE_SYSTEM_MPI4PY=ON |
918 |
+ -DVTK_USE_SYSTEM_ZOPE=ON |
919 |
+ -DVTK_USE_SYSTEM_TWISTED=ON |
920 |
+ -DCMAKE_VERBOSE_MAKEFILE=ON |
921 |
+ -DCMAKE_COLOR_MAKEFILE=TRUE |
922 |
+ -DVTK_USE_OFFSCREEN=TRUE |
923 |
+ -DCMAKE_USE_PTHREADS=ON |
924 |
+ -DVTK_USE_FFMPEG_ENCODER=OFF |
925 |
+ -DPROTOC_LOCATION=$(type -P protoc) |
926 |
+ -DVTK_Group_StandAlone=ON |
927 |
+ -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
928 |
+ -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
929 |
+ # force this module due to incorrect build system deps |
930 |
+ # wrt bug 460528 |
931 |
+ -DModule_vtkUtilitiesProcessXML=ON |
932 |
+ ) |
933 |
+ |
934 |
+ # TODO: XDMF_USE_MYSQL? |
935 |
+ # VTK_WRAP_JAVA |
936 |
+ mycmakeargs+=( |
937 |
+ $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
938 |
+ $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) |
939 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) |
940 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) |
941 |
+ $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) |
942 |
+ $(cmake-utils_use qt4 Module_vtkRenderingQt) |
943 |
+ $(cmake-utils_use qt4 Module_vtkViewsQt) |
944 |
+ $(cmake-utils_use qt4 VTK_Group_ParaViewQt) |
945 |
+ $(cmake-utils_use qt4 VTK_Group_Qt) |
946 |
+ $(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT) |
947 |
+ $(cmake-utils_use boost Module_vtkInfovisBoost) |
948 |
+ $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) |
949 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI) |
950 |
+ $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) |
951 |
+ $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) |
952 |
+ $(cmake-utils_use mpi VTK_Group_MPI) |
953 |
+ $(cmake-utils_use mpi VTK_XDMF_USE_MPI) |
954 |
+ $(cmake-utils_use mpi XDMF_BUILD_MPI) |
955 |
+ $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) |
956 |
+ $(cmake-utils_use python VTK_Group_ParaViewPython) |
957 |
+ $(cmake-utils_use python XDMF_WRAP_PYTHON) |
958 |
+ $(cmake-utils_use python Module_vtkPython) |
959 |
+ $(cmake-utils_use python Module_pqPython) |
960 |
+ $(cmake-utils_use python Module_vtkWrappingPythonCore) |
961 |
+ $(cmake-utils_use python Module_vtkPVPythonSupport) |
962 |
+ $(cmake-utils_use python Module_AutobahnPython) |
963 |
+ $(cmake-utils_use python Module_Twisted) |
964 |
+ $(cmake-utils_use python Module_ZopeInterface) |
965 |
+ $(cmake-utils_use python Module_vtkmpi4py) |
966 |
+ $(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") |
967 |
+ $(cmake-utils_use doc BUILD_DOCUMENTATION) |
968 |
+ $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) |
969 |
+ $(cmake-utils_use examples BUILD_EXAMPLES) |
970 |
+ $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
971 |
+ $(cmake-utils_use mysql Module_vtkIOMySQL) |
972 |
+ $(cmake-utils_use sqlite Module_vtksqlite) |
973 |
+ $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) |
974 |
+ $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) |
975 |
+ $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
976 |
+ $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) |
977 |
+ $(cmake-utils_use tk VTK_Group_Tk) |
978 |
+ $(cmake-utils_use tk VTK_USE_TK) |
979 |
+ $(cmake-utils_use tk Module_vtkRenderingTk) |
980 |
+ $(cmake-utils_use tcl Module_vtkTclTk) |
981 |
+ $(cmake-utils_use tcl Module_vtkWrappingTcl) |
982 |
+ $(cmake-utils_use test BUILD_TESTING) |
983 |
+ ) |
984 |
+ |
985 |
+ if use qt4 ; then |
986 |
+ mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) |
987 |
+ if use python ; then |
988 |
+ # paraview cannot guess sip directory properly |
989 |
+ mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) |
990 |
+ fi |
991 |
+ fi |
992 |
+ |
993 |
+ # TODO: MantaView VaporPlugin VRPlugin |
994 |
+ mycmakeargs+=( |
995 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) |
996 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) |
997 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) |
998 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) |
999 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) |
1000 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) |
1001 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |
1002 |
+ $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) |
1003 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) |
1004 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) |
1005 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) |
1006 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) |
1007 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) |
1008 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) |
1009 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) |
1010 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) |
1011 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) |
1012 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) |
1013 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) |
1014 |
+ $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) |
1015 |
+ # these are always needed for plugins |
1016 |
+ $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) |
1017 |
+ $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) |
1018 |
+ ) |
1019 |
+ |
1020 |
+ cmake-utils_src_configure |
1021 |
+} |
1022 |
+ |
1023 |
+src_compile() { |
1024 |
+ cmake-utils_src_compile |
1025 |
+} |
1026 |
+ |
1027 |
+src_install() { |
1028 |
+ cmake-utils_src_install |
1029 |
+ |
1030 |
+ # set up the environment |
1031 |
+ echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} |
1032 |
+ |
1033 |
+ newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png |
1034 |
+ make_desktop_entry paraview "Paraview" paraview |
1035 |
+ |
1036 |
+ use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} |
1037 |
+} |
1038 |
+ |
1039 |
+pkg_postinst() { |
1040 |
+ # with Qt4.5 there seem to be issues reading data files |
1041 |
+ # under certain locales. Setting LC_ALL=C should fix these. |
1042 |
+ elog "" |
1043 |
+ elog "If you experience data corruption during parsing of" |
1044 |
+ elog "data files with paraview please try setting your" |
1045 |
+ elog "locale to LC_ALL=C." |
1046 |
+ elog "If you plan to use paraview component from an existing shell" |
1047 |
+ elog "you should run env-update and . /etc/profile first" |
1048 |
+ elog "" |
1049 |
+ elog "paraview no longer exports bundled python modules in PYTHONPATH" |
1050 |
+ elog "globally due to clashes of bundled packages with system-wide" |
1051 |
+ elog "site-packages. If you want to use paraview's python modules" |
1052 |
+ elog "export" |
1053 |
+ elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" |
1054 |
+ elog "as needed." |
1055 |
+} |