1 |
commit: cf6756245d694a3a9d2d3fc3816556b7ae886ea4 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 31 21:06:31 2017 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 31 21:14:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf675624 |
7 |
|
8 |
sci-visualization/paraview: drop old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
sci-visualization/paraview/Manifest | 2 - |
13 |
.../paraview/files/paraview-4.0.1-Protobuf.patch | 72 --- |
14 |
.../paraview/files/paraview-4.0.1-gcc-4.7.patch | 28 -- |
15 |
.../files/paraview-4.0.1-removesqlite.patch | 517 ------------------- |
16 |
.../files/paraview-4.0.1-vtk-cg-path.patch | 36 -- |
17 |
.../files/paraview-4.1.0-glxext-legacy.patch | 9 - |
18 |
.../files/paraview-4.1.0-no-fatal-warnings.patch | 19 - |
19 |
.../files/paraview-4.1.0-vtk-freetype.patch | 22 - |
20 |
.../paraview-4.3.1-fix-development-install.patch | 16 - |
21 |
.../files/paraview-4.4.0-removesqlite.patch | 550 --------------------- |
22 |
.../paraview/paraview-4.1.0-r2.ebuild | 301 ----------- |
23 |
.../paraview/paraview-5.1.2-r1.ebuild | 285 ----------- |
24 |
12 files changed, 1857 deletions(-) |
25 |
|
26 |
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest |
27 |
index 59e0714fd48..3e38d76c5b2 100644 |
28 |
--- a/sci-visualization/paraview/Manifest |
29 |
+++ b/sci-visualization/paraview/Manifest |
30 |
@@ -1,3 +1 @@ |
31 |
-DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96 |
32 |
-DIST ParaView-v5.1.2.tar.gz 51635420 SHA256 ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187 SHA512 9204732ecbe5048c96536a2d63f37ec51f331416bab11c982797d07cd0233e1424193d1c8cac6dfe7e91696997f8aaf92c3a32d7b05674c0b176d93444672e40 WHIRLPOOL 1bbb95672279317304dde1f3123a51f3ca787f0f0b1a28ce09e53f0fbfdf685da89efeb2b13c0409982cbc5566e3984542eeeb519aa757bdd849186135c57a64 |
33 |
DIST ParaView-v5.2.0.tar.gz 47087129 SHA256 894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96 SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1 WHIRLPOOL bfc63e95d899e9d7be5432f5e6b6e7a68731726b199a7dd897a4bcbe242537fa5cf2210d20ef4c725ab8af92609b0fb875078ec537577a074672776771f4fd2f |
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 |
deleted file mode 100644 |
37 |
index 6a09a1ac9a7..00000000000 |
38 |
--- a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch |
39 |
+++ /dev/null |
40 |
@@ -1,72 +0,0 @@ |
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-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch |
115 |
deleted file mode 100644 |
116 |
index 1b941cfa943..00000000000 |
117 |
--- a/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch |
118 |
+++ /dev/null |
119 |
@@ -1,28 +0,0 @@ |
120 |
-Description: fix FTBFS with gcc-4.7 |
121 |
-Author: Mathieu Malaterre <malat@××××××.org> |
122 |
-Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208 |
123 |
-Reviewed-by: Anton Gladky <gladky.anton@×××××.com> |
124 |
-Last-Update: 2012-05-08 |
125 |
- |
126 |
---- a/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx |
127 |
-+++ b/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx |
128 |
-@@ -35,6 +35,8 @@ |
129 |
- using namespace ftgl; |
130 |
- #endif |
131 |
- |
132 |
-+#include <stdint.h> |
133 |
-+ |
134 |
- // Print debug info |
135 |
- #define VTK_FTFC_DEBUG 0 |
136 |
- #define VTK_FTFC_DEBUG_CD 0 |
137 |
---- a/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx |
138 |
-+++ b/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx |
139 |
-@@ -36,6 +36,8 @@ |
140 |
- using namespace ftgl; |
141 |
- #endif |
142 |
- |
143 |
-+#include <stdint.h> |
144 |
-+ |
145 |
- // Print debug info |
146 |
- |
147 |
- #define VTK_FTFC_DEBUG 0 |
148 |
|
149 |
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
150 |
deleted file mode 100644 |
151 |
index be495b4fbb3..00000000000 |
152 |
--- a/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
153 |
+++ /dev/null |
154 |
@@ -1,517 +0,0 @@ |
155 |
-Description: Import patch from VTK to remove sqlite |
156 |
-Author: Mathieu Malaterre <mathieu.malaterre@×××××.com> |
157 |
-Last-Update: Mon Feb 11 14:58:03 UTC 2013 |
158 |
- |
159 |
-remove the internal copy of sqlite (vtksqlite) |
160 |
-http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch |
161 |
- |
162 |
---- VTK/IO/SQL/vtkSQLiteDatabase.cxx |
163 |
-+++ VTK/IO/SQL/vtkSQLiteDatabase.cxx |
164 |
-@@ -29,7 +29,7 @@ |
165 |
- #include <vtksys/ios/fstream> |
166 |
- #include <vtksys/ios/sstream> |
167 |
- |
168 |
--#include <vtksqlite/vtk_sqlite3.h> |
169 |
-+#include <sqlite3.h> |
170 |
- |
171 |
- vtkStandardNewMacro(vtkSQLiteDatabase); |
172 |
- |
173 |
-@@ -307,15 +307,15 @@ |
174 |
- } |
175 |
- } |
176 |
- |
177 |
-- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
178 |
-+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
179 |
- |
180 |
-- if (result != VTK_SQLITE_OK) |
181 |
-+ if (result != SQLITE_OK) |
182 |
- { |
183 |
- vtkDebugMacro(<<"SQLite open() failed. Error code is " |
184 |
- << result << " and message is " |
185 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
186 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
187 |
- |
188 |
-- vtk_sqlite3_close(this->SQLiteInstance); |
189 |
-+ sqlite3_close(this->SQLiteInstance); |
190 |
- return false; |
191 |
- } |
192 |
- else |
193 |
-@@ -334,8 +334,8 @@ |
194 |
- } |
195 |
- else |
196 |
- { |
197 |
-- int result = vtk_sqlite3_close(this->SQLiteInstance); |
198 |
-- if (result != VTK_SQLITE_OK) |
199 |
-+ int result = sqlite3_close(this->SQLiteInstance); |
200 |
-+ if (result != SQLITE_OK) |
201 |
- { |
202 |
- vtkWarningMacro(<< "Close(): SQLite returned result code " << result); |
203 |
- } |
204 |
-@@ -374,7 +374,7 @@ |
205 |
- if (!status) |
206 |
- { |
207 |
- vtkErrorMacro(<< "GetTables(): Database returned error: " |
208 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
209 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
210 |
- query->Delete(); |
211 |
- return this->Tables; |
212 |
- } |
213 |
-@@ -403,7 +403,7 @@ |
214 |
- if (!status) |
215 |
- { |
216 |
- vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " |
217 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
218 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
219 |
- query->Delete(); |
220 |
- return NULL; |
221 |
- } |
222 |
-@@ -467,10 +467,10 @@ |
223 |
- // ---------------------------------------------------------------------- |
224 |
- bool vtkSQLiteDatabase::HasError() |
225 |
- { |
226 |
-- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); |
227 |
-+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); |
228 |
- } |
229 |
- |
230 |
- const char* vtkSQLiteDatabase::GetLastErrorText() |
231 |
- { |
232 |
-- return vtk_sqlite3_errmsg(this->SQLiteInstance); |
233 |
-+ return sqlite3_errmsg(this->SQLiteInstance); |
234 |
- } |
235 |
---- VTK/IO/SQL/vtkSQLiteQuery.cxx |
236 |
-+++ VTK/IO/SQL/vtkSQLiteQuery.cxx |
237 |
-@@ -25,7 +25,7 @@ |
238 |
- #include "vtkVariant.h" |
239 |
- #include "vtkVariantArray.h" |
240 |
- |
241 |
--#include <vtksqlite/vtk_sqlite3.h> |
242 |
-+#include <sqlite3.h> |
243 |
- |
244 |
- #include <assert.h> |
245 |
- |
246 |
-@@ -43,7 +43,7 @@ |
247 |
- { |
248 |
- this->Statement = NULL; |
249 |
- this->InitialFetch = true; |
250 |
-- this->InitialFetchResult=VTK_SQLITE_DONE; |
251 |
-+ this->InitialFetchResult=SQLITE_DONE; |
252 |
- this->LastErrorText = NULL; |
253 |
- this->TransactionInProgress = false; |
254 |
- } |
255 |
-@@ -61,7 +61,7 @@ |
256 |
- { |
257 |
- if (this->Database != NULL) |
258 |
- { |
259 |
-- vtk_sqlite3_finalize(this->Statement); |
260 |
-+ sqlite3_finalize(this->Statement); |
261 |
- this->Statement = NULL; |
262 |
- } |
263 |
- } |
264 |
-@@ -131,8 +131,8 @@ |
265 |
- if (this->Statement) |
266 |
- { |
267 |
- vtkDebugMacro(<<"Finalizing old statement"); |
268 |
-- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); |
269 |
-- if (finalizeStatus != VTK_SQLITE_OK) |
270 |
-+ int finalizeStatus = sqlite3_finalize(this->Statement); |
271 |
-+ if (finalizeStatus != SQLITE_OK) |
272 |
- { |
273 |
- vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " |
274 |
- << finalizeStatus); |
275 |
-@@ -151,19 +151,19 @@ |
276 |
- return false; |
277 |
- } |
278 |
- |
279 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
280 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
281 |
- const char *unused_statement; |
282 |
- |
283 |
-- int prepareStatus = vtk_sqlite3_prepare_v2(db, |
284 |
-+ int prepareStatus = sqlite3_prepare_v2(db, |
285 |
- this->Query, |
286 |
- static_cast<int>(strlen(this->Query)), |
287 |
- &this->Statement, |
288 |
- &unused_statement); |
289 |
- |
290 |
-- if (prepareStatus != VTK_SQLITE_OK) |
291 |
-+ if (prepareStatus != SQLITE_OK) |
292 |
- { |
293 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
294 |
-- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " |
295 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
296 |
-+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " |
297 |
- << this->GetLastErrorText() |
298 |
- << " on statement: '" |
299 |
- << this->Query << "'"); |
300 |
-@@ -194,31 +194,31 @@ |
301 |
- } |
302 |
- else |
303 |
- { |
304 |
-- vtk_sqlite3_reset(this->Statement); |
305 |
-+ sqlite3_reset(this->Statement); |
306 |
- } |
307 |
- |
308 |
- vtkDebugMacro(<<"Execute(): Query ready to execute."); |
309 |
- |
310 |
- this->InitialFetch = true; |
311 |
-- int result = vtk_sqlite3_step(this->Statement); |
312 |
-+ int result = sqlite3_step(this->Statement); |
313 |
- this->InitialFetchResult = result; |
314 |
- |
315 |
-- if (result == VTK_SQLITE_DONE) |
316 |
-+ if (result == SQLITE_DONE) |
317 |
- { |
318 |
- this->SetLastErrorText(NULL); |
319 |
- this->Active = true; |
320 |
- return true; |
321 |
- } |
322 |
-- else if (result != VTK_SQLITE_ROW) |
323 |
-+ else if (result != SQLITE_ROW) |
324 |
- { |
325 |
- vtkSQLiteDatabase *dbContainer = |
326 |
- vtkSQLiteDatabase::SafeDownCast(this->Database); |
327 |
- assert(dbContainer != NULL); |
328 |
- |
329 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
330 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
331 |
- |
332 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
333 |
-- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " |
334 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
335 |
-+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " |
336 |
- << this->GetLastErrorText()); |
337 |
- this->Active = false; |
338 |
- return false; |
339 |
-@@ -239,7 +239,7 @@ |
340 |
- } |
341 |
- else |
342 |
- { |
343 |
-- return vtk_sqlite3_column_count(this->Statement); |
344 |
-+ return sqlite3_column_count(this->Statement); |
345 |
- } |
346 |
- } |
347 |
- |
348 |
-@@ -259,7 +259,7 @@ |
349 |
- } |
350 |
- else |
351 |
- { |
352 |
-- return vtk_sqlite3_column_name(this->Statement, column); |
353 |
-+ return sqlite3_column_name(this->Statement, column); |
354 |
- } |
355 |
- } |
356 |
- |
357 |
-@@ -279,22 +279,22 @@ |
358 |
- } |
359 |
- else |
360 |
- { |
361 |
-- switch (vtk_sqlite3_column_type(this->Statement, column)) |
362 |
-+ switch (sqlite3_column_type(this->Statement, column)) |
363 |
- { |
364 |
-- case VTK_SQLITE_INTEGER: |
365 |
-+ case SQLITE_INTEGER: |
366 |
- return VTK_INT; |
367 |
-- case VTK_SQLITE_FLOAT: |
368 |
-+ case SQLITE_FLOAT: |
369 |
- return VTK_FLOAT; |
370 |
-- case VTK_SQLITE_TEXT: |
371 |
-+ case SQLITE_TEXT: |
372 |
- return VTK_STRING; |
373 |
-- case VTK_SQLITE_BLOB: |
374 |
-+ case SQLITE_BLOB: |
375 |
- return VTK_STRING; // until we have a BLOB type of our own |
376 |
-- case VTK_SQLITE_NULL: |
377 |
-+ case SQLITE_NULL: |
378 |
- return VTK_VOID; // ??? what makes sense here? |
379 |
- default: |
380 |
- { |
381 |
- vtkErrorMacro(<<"GetFieldType(): Unknown data type " |
382 |
-- << vtk_sqlite3_column_type(this->Statement, column) |
383 |
-+ << sqlite3_column_type(this->Statement, column) |
384 |
- <<" from SQLite."); |
385 |
- return VTK_VOID; |
386 |
- } |
387 |
-@@ -315,7 +315,7 @@ |
388 |
- { |
389 |
- vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); |
390 |
- this->InitialFetch = false; |
391 |
-- if (this->InitialFetchResult == VTK_SQLITE_DONE) |
392 |
-+ if (this->InitialFetchResult == SQLITE_DONE) |
393 |
- { |
394 |
- return false; |
395 |
- } |
396 |
-@@ -326,12 +326,12 @@ |
397 |
- } |
398 |
- else |
399 |
- { |
400 |
-- int result = vtk_sqlite3_step(this->Statement); |
401 |
-- if (result == VTK_SQLITE_DONE) |
402 |
-+ int result = sqlite3_step(this->Statement); |
403 |
-+ if (result == SQLITE_DONE) |
404 |
- { |
405 |
- return false; |
406 |
- } |
407 |
-- else if (result == VTK_SQLITE_ROW) |
408 |
-+ else if (result == SQLITE_ROW) |
409 |
- { |
410 |
- return true; |
411 |
- } |
412 |
-@@ -339,8 +339,8 @@ |
413 |
- { |
414 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
415 |
- assert(dbContainer != NULL); |
416 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
417 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
418 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
419 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
420 |
- vtkErrorMacro(<<"NextRow(): Database returned error code " |
421 |
- << result << " with the following message: " |
422 |
- << this->GetLastErrorText()); |
423 |
-@@ -366,33 +366,33 @@ |
424 |
- } |
425 |
- else |
426 |
- { |
427 |
-- switch (vtk_sqlite3_column_type(this->Statement, column)) |
428 |
-+ switch (sqlite3_column_type(this->Statement, column)) |
429 |
- { |
430 |
-- case VTK_SQLITE_INTEGER: |
431 |
-- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); |
432 |
-+ case SQLITE_INTEGER: |
433 |
-+ return vtkVariant(sqlite3_column_int(this->Statement, column)); |
434 |
- |
435 |
-- case VTK_SQLITE_FLOAT: |
436 |
-- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); |
437 |
-+ case SQLITE_FLOAT: |
438 |
-+ return vtkVariant(sqlite3_column_double(this->Statement, column)); |
439 |
- |
440 |
-- case VTK_SQLITE_TEXT: |
441 |
-+ case SQLITE_TEXT: |
442 |
- { |
443 |
- vtksys_ios::ostringstream str; |
444 |
-- str << vtk_sqlite3_column_text(this->Statement, column); |
445 |
-+ str << sqlite3_column_text(this->Statement, column); |
446 |
- return vtkVariant(vtkStdString(str.str())); |
447 |
- } |
448 |
- |
449 |
-- case VTK_SQLITE_BLOB: |
450 |
-+ case SQLITE_BLOB: |
451 |
- { |
452 |
- // This is a hack ... by passing the BLOB to vtkStdString with an explicit |
453 |
- // byte count, we ensure that the string will store all of the BLOB's bytes, |
454 |
- // even if there are NULL values. |
455 |
- |
456 |
- return vtkVariant(vtkStdString( |
457 |
-- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), |
458 |
-- vtk_sqlite3_column_bytes(this->Statement, column))); |
459 |
-+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), |
460 |
-+ sqlite3_column_bytes(this->Statement, column))); |
461 |
- } |
462 |
- |
463 |
-- case VTK_SQLITE_NULL: |
464 |
-+ case SQLITE_NULL: |
465 |
- default: |
466 |
- return vtkVariant(); |
467 |
- } |
468 |
-@@ -423,11 +423,11 @@ |
469 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
470 |
- assert(dbContainer != NULL); |
471 |
- |
472 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
473 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
474 |
- char *errorMessage = NULL; |
475 |
-- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
476 |
-+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
477 |
- |
478 |
-- if (result == VTK_SQLITE_OK) |
479 |
-+ if (result == SQLITE_OK) |
480 |
- { |
481 |
- this->TransactionInProgress = true; |
482 |
- this->SetLastErrorText(NULL); |
483 |
-@@ -451,7 +451,7 @@ |
484 |
- { |
485 |
- if (this->Statement) |
486 |
- { |
487 |
-- vtk_sqlite3_finalize(this->Statement); |
488 |
-+ sqlite3_finalize(this->Statement); |
489 |
- this->Statement = NULL; |
490 |
- } |
491 |
- |
492 |
-@@ -463,11 +463,11 @@ |
493 |
- |
494 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
495 |
- assert(dbContainer != NULL); |
496 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
497 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
498 |
- char *errorMessage = NULL; |
499 |
-- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
500 |
-+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
501 |
- |
502 |
-- if (result == VTK_SQLITE_OK) |
503 |
-+ if (result == SQLITE_OK) |
504 |
- { |
505 |
- this->TransactionInProgress = false; |
506 |
- this->SetLastErrorText(NULL); |
507 |
-@@ -499,11 +499,11 @@ |
508 |
- |
509 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
510 |
- assert(dbContainer != NULL); |
511 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
512 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
513 |
- char *errorMessage = NULL; |
514 |
-- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
515 |
-+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
516 |
- |
517 |
-- if (result == VTK_SQLITE_OK) |
518 |
-+ if (result == SQLITE_OK) |
519 |
- { |
520 |
- this->TransactionInProgress = false; |
521 |
- this->SetLastErrorText(NULL); |
522 |
-@@ -647,11 +647,11 @@ |
523 |
- if (this->Active) |
524 |
- { |
525 |
- this->Active = false; |
526 |
-- vtk_sqlite3_reset(this->Statement); |
527 |
-+ sqlite3_reset(this->Statement); |
528 |
- } |
529 |
-- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); |
530 |
-+ int status = sqlite3_bind_int(this->Statement, index+1, value); |
531 |
- |
532 |
-- if (status != VTK_SQLITE_OK) |
533 |
-+ if (status != SQLITE_OK) |
534 |
- { |
535 |
- vtksys_ios::ostringstream errormessage; |
536 |
- errormessage << "sqlite_bind_int returned error: " << status; |
537 |
-@@ -676,11 +676,11 @@ |
538 |
- if (this->Active) |
539 |
- { |
540 |
- this->Active = false; |
541 |
-- vtk_sqlite3_reset(this->Statement); |
542 |
-+ sqlite3_reset(this->Statement); |
543 |
- } |
544 |
-- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); |
545 |
-+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); |
546 |
- |
547 |
-- if (status != VTK_SQLITE_OK) |
548 |
-+ if (status != SQLITE_OK) |
549 |
- { |
550 |
- vtksys_ios::ostringstream errormessage; |
551 |
- errormessage << "sqlite_bind_int64 returned error: " << status; |
552 |
-@@ -705,12 +705,12 @@ |
553 |
- if (this->Active) |
554 |
- { |
555 |
- this->Active = false; |
556 |
-- vtk_sqlite3_reset(this->Statement); |
557 |
-+ sqlite3_reset(this->Statement); |
558 |
- } |
559 |
- |
560 |
-- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); |
561 |
-+ int status = sqlite3_bind_double(this->Statement, index+1, value); |
562 |
- |
563 |
-- if (status != VTK_SQLITE_OK) |
564 |
-+ if (status != SQLITE_OK) |
565 |
- { |
566 |
- vtksys_ios::ostringstream errormessage; |
567 |
- errormessage << "sqlite_bind_double returned error: " << status; |
568 |
-@@ -734,12 +734,12 @@ |
569 |
- if (this->Active) |
570 |
- { |
571 |
- this->Active = false; |
572 |
-- vtk_sqlite3_reset(this->Statement); |
573 |
-+ sqlite3_reset(this->Statement); |
574 |
- } |
575 |
- |
576 |
-- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); |
577 |
-+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); |
578 |
- |
579 |
-- if (status != VTK_SQLITE_OK) |
580 |
-+ if (status != SQLITE_OK) |
581 |
- { |
582 |
- vtksys_ios::ostringstream errormessage; |
583 |
- errormessage << "sqlite_bind_text returned error: " << status; |
584 |
-@@ -763,17 +763,17 @@ |
585 |
- if (this->Active) |
586 |
- { |
587 |
- this->Active = false; |
588 |
-- vtk_sqlite3_reset(this->Statement); |
589 |
-+ sqlite3_reset(this->Statement); |
590 |
- } |
591 |
- |
592 |
- int status = |
593 |
-- vtk_sqlite3_bind_blob(this->Statement, |
594 |
-+ sqlite3_bind_blob(this->Statement, |
595 |
- index+1, |
596 |
- data, |
597 |
- length, |
598 |
-- VTK_SQLITE_TRANSIENT); |
599 |
-+ SQLITE_TRANSIENT); |
600 |
- |
601 |
-- if (status != VTK_SQLITE_OK) |
602 |
-+ if (status != SQLITE_OK) |
603 |
- { |
604 |
- vtksys_ios::ostringstream errormessage; |
605 |
- errormessage << "sqlite_bind_blob returned error: " << status; |
606 |
-@@ -797,12 +797,12 @@ |
607 |
- if (this->Active) |
608 |
- { |
609 |
- this->Active = false; |
610 |
-- vtk_sqlite3_reset(this->Statement); |
611 |
-+ sqlite3_reset(this->Statement); |
612 |
- } |
613 |
- |
614 |
-- int status = vtk_sqlite3_clear_bindings(this->Statement); |
615 |
-+ int status = sqlite3_clear_bindings(this->Statement); |
616 |
- |
617 |
-- if (status != VTK_SQLITE_OK) |
618 |
-+ if (status != SQLITE_OK) |
619 |
- { |
620 |
- vtksys_ios::ostringstream errormessage; |
621 |
- errormessage << "sqlite_clear_bindings returned error: " << status; |
622 |
---- VTK/IO/SQL/vtkSQLiteDatabase.h |
623 |
-+++ VTK/IO/SQL/vtkSQLiteDatabase.h |
624 |
-@@ -49,7 +49,7 @@ |
625 |
- class vtkSQLQuery; |
626 |
- class vtkSQLiteQuery; |
627 |
- class vtkStringArray; |
628 |
--struct vtk_sqlite3; |
629 |
-+struct sqlite3; |
630 |
- |
631 |
- class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase |
632 |
- { |
633 |
-@@ -147,7 +147,7 @@ |
634 |
- virtual bool ParseURL(const char* url); |
635 |
- |
636 |
- private: |
637 |
-- vtk_sqlite3 *SQLiteInstance; |
638 |
-+ sqlite3 *SQLiteInstance; |
639 |
- |
640 |
- // We want this to be private, a user of this class |
641 |
- // should not be setting this for any reason |
642 |
---- VTK/IO/SQL/vtkSQLiteQuery.h |
643 |
-+++ VTK/IO/SQL/vtkSQLiteQuery.h |
644 |
-@@ -47,7 +47,7 @@ |
645 |
- class vtkSQLiteDatabase; |
646 |
- class vtkVariant; |
647 |
- class vtkVariantArray; |
648 |
--struct vtk_sqlite3_stmt; |
649 |
-+struct sqlite3_stmt; |
650 |
- |
651 |
- class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery |
652 |
- { |
653 |
-@@ -155,7 +155,7 @@ |
654 |
- vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. |
655 |
- void operator=(const vtkSQLiteQuery &); // Not implemented. |
656 |
- |
657 |
-- vtk_sqlite3_stmt *Statement; |
658 |
-+ sqlite3_stmt *Statement; |
659 |
- bool InitialFetch; |
660 |
- int InitialFetchResult; |
661 |
- char *LastErrorText; |
662 |
---- VTK/ThirdParty/sqlite/CMakeLists.txt |
663 |
-+++ VTK/ThirdParty/sqlite/CMakeLists.txt |
664 |
-@@ -1,4 +1,4 @@ |
665 |
--set(vtksqlite_THIRD_PARTY 1) |
666 |
--set(vtksqlite_LIBRARIES vtksqlite) |
667 |
-+#set(vtksqlite_THIRD_PARTY 1) |
668 |
-+set(vtksqlite_LIBRARIES sqlite3) |
669 |
- vtk_module_export_info() |
670 |
--add_subdirectory(vtksqlite) |
671 |
-+#add_subdirectory(vtksqlite) |
672 |
|
673 |
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 |
674 |
deleted file mode 100644 |
675 |
index 58ddde97d4f..00000000000 |
676 |
--- a/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch |
677 |
+++ /dev/null |
678 |
@@ -1,36 +0,0 @@ |
679 |
---- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
680 |
-+++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
681 |
-@@ -82,6 +82,7 @@ |
682 |
- FIND_PROGRAM( CG_COMPILER cgc |
683 |
- /usr/bin |
684 |
- /usr/local/bin |
685 |
-+ /opt/nvidia-cg-toolkit/bin |
686 |
- DOC "The Cg Compiler" |
687 |
- ) |
688 |
- GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
689 |
-@@ -89,6 +90,7 @@ |
690 |
- FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
691 |
- /usr/include |
692 |
- /usr/local/include |
693 |
-+ /opt/nvidia-cg-toolkit/include |
694 |
- ${CG_COMPILER_SUPER_DIR}/include |
695 |
- DOC "The directory where Cg/cg.h resides" |
696 |
- ) |
697 |
-@@ -98,6 +100,8 @@ |
698 |
- /usr/lib |
699 |
- /usr/local/lib64 |
700 |
- /usr/local/lib |
701 |
-+ /opt/nvidia-cg-toolkit/lib64 |
702 |
-+ /opt/nvidia-cg-toolkit/lib |
703 |
- ${CG_COMPILER_SUPER_DIR}/lib64 |
704 |
- ${CG_COMPILER_SUPER_DIR}/lib |
705 |
- DOC "The Cg runtime library" |
706 |
-@@ -108,6 +112,8 @@ |
707 |
- /usr/lib |
708 |
- /usr/local/lib64 |
709 |
- /usr/local/lib |
710 |
-+ /opt/nvidia-cg-toolkit/lib64 |
711 |
-+ /opt/nvidia-cg-toolkit/lib |
712 |
- ${CG_COMPILER_SUPER_DIR}/lib64 |
713 |
- ${CG_COMPILER_SUPER_DIR}/lib |
714 |
- DOC "The Cg runtime library" |
715 |
|
716 |
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 |
717 |
deleted file mode 100644 |
718 |
index 65a5b20d60f..00000000000 |
719 |
--- a/sci-visualization/paraview/files/paraview-4.1.0-glxext-legacy.patch |
720 |
+++ /dev/null |
721 |
@@ -1,9 +0,0 @@ |
722 |
---- a/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx_orig 2014-01-11 15:02:10.000000000 +0100 |
723 |
-+++ b/ParaView-v4.1.0/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx 2014-11-11 13:12:25.000000000 +0100 |
724 |
-@@ -28,5 +28,5 @@ |
725 |
- // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by |
726 |
- // the system |
727 |
--//#define GLX_GLXEXT_LEGACY |
728 |
-+#define GLX_GLXEXT_LEGACY |
729 |
- #include "GL/glx.h" |
730 |
- |
731 |
|
732 |
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 |
733 |
deleted file mode 100644 |
734 |
index 531be2f614f..00000000000 |
735 |
--- a/sci-visualization/paraview/files/paraview-4.1.0-no-fatal-warnings.patch |
736 |
+++ /dev/null |
737 |
@@ -1,19 +0,0 @@ |
738 |
-diff --git a/VTK/CMake/vtkCompilerExtras.cmake b/VTK/CMake/vtkCompilerExtras.cmake |
739 |
-index 05b2db9..48d9395 100644 |
740 |
---- a/VTK/CMake/vtkCompilerExtras.cmake |
741 |
-+++ b/VTK/CMake/vtkCompilerExtras.cmake |
742 |
-@@ -15,11 +15,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
743 |
- # If we are compiling on Linux then set some extra linker flags too |
744 |
- if(CMAKE_SYSTEM_NAME MATCHES Linux) |
745 |
- set(CMAKE_SHARED_LINKER_FLAGS |
746 |
-- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
747 |
-+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
748 |
- set(CMAKE_MODULE_LINKER_FLAGS |
749 |
-- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
750 |
-+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
751 |
- set (CMAKE_EXE_LINKER_FLAGS |
752 |
-- "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
753 |
-+ "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
754 |
- endif() |
755 |
- |
756 |
- # Now check if we can use visibility to selectively export symbols |
757 |
|
758 |
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 |
759 |
deleted file mode 100644 |
760 |
index b7d3e409cde..00000000000 |
761 |
--- a/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch |
762 |
+++ /dev/null |
763 |
@@ -1,22 +0,0 @@ |
764 |
---- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 |
765 |
-+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 |
766 |
-@@ -1185,7 +1185,7 @@ |
767 |
- if (bitmap) |
768 |
- { |
769 |
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); |
770 |
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), |
771 |
-+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), |
772 |
- metaData.descent); |
773 |
- } |
774 |
- ++heightString; |
775 |
-@@ -1952,8 +1952,8 @@ |
776 |
- if (bitmap) |
777 |
- { |
778 |
- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); |
779 |
-- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); |
780 |
-- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); |
781 |
-+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width)); |
782 |
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); |
783 |
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); |
784 |
- } |
785 |
- else |
786 |
|
787 |
diff --git a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch b/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch |
788 |
deleted file mode 100644 |
789 |
index 4bc5e546fc9..00000000000 |
790 |
--- a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch |
791 |
+++ /dev/null |
792 |
@@ -1,16 +0,0 @@ |
793 |
-https://bugs.gentoo.org/show_bug.cgi?id=560670 |
794 |
-http://www.paraview.org/Bug/view.php?id=15655 |
795 |
- |
796 |
-diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt |
797 |
-index c45b4bf..8616a90 100644 |
798 |
---- a/Qt/Components/CMakeLists.txt |
799 |
-+++ b/Qt/Components/CMakeLists.txt |
800 |
-@@ -650,7 +650,7 @@ vtk_module_library(${vtk-module} |
801 |
- #the pqSGExportStateWizard has subclasses that directly access |
802 |
- #the UI file, and currently we don't have a clean way to break this hard |
803 |
- #dependency, so for no we install this ui file. |
804 |
--if(PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
805 |
-+if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON) |
806 |
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h" |
807 |
- DESTINATION "${VTK_INSTALL_INCLUDE_DIR}") |
808 |
- endif() |
809 |
|
810 |
diff --git a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch |
811 |
deleted file mode 100644 |
812 |
index 6016b8d7337..00000000000 |
813 |
--- a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch |
814 |
+++ /dev/null |
815 |
@@ -1,550 +0,0 @@ |
816 |
-diff --git a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt |
817 |
-index a62a0b3..25089d9 100644 |
818 |
---- a/VTK/IO/SQL/CMakeLists.txt |
819 |
-+++ b/VTK/IO/SQL/CMakeLists.txt |
820 |
-@@ -28,3 +28,4 @@ set_source_files_properties( |
821 |
- ) |
822 |
- |
823 |
- vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS}) |
824 |
-+target_link_libraries(vtkIOSQL -lsqlite3) |
825 |
-diff --git a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake |
826 |
-index f00bfd0..db7792f 100644 |
827 |
---- a/VTK/IO/SQL/module.cmake |
828 |
-+++ b/VTK/IO/SQL/module.cmake |
829 |
-@@ -5,7 +5,7 @@ vtk_module(vtkIOSQL |
830 |
- vtkIOCore |
831 |
- PRIVATE_DEPENDS |
832 |
- vtksys |
833 |
-- vtksqlite # We should consider splitting this into a module. |
834 |
-+# vtksqlite # We should consider splitting this into a module. |
835 |
- TEST_DEPENDS |
836 |
- vtkIOLegacy |
837 |
- vtkTestingIOSQL |
838 |
-diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx |
839 |
-index 8651670..07acfc2 100644 |
840 |
---- a/VTK/IO/SQL/vtkSQLiteDatabase.cxx |
841 |
-+++ b/VTK/IO/SQL/vtkSQLiteDatabase.cxx |
842 |
-@@ -29,7 +29,7 @@ |
843 |
- #include <fstream> |
844 |
- #include <sstream> |
845 |
- |
846 |
--#include <vtksqlite/vtk_sqlite3.h> |
847 |
-+#include <sqlite3.h> |
848 |
- |
849 |
- vtkStandardNewMacro(vtkSQLiteDatabase); |
850 |
- |
851 |
-@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode) |
852 |
- } |
853 |
- } |
854 |
- |
855 |
-- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
856 |
-+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
857 |
- |
858 |
-- if (result != VTK_SQLITE_OK) |
859 |
-+ if (result != SQLITE_OK) |
860 |
- { |
861 |
- vtkDebugMacro(<<"SQLite open() failed. Error code is " |
862 |
- << result << " and message is " |
863 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
864 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
865 |
- |
866 |
-- vtk_sqlite3_close(this->SQLiteInstance); |
867 |
-+ sqlite3_close(this->SQLiteInstance); |
868 |
- return false; |
869 |
- } |
870 |
- else |
871 |
-@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close() |
872 |
- } |
873 |
- else |
874 |
- { |
875 |
-- int result = vtk_sqlite3_close(this->SQLiteInstance); |
876 |
-- if (result != VTK_SQLITE_OK) |
877 |
-+ int result = sqlite3_close(this->SQLiteInstance); |
878 |
-+ if (result != SQLITE_OK) |
879 |
- { |
880 |
- vtkWarningMacro(<< "Close(): SQLite returned result code " << result); |
881 |
- } |
882 |
-@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetTables() |
883 |
- if (!status) |
884 |
- { |
885 |
- vtkErrorMacro(<< "GetTables(): Database returned error: " |
886 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
887 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
888 |
- query->Delete(); |
889 |
- return this->Tables; |
890 |
- } |
891 |
-@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetRecord(const char *table) |
892 |
- if (!status) |
893 |
- { |
894 |
- vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " |
895 |
-- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
896 |
-+ << sqlite3_errmsg(this->SQLiteInstance) ); |
897 |
- query->Delete(); |
898 |
- return NULL; |
899 |
- } |
900 |
-@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const char* URL) |
901 |
- // ---------------------------------------------------------------------- |
902 |
- bool vtkSQLiteDatabase::HasError() |
903 |
- { |
904 |
-- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); |
905 |
-+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); |
906 |
- } |
907 |
- |
908 |
- const char* vtkSQLiteDatabase::GetLastErrorText() |
909 |
- { |
910 |
-- return vtk_sqlite3_errmsg(this->SQLiteInstance); |
911 |
-+ return sqlite3_errmsg(this->SQLiteInstance); |
912 |
- } |
913 |
-diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.h b/VTK/IO/SQL/vtkSQLiteDatabase.h |
914 |
-index 640355a..3e8cd57 100644 |
915 |
---- a/VTK/IO/SQL/vtkSQLiteDatabase.h |
916 |
-+++ b/VTK/IO/SQL/vtkSQLiteDatabase.h |
917 |
-@@ -49,7 +49,7 @@ |
918 |
- class vtkSQLQuery; |
919 |
- class vtkSQLiteQuery; |
920 |
- class vtkStringArray; |
921 |
--struct vtk_sqlite3; |
922 |
-+struct sqlite3; |
923 |
- |
924 |
- class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase |
925 |
- { |
926 |
-@@ -147,7 +147,7 @@ protected: |
927 |
- virtual bool ParseURL(const char* url); |
928 |
- |
929 |
- private: |
930 |
-- vtk_sqlite3 *SQLiteInstance; |
931 |
-+ sqlite3 *SQLiteInstance; |
932 |
- |
933 |
- // We want this to be private, a user of this class |
934 |
- // should not be setting this for any reason |
935 |
-diff --git a/VTK/IO/SQL/vtkSQLiteQuery.cxx b/VTK/IO/SQL/vtkSQLiteQuery.cxx |
936 |
-index 31a15f1..ea12405 100644 |
937 |
---- a/VTK/IO/SQL/vtkSQLiteQuery.cxx |
938 |
-+++ b/VTK/IO/SQL/vtkSQLiteQuery.cxx |
939 |
-@@ -25,7 +25,7 @@ |
940 |
- #include "vtkVariant.h" |
941 |
- #include "vtkVariantArray.h" |
942 |
- |
943 |
--#include <vtksqlite/vtk_sqlite3.h> |
944 |
-+#include <sqlite3.h> |
945 |
- |
946 |
- #include <cassert> |
947 |
- |
948 |
-@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery() |
949 |
- { |
950 |
- this->Statement = NULL; |
951 |
- this->InitialFetch = true; |
952 |
-- this->InitialFetchResult=VTK_SQLITE_DONE; |
953 |
-+ this->InitialFetchResult=SQLITE_DONE; |
954 |
- this->LastErrorText = NULL; |
955 |
- this->TransactionInProgress = false; |
956 |
- } |
957 |
-@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery() |
958 |
- { |
959 |
- if (this->Database != NULL) |
960 |
- { |
961 |
-- vtk_sqlite3_finalize(this->Statement); |
962 |
-+ sqlite3_finalize(this->Statement); |
963 |
- this->Statement = NULL; |
964 |
- } |
965 |
- } |
966 |
-@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery) |
967 |
- if (this->Statement) |
968 |
- { |
969 |
- vtkDebugMacro(<<"Finalizing old statement"); |
970 |
-- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); |
971 |
-- if (finalizeStatus != VTK_SQLITE_OK) |
972 |
-+ int finalizeStatus = sqlite3_finalize(this->Statement); |
973 |
-+ if (finalizeStatus != SQLITE_OK) |
974 |
- { |
975 |
- vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " |
976 |
- << finalizeStatus); |
977 |
-@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char *newQuery) |
978 |
- return false; |
979 |
- } |
980 |
- |
981 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
982 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
983 |
- const char *unused_statement; |
984 |
- |
985 |
-- int prepareStatus = vtk_sqlite3_prepare_v2(db, |
986 |
-+ int prepareStatus = sqlite3_prepare_v2(db, |
987 |
- this->Query, |
988 |
- static_cast<int>(strlen(this->Query)), |
989 |
- &this->Statement, |
990 |
- &unused_statement); |
991 |
- |
992 |
-- if (prepareStatus != VTK_SQLITE_OK) |
993 |
-+ if (prepareStatus != SQLITE_OK) |
994 |
- { |
995 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
996 |
-- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " |
997 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
998 |
-+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " |
999 |
- << this->GetLastErrorText() |
1000 |
- << " on statement: '" |
1001 |
- << this->Query << "'"); |
1002 |
-@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute() |
1003 |
- } |
1004 |
- else |
1005 |
- { |
1006 |
-- vtk_sqlite3_reset(this->Statement); |
1007 |
-+ sqlite3_reset(this->Statement); |
1008 |
- } |
1009 |
- |
1010 |
- vtkDebugMacro(<<"Execute(): Query ready to execute."); |
1011 |
- |
1012 |
- this->InitialFetch = true; |
1013 |
-- int result = vtk_sqlite3_step(this->Statement); |
1014 |
-+ int result = sqlite3_step(this->Statement); |
1015 |
- this->InitialFetchResult = result; |
1016 |
- |
1017 |
-- if (result == VTK_SQLITE_DONE) |
1018 |
-+ if (result == SQLITE_DONE) |
1019 |
- { |
1020 |
- this->SetLastErrorText(NULL); |
1021 |
- this->Active = true; |
1022 |
- return true; |
1023 |
- } |
1024 |
-- else if (result != VTK_SQLITE_ROW) |
1025 |
-+ else if (result != SQLITE_ROW) |
1026 |
- { |
1027 |
- vtkSQLiteDatabase *dbContainer = |
1028 |
- vtkSQLiteDatabase::SafeDownCast(this->Database); |
1029 |
- assert(dbContainer != NULL); |
1030 |
- |
1031 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
1032 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
1033 |
- |
1034 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
1035 |
-- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " |
1036 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
1037 |
-+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " |
1038 |
- << this->GetLastErrorText()); |
1039 |
- this->Active = false; |
1040 |
- return false; |
1041 |
-@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields() |
1042 |
- } |
1043 |
- else |
1044 |
- { |
1045 |
-- return vtk_sqlite3_column_count(this->Statement); |
1046 |
-+ return sqlite3_column_count(this->Statement); |
1047 |
- } |
1048 |
- } |
1049 |
- |
1050 |
-@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldName(int column) |
1051 |
- } |
1052 |
- else |
1053 |
- { |
1054 |
-- return vtk_sqlite3_column_name(this->Statement, column); |
1055 |
-+ return sqlite3_column_name(this->Statement, column); |
1056 |
- } |
1057 |
- } |
1058 |
- |
1059 |
-@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int column) |
1060 |
- } |
1061 |
- else |
1062 |
- { |
1063 |
-- switch (vtk_sqlite3_column_type(this->Statement, column)) |
1064 |
-+ switch (sqlite3_column_type(this->Statement, column)) |
1065 |
- { |
1066 |
-- case VTK_SQLITE_INTEGER: |
1067 |
-+ case SQLITE_INTEGER: |
1068 |
- return VTK_INT; |
1069 |
-- case VTK_SQLITE_FLOAT: |
1070 |
-+ case SQLITE_FLOAT: |
1071 |
- return VTK_FLOAT; |
1072 |
-- case VTK_SQLITE_TEXT: |
1073 |
-+ case SQLITE_TEXT: |
1074 |
- return VTK_STRING; |
1075 |
-- case VTK_SQLITE_BLOB: |
1076 |
-+ case SQLITE_BLOB: |
1077 |
- return VTK_STRING; // until we have a BLOB type of our own |
1078 |
-- case VTK_SQLITE_NULL: |
1079 |
-+ case SQLITE_NULL: |
1080 |
- return VTK_VOID; // ??? what makes sense here? |
1081 |
- default: |
1082 |
- { |
1083 |
- vtkErrorMacro(<<"GetFieldType(): Unknown data type " |
1084 |
-- << vtk_sqlite3_column_type(this->Statement, column) |
1085 |
-+ << sqlite3_column_type(this->Statement, column) |
1086 |
- <<" from SQLite."); |
1087 |
- return VTK_VOID; |
1088 |
- } |
1089 |
-@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow() |
1090 |
- { |
1091 |
- vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); |
1092 |
- this->InitialFetch = false; |
1093 |
-- if (this->InitialFetchResult == VTK_SQLITE_DONE) |
1094 |
-+ if (this->InitialFetchResult == SQLITE_DONE) |
1095 |
- { |
1096 |
- return false; |
1097 |
- } |
1098 |
-@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow() |
1099 |
- } |
1100 |
- else |
1101 |
- { |
1102 |
-- int result = vtk_sqlite3_step(this->Statement); |
1103 |
-- if (result == VTK_SQLITE_DONE) |
1104 |
-+ int result = sqlite3_step(this->Statement); |
1105 |
-+ if (result == SQLITE_DONE) |
1106 |
- { |
1107 |
- return false; |
1108 |
- } |
1109 |
-- else if (result == VTK_SQLITE_ROW) |
1110 |
-+ else if (result == SQLITE_ROW) |
1111 |
- { |
1112 |
- return true; |
1113 |
- } |
1114 |
-@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow() |
1115 |
- { |
1116 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
1117 |
- assert(dbContainer != NULL); |
1118 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
1119 |
-- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
1120 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
1121 |
-+ this->SetLastErrorText(sqlite3_errmsg(db)); |
1122 |
- vtkErrorMacro(<<"NextRow(): Database returned error code " |
1123 |
- << result << " with the following message: " |
1124 |
- << this->GetLastErrorText()); |
1125 |
-@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtkIdType column) |
1126 |
- } |
1127 |
- else |
1128 |
- { |
1129 |
-- switch (vtk_sqlite3_column_type(this->Statement, column)) |
1130 |
-+ switch (sqlite3_column_type(this->Statement, column)) |
1131 |
- { |
1132 |
-- case VTK_SQLITE_INTEGER: |
1133 |
-- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); |
1134 |
-+ case SQLITE_INTEGER: |
1135 |
-+ return vtkVariant(sqlite3_column_int(this->Statement, column)); |
1136 |
- |
1137 |
-- case VTK_SQLITE_FLOAT: |
1138 |
-- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); |
1139 |
-+ case SQLITE_FLOAT: |
1140 |
-+ return vtkVariant(sqlite3_column_double(this->Statement, column)); |
1141 |
- |
1142 |
-- case VTK_SQLITE_TEXT: |
1143 |
-+ case SQLITE_TEXT: |
1144 |
- { |
1145 |
- std::ostringstream str; |
1146 |
-- str << vtk_sqlite3_column_text(this->Statement, column); |
1147 |
-+ str << sqlite3_column_text(this->Statement, column); |
1148 |
- return vtkVariant(vtkStdString(str.str())); |
1149 |
- } |
1150 |
- |
1151 |
-- case VTK_SQLITE_BLOB: |
1152 |
-+ case SQLITE_BLOB: |
1153 |
- { |
1154 |
- // This is a hack ... by passing the BLOB to vtkStdString with an explicit |
1155 |
- // byte count, we ensure that the string will store all of the BLOB's bytes, |
1156 |
- // even if there are NULL values. |
1157 |
- |
1158 |
- return vtkVariant(vtkStdString( |
1159 |
-- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), |
1160 |
-- vtk_sqlite3_column_bytes(this->Statement, column))); |
1161 |
-+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), |
1162 |
-+ sqlite3_column_bytes(this->Statement, column))); |
1163 |
- } |
1164 |
- |
1165 |
-- case VTK_SQLITE_NULL: |
1166 |
-+ case SQLITE_NULL: |
1167 |
- default: |
1168 |
- return vtkVariant(); |
1169 |
- } |
1170 |
-@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction() |
1171 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
1172 |
- assert(dbContainer != NULL); |
1173 |
- |
1174 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
1175 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
1176 |
- char *errorMessage = NULL; |
1177 |
-- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
1178 |
-+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
1179 |
- |
1180 |
-- if (result == VTK_SQLITE_OK) |
1181 |
-+ if (result == SQLITE_OK) |
1182 |
- { |
1183 |
- this->TransactionInProgress = true; |
1184 |
- this->SetLastErrorText(NULL); |
1185 |
-@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction() |
1186 |
- { |
1187 |
- if (this->Statement) |
1188 |
- { |
1189 |
-- vtk_sqlite3_finalize(this->Statement); |
1190 |
-+ sqlite3_finalize(this->Statement); |
1191 |
- this->Statement = NULL; |
1192 |
- } |
1193 |
- |
1194 |
-@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction() |
1195 |
- |
1196 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
1197 |
- assert(dbContainer != NULL); |
1198 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
1199 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
1200 |
- char *errorMessage = NULL; |
1201 |
-- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
1202 |
-+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
1203 |
- |
1204 |
-- if (result == VTK_SQLITE_OK) |
1205 |
-+ if (result == SQLITE_OK) |
1206 |
- { |
1207 |
- this->TransactionInProgress = false; |
1208 |
- this->SetLastErrorText(NULL); |
1209 |
-@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction() |
1210 |
- |
1211 |
- vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
1212 |
- assert(dbContainer != NULL); |
1213 |
-- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
1214 |
-+ sqlite3 *db = dbContainer->SQLiteInstance; |
1215 |
- char *errorMessage = NULL; |
1216 |
-- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
1217 |
-+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
1218 |
- |
1219 |
-- if (result == VTK_SQLITE_OK) |
1220 |
-+ if (result == SQLITE_OK) |
1221 |
- { |
1222 |
- this->TransactionInProgress = false; |
1223 |
- this->SetLastErrorText(NULL); |
1224 |
-@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParameter(int index, int value) |
1225 |
- if (this->Active) |
1226 |
- { |
1227 |
- this->Active = false; |
1228 |
-- vtk_sqlite3_reset(this->Statement); |
1229 |
-+ sqlite3_reset(this->Statement); |
1230 |
- } |
1231 |
-- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); |
1232 |
-+ int status = sqlite3_bind_int(this->Statement, index+1, value); |
1233 |
- |
1234 |
-- if (status != VTK_SQLITE_OK) |
1235 |
-+ if (status != SQLITE_OK) |
1236 |
- { |
1237 |
- std::ostringstream errormessage; |
1238 |
- errormessage << "sqlite_bind_int returned error: " << status; |
1239 |
-@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(int index, vtkTypeInt64 value) |
1240 |
- if (this->Active) |
1241 |
- { |
1242 |
- this->Active = false; |
1243 |
-- vtk_sqlite3_reset(this->Statement); |
1244 |
-+ sqlite3_reset(this->Statement); |
1245 |
- } |
1246 |
-- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); |
1247 |
-+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); |
1248 |
- |
1249 |
-- if (status != VTK_SQLITE_OK) |
1250 |
-+ if (status != SQLITE_OK) |
1251 |
- { |
1252 |
- std::ostringstream errormessage; |
1253 |
- errormessage << "sqlite_bind_int64 returned error: " << status; |
1254 |
-@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter(int index, double value) |
1255 |
- if (this->Active) |
1256 |
- { |
1257 |
- this->Active = false; |
1258 |
-- vtk_sqlite3_reset(this->Statement); |
1259 |
-+ sqlite3_reset(this->Statement); |
1260 |
- } |
1261 |
- |
1262 |
-- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); |
1263 |
-+ int status = sqlite3_bind_double(this->Statement, index+1, value); |
1264 |
- |
1265 |
-- if (status != VTK_SQLITE_OK) |
1266 |
-+ if (status != SQLITE_OK) |
1267 |
- { |
1268 |
- std::ostringstream errormessage; |
1269 |
- errormessage << "sqlite_bind_double returned error: " << status; |
1270 |
-@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter(int index, const char *value, int lengt |
1271 |
- if (this->Active) |
1272 |
- { |
1273 |
- this->Active = false; |
1274 |
-- vtk_sqlite3_reset(this->Statement); |
1275 |
-+ sqlite3_reset(this->Statement); |
1276 |
- } |
1277 |
- |
1278 |
-- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); |
1279 |
-+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); |
1280 |
- |
1281 |
-- if (status != VTK_SQLITE_OK) |
1282 |
-+ if (status != SQLITE_OK) |
1283 |
- { |
1284 |
- std::ostringstream errormessage; |
1285 |
- errormessage << "sqlite_bind_text returned error: " << status; |
1286 |
-@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(int index, const void *data, int length) |
1287 |
- if (this->Active) |
1288 |
- { |
1289 |
- this->Active = false; |
1290 |
-- vtk_sqlite3_reset(this->Statement); |
1291 |
-+ sqlite3_reset(this->Statement); |
1292 |
- } |
1293 |
- |
1294 |
- int status = |
1295 |
-- vtk_sqlite3_bind_blob(this->Statement, |
1296 |
-+ sqlite3_bind_blob(this->Statement, |
1297 |
- index+1, |
1298 |
- data, |
1299 |
- length, |
1300 |
-- VTK_SQLITE_TRANSIENT); |
1301 |
-+ SQLITE_TRANSIENT); |
1302 |
- |
1303 |
-- if (status != VTK_SQLITE_OK) |
1304 |
-+ if (status != SQLITE_OK) |
1305 |
- { |
1306 |
- std::ostringstream errormessage; |
1307 |
- errormessage << "sqlite_bind_blob returned error: " << status; |
1308 |
-@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindings() |
1309 |
- if (this->Active) |
1310 |
- { |
1311 |
- this->Active = false; |
1312 |
-- vtk_sqlite3_reset(this->Statement); |
1313 |
-+ sqlite3_reset(this->Statement); |
1314 |
- } |
1315 |
- |
1316 |
-- int status = vtk_sqlite3_clear_bindings(this->Statement); |
1317 |
-+ int status = sqlite3_clear_bindings(this->Statement); |
1318 |
- |
1319 |
-- if (status != VTK_SQLITE_OK) |
1320 |
-+ if (status != SQLITE_OK) |
1321 |
- { |
1322 |
- std::ostringstream errormessage; |
1323 |
- errormessage << "sqlite_clear_bindings returned error: " << status; |
1324 |
-diff --git a/VTK/IO/SQL/vtkSQLiteQuery.h b/VTK/IO/SQL/vtkSQLiteQuery.h |
1325 |
-index bfab39a..db4deb4 100644 |
1326 |
---- a/VTK/IO/SQL/vtkSQLiteQuery.h |
1327 |
-+++ b/VTK/IO/SQL/vtkSQLiteQuery.h |
1328 |
-@@ -47,7 +47,7 @@ |
1329 |
- class vtkSQLiteDatabase; |
1330 |
- class vtkVariant; |
1331 |
- class vtkVariantArray; |
1332 |
--struct vtk_sqlite3_stmt; |
1333 |
-+struct sqlite3_stmt; |
1334 |
- |
1335 |
- class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery |
1336 |
- { |
1337 |
-@@ -155,7 +155,7 @@ private: |
1338 |
- vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. |
1339 |
- void operator=(const vtkSQLiteQuery &); // Not implemented. |
1340 |
- |
1341 |
-- vtk_sqlite3_stmt *Statement; |
1342 |
-+ sqlite3_stmt *Statement; |
1343 |
- bool InitialFetch; |
1344 |
- int InitialFetchResult; |
1345 |
- char *LastErrorText; |
1346 |
-diff --git a/VTK/ThirdParty/sqlite/CMakeLists.txt b/VTK/ThirdParty/sqlite/CMakeLists.txt |
1347 |
-index 9e1c067..a55764b 100644 |
1348 |
---- a/VTK/ThirdParty/sqlite/CMakeLists.txt |
1349 |
-+++ b/VTK/ThirdParty/sqlite/CMakeLists.txt |
1350 |
-@@ -1,4 +1,4 @@ |
1351 |
--set(vtksqlite_THIRD_PARTY 1) |
1352 |
--set(vtksqlite_LIBRARIES vtksqlite) |
1353 |
--vtk_module_export_info() |
1354 |
--add_subdirectory(vtksqlite) |
1355 |
-+#set(vtksqlite_THIRD_PARTY 1) |
1356 |
-+#set(vtksqlite_LIBRARIES sqlite3) |
1357 |
-+#vtk_module_export_info() |
1358 |
-+#add_subdirectory(vtksqlite) |
1359 |
-diff --git a/VTK/ThirdParty/sqlite/module.cmake b/VTK/ThirdParty/sqlite/module.cmake |
1360 |
-index 8dbb3a7..db837c5 100644 |
1361 |
---- a/VTK/ThirdParty/sqlite/module.cmake |
1362 |
-+++ b/VTK/ThirdParty/sqlite/module.cmake |
1363 |
-@@ -1 +1 @@ |
1364 |
--vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING) |
1365 |
-+#vtk_module(vtksqlite EXCLUDE_FROM_WRAPPING) |
1366 |
|
1367 |
diff --git a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild b/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
1368 |
deleted file mode 100644 |
1369 |
index 2478621dbd2..00000000000 |
1370 |
--- a/sci-visualization/paraview/paraview-4.1.0-r2.ebuild |
1371 |
+++ /dev/null |
1372 |
@@ -1,301 +0,0 @@ |
1373 |
-# Copyright 1999-2016 Gentoo Foundation |
1374 |
-# Distributed under the terms of the GNU General Public License v2 |
1375 |
- |
1376 |
-EAPI=5 |
1377 |
- |
1378 |
-PYTHON_COMPAT=( python2_7 ) |
1379 |
-inherit eutils multilib versionator python-single-r1 cmake-utils |
1380 |
- |
1381 |
-MAIN_PV=$(get_major_version) |
1382 |
-MAJOR_PV=$(get_version_component_range 1-2) |
1383 |
-MY_P="ParaView-v${PV}-source" |
1384 |
- |
1385 |
-DESCRIPTION="ParaView is a powerful scientific data visualization application" |
1386 |
-HOMEPAGE="http://www.paraview.org" |
1387 |
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" |
1388 |
-RESTRICT="mirror" |
1389 |
- |
1390 |
-LICENSE="paraview GPL-2" |
1391 |
-KEYWORDS="~amd64 ~x86" |
1392 |
-SLOT="0" |
1393 |
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" |
1394 |
-RESTRICT="test" |
1395 |
- |
1396 |
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) |
1397 |
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" |
1398 |
- |
1399 |
-RDEPEND=" |
1400 |
- dev-libs/expat |
1401 |
- dev-libs/jsoncpp |
1402 |
- dev-libs/libxml2:2 |
1403 |
- <dev-libs/protobuf-2.6 |
1404 |
- media-libs/freetype |
1405 |
- media-libs/libpng:0 |
1406 |
- media-libs/libtheora |
1407 |
- media-libs/tiff:0= |
1408 |
- sci-libs/hdf5[mpi=] |
1409 |
- >=sci-libs/netcdf-4.2[hdf5] |
1410 |
- >=sci-libs/netcdf-cxx-4.2:3 |
1411 |
- sys-libs/zlib |
1412 |
- virtual/jpeg:0 |
1413 |
- virtual/opengl |
1414 |
- >=x11-libs/gl2ps-1.3.8 |
1415 |
- x11-libs/libX11 |
1416 |
- x11-libs/libXext |
1417 |
- x11-libs/libXmu |
1418 |
- x11-libs/libXt |
1419 |
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) |
1420 |
- coprocessing? ( |
1421 |
- plugins? ( |
1422 |
- dev-python/PyQt4 |
1423 |
- dev-qt/qtgui:4 |
1424 |
- ) |
1425 |
- ) |
1426 |
- ffmpeg? ( virtual/ffmpeg ) |
1427 |
- mpi? ( virtual/mpi[cxx,romio] ) |
1428 |
- mysql? ( virtual/mysql ) |
1429 |
- python? ( |
1430 |
- ${PYTHON_DEPS} |
1431 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
1432 |
- dev-python/numpy[${PYTHON_USEDEP}] |
1433 |
- dev-python/sip[${PYTHON_USEDEP}] |
1434 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
1435 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
1436 |
- mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
1437 |
- qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) |
1438 |
- ) |
1439 |
- qt4? ( |
1440 |
- dev-qt/designer:4 |
1441 |
- dev-qt/qtgui:4 |
1442 |
- dev-qt/qtopengl:4 |
1443 |
- dev-qt/qthelp:4[compat] |
1444 |
- dev-qt/qtsql:4 |
1445 |
- dev-qt/qtwebkit:4 |
1446 |
- ) |
1447 |
- sqlite? ( dev-db/sqlite:3 ) |
1448 |
- tcl? ( dev-lang/tcl:0= ) |
1449 |
- tk? ( dev-lang/tk:0= )" |
1450 |
-DEPEND="${RDEPEND} |
1451 |
- doc? ( app-doc/doxygen )" |
1452 |
- |
1453 |
-S=${WORKDIR}/${MY_P%-source} |
1454 |
- |
1455 |
-pkg_setup() { |
1456 |
- python-single-r1_pkg_setup |
1457 |
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} |
1458 |
-} |
1459 |
- |
1460 |
-src_prepare() { |
1461 |
- # see patch headers for description |
1462 |
- epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ |
1463 |
- "${FILESDIR}"/${PN}-4.0.1-removesqlite.patch \ |
1464 |
- "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ |
1465 |
- "${FILESDIR}"/${PN}-4.0.1-vtk-cg-path.patch \ |
1466 |
- "${FILESDIR}"/${PN}-4.0.1-Protobuf.patch \ |
1467 |
- "${FILESDIR}"/${P}-glxext-legacy.patch \ |
1468 |
- "${FILESDIR}"/${P}-no-fatal-warnings.patch \ |
1469 |
- "${FILESDIR}"/${P}-vtk-freetype.patch |
1470 |
- |
1471 |
- # lib64 fixes |
1472 |
- sed -i \ |
1473 |
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
1474 |
- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die |
1475 |
- sed -i \ |
1476 |
- -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ |
1477 |
- VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die |
1478 |
- sed -i \ |
1479 |
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ |
1480 |
- CMakeLists.txt \ |
1481 |
- Plugins/SciberQuestToolKit/CMakeLists.txt \ |
1482 |
- ParaViewConfig.cmake.in \ |
1483 |
- CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ |
1484 |
- ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ |
1485 |
- ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ |
1486 |
- Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ |
1487 |
- Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die |
1488 |
- |
1489 |
- # no proper switch |
1490 |
- use nvcontrol || { |
1491 |
- sed -i \ |
1492 |
- -e '/VTK_USE_NVCONTROL/s#1#0#' \ |
1493 |
- VTK/Rendering/OpenGL/CMakeLists.txt || die |
1494 |
- } |
1495 |
-} |
1496 |
- |
1497 |
-src_configure() { |
1498 |
- local mysql_lib mysql_includedir |
1499 |
- |
1500 |
- if use mysql ; then |
1501 |
- if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; then |
1502 |
- mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so" |
1503 |
- mysql_includedir="/usr/include/mysql" |
1504 |
- else |
1505 |
- mysql_lib="$(mysql_config --variable=pkglibdir)/libmysqlclient.so" |
1506 |
- mysql_includedir="$(mysql_config --variable=pkgincludedir)" |
1507 |
- fi |
1508 |
- fi |
1509 |
- |
1510 |
- # TODO: use system jsoncpp |
1511 |
- # VTK_USE_SYSTEM_QTTESTING |
1512 |
- # PARAVIEW_USE_SYSTEM_AUTOBAHN |
1513 |
- local mycmakeargs=( |
1514 |
- -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" |
1515 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
1516 |
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include |
1517 |
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so |
1518 |
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so |
1519 |
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so |
1520 |
- -DBUILD_SHARED_LIBS=ON |
1521 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
1522 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
1523 |
- -DVTK_USE_SYSTEM_GL2PS=ON |
1524 |
- -DVTK_USE_SYSTEM_HDF5=ON |
1525 |
- -DVTK_USE_SYSTEM_JPEG=ON |
1526 |
- -DVTK_USE_SYSTEM_JSONCPP=ON |
1527 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
1528 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
1529 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
1530 |
- -DVTK_USE_SYSTEM_PNG=ON |
1531 |
- -DVTK_USE_SYSTEM_PROTOBUF=ON |
1532 |
- -DVTK_USE_SYSTEM_TIFF=ON |
1533 |
- -DVTK_USE_SYSTEM_XDMF2=OFF |
1534 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
1535 |
- -DPARAVIEW_USE_SYSTEM_MPI4PY=ON |
1536 |
- -DVTK_USE_SYSTEM_ZOPE=ON |
1537 |
- -DVTK_USE_SYSTEM_TWISTED=ON |
1538 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
1539 |
- -DCMAKE_COLOR_MAKEFILE=TRUE |
1540 |
- -DVTK_USE_OFFSCREEN=TRUE |
1541 |
- -DCMAKE_USE_PTHREADS=ON |
1542 |
- -DVTK_USE_FFMPEG_ENCODER=OFF |
1543 |
- -DPROTOC_LOCATION=$(type -P protoc) |
1544 |
- -DVTK_Group_StandAlone=ON |
1545 |
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" "")" |
1546 |
- -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")" |
1547 |
- # force this module due to incorrect build system deps |
1548 |
- # wrt bug 460528 |
1549 |
- -DModule_vtkUtilitiesProcessXML=ON |
1550 |
- ) |
1551 |
- |
1552 |
- # TODO: XDMF_USE_MYSQL? |
1553 |
- # VTK_WRAP_JAVA |
1554 |
- mycmakeargs+=( |
1555 |
- $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
1556 |
- $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) |
1557 |
- $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) |
1558 |
- $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) |
1559 |
- $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) |
1560 |
- $(cmake-utils_use qt4 Module_vtkRenderingQt) |
1561 |
- $(cmake-utils_use qt4 Module_vtkViewsQt) |
1562 |
- $(cmake-utils_use qt4 VTK_Group_ParaViewQt) |
1563 |
- $(cmake-utils_use qt4 VTK_Group_Qt) |
1564 |
- $(cmake-utils_use !qt4 PQWIDGETS_DISABLE_QTWEBKIT) |
1565 |
- $(cmake-utils_use boost Module_vtkInfovisBoost) |
1566 |
- $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) |
1567 |
- $(cmake-utils_use mpi PARAVIEW_USE_MPI) |
1568 |
- $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) |
1569 |
- $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) |
1570 |
- $(cmake-utils_use mpi VTK_Group_MPI) |
1571 |
- $(cmake-utils_use mpi VTK_XDMF_USE_MPI) |
1572 |
- $(cmake-utils_use mpi XDMF_BUILD_MPI) |
1573 |
- $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) |
1574 |
- $(cmake-utils_use python VTK_Group_ParaViewPython) |
1575 |
- $(cmake-utils_use python XDMF_WRAP_PYTHON) |
1576 |
- $(cmake-utils_use python Module_vtkPython) |
1577 |
- $(cmake-utils_use python Module_pqPython) |
1578 |
- $(cmake-utils_use python Module_vtkWrappingPythonCore) |
1579 |
- $(cmake-utils_use python Module_vtkPVPythonSupport) |
1580 |
- $(cmake-utils_use python Module_AutobahnPython) |
1581 |
- $(cmake-utils_use python Module_Twisted) |
1582 |
- $(cmake-utils_use python Module_ZopeInterface) |
1583 |
- $(cmake-utils_use python Module_vtkmpi4py) |
1584 |
- $(usex qt4 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") |
1585 |
- $(cmake-utils_use doc BUILD_DOCUMENTATION) |
1586 |
- $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) |
1587 |
- $(cmake-utils_use examples BUILD_EXAMPLES) |
1588 |
- $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1589 |
- $(cmake-utils_use mysql Module_vtkIOMySQL) |
1590 |
- $(cmake-utils_use sqlite Module_vtksqlite) |
1591 |
- $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) |
1592 |
- $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) |
1593 |
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1594 |
- $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) |
1595 |
- $(cmake-utils_use tk VTK_Group_Tk) |
1596 |
- $(cmake-utils_use tk VTK_USE_TK) |
1597 |
- $(cmake-utils_use tk Module_vtkRenderingTk) |
1598 |
- $(cmake-utils_use tcl Module_vtkTclTk) |
1599 |
- $(cmake-utils_use tcl Module_vtkWrappingTcl) |
1600 |
- $(cmake-utils_use test BUILD_TESTING) |
1601 |
- ) |
1602 |
- |
1603 |
- if use qt4 ; then |
1604 |
- mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) |
1605 |
- if use python ; then |
1606 |
- # paraview cannot guess sip directory properly |
1607 |
- mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) |
1608 |
- fi |
1609 |
- fi |
1610 |
- |
1611 |
- # TODO: MantaView VaporPlugin VRPlugin |
1612 |
- mycmakeargs+=( |
1613 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) |
1614 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) |
1615 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) |
1616 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) |
1617 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) |
1618 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) |
1619 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |
1620 |
- $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) |
1621 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) |
1622 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) |
1623 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) |
1624 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) |
1625 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) |
1626 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) |
1627 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) |
1628 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) |
1629 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) |
1630 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) |
1631 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) |
1632 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) |
1633 |
- # these are always needed for plugins |
1634 |
- $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) |
1635 |
- $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) |
1636 |
- ) |
1637 |
- |
1638 |
- cmake-utils_src_configure |
1639 |
-} |
1640 |
- |
1641 |
-src_compile() { |
1642 |
- cmake-utils_src_compile |
1643 |
-} |
1644 |
- |
1645 |
-src_install() { |
1646 |
- cmake-utils_src_install |
1647 |
- |
1648 |
- # set up the environment |
1649 |
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} |
1650 |
- |
1651 |
- newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png |
1652 |
- make_desktop_entry paraview "Paraview" paraview |
1653 |
- |
1654 |
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} |
1655 |
-} |
1656 |
- |
1657 |
-pkg_postinst() { |
1658 |
- # with Qt4.5 there seem to be issues reading data files |
1659 |
- # under certain locales. Setting LC_ALL=C should fix these. |
1660 |
- elog "" |
1661 |
- elog "If you experience data corruption during parsing of" |
1662 |
- elog "data files with paraview please try setting your" |
1663 |
- elog "locale to LC_ALL=C." |
1664 |
- elog "If you plan to use paraview component from an existing shell" |
1665 |
- elog "you should run env-update and . /etc/profile first" |
1666 |
- elog "" |
1667 |
- elog "paraview no longer exports bundled python modules in PYTHONPATH" |
1668 |
- elog "globally due to clashes of bundled packages with system-wide" |
1669 |
- elog "site-packages. If you want to use paraview's python modules" |
1670 |
- elog "export" |
1671 |
- elog " PYTHONPATH=${EPREFIX}/usr/${PVLIBDIR}:${EPREFIX}/usr/${PVLIBDIR}/site-packages" |
1672 |
- elog "as needed." |
1673 |
-} |
1674 |
|
1675 |
diff --git a/sci-visualization/paraview/paraview-5.1.2-r1.ebuild b/sci-visualization/paraview/paraview-5.1.2-r1.ebuild |
1676 |
deleted file mode 100644 |
1677 |
index cecb858d41a..00000000000 |
1678 |
--- a/sci-visualization/paraview/paraview-5.1.2-r1.ebuild |
1679 |
+++ /dev/null |
1680 |
@@ -1,285 +0,0 @@ |
1681 |
-# Copyright 1999-2016 Gentoo Foundation |
1682 |
-# Distributed under the terms of the GNU General Public License v2 |
1683 |
- |
1684 |
-EAPI=5 |
1685 |
- |
1686 |
-PYTHON_COMPAT=( python2_7 ) |
1687 |
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator |
1688 |
- |
1689 |
-MAIN_PV=$(get_major_version) |
1690 |
-MAJOR_PV=$(get_version_component_range 1-2) |
1691 |
-MY_P="ParaView-v${PV}" |
1692 |
- |
1693 |
-DESCRIPTION="ParaView is a powerful scientific data visualization application" |
1694 |
-HOMEPAGE="http://www.paraview.org" |
1695 |
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" |
1696 |
-RESTRICT="mirror" |
1697 |
- |
1698 |
-LICENSE="paraview GPL-2" |
1699 |
-KEYWORDS="~amd64 ~x86" |
1700 |
-SLOT="0" |
1701 |
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk" |
1702 |
-RESTRICT="test" |
1703 |
- |
1704 |
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} ) |
1705 |
- mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL" |
1706 |
- |
1707 |
-RDEPEND=" |
1708 |
- dev-libs/expat |
1709 |
- <dev-libs/jsoncpp-1.7.5 |
1710 |
- dev-libs/libxml2:2 |
1711 |
- dev-libs/protobuf |
1712 |
- media-libs/freetype |
1713 |
- media-libs/libpng:0 |
1714 |
- media-libs/libtheora |
1715 |
- media-libs/tiff:0= |
1716 |
- sci-libs/hdf5[mpi=] |
1717 |
- >=sci-libs/netcdf-4.2[hdf5] |
1718 |
- >=sci-libs/netcdf-cxx-4.2:3 |
1719 |
- sys-libs/zlib |
1720 |
- virtual/jpeg:0 |
1721 |
- virtual/opengl |
1722 |
- virtual/glu |
1723 |
- x11-libs/libX11 |
1724 |
- x11-libs/libXext |
1725 |
- x11-libs/libXmu |
1726 |
- x11-libs/libXt |
1727 |
- coprocessing? ( |
1728 |
- plugins? ( |
1729 |
- dev-python/PyQt5 |
1730 |
- dev-qt/qtgui:5[-gles2] |
1731 |
- ) |
1732 |
- ) |
1733 |
- ffmpeg? ( virtual/ffmpeg ) |
1734 |
- mpi? ( virtual/mpi[cxx,romio] ) |
1735 |
- mysql? ( virtual/mysql ) |
1736 |
- python? ( |
1737 |
- ${PYTHON_DEPS} |
1738 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
1739 |
- dev-python/numpy[${PYTHON_USEDEP}] |
1740 |
- dev-python/sip[${PYTHON_USEDEP}] |
1741 |
- dev-python/twisted-core |
1742 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
1743 |
- mpi? ( dev-python/mpi4py ) |
1744 |
- qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] ) |
1745 |
- ) |
1746 |
- qt5? ( |
1747 |
- dev-qt/designer:5 |
1748 |
- dev-qt/qtgui:5[-gles2] |
1749 |
- dev-qt/qthelp:5 |
1750 |
- dev-qt/qtopengl:5[-gles2] |
1751 |
- dev-qt/qtsql:5 |
1752 |
- dev-qt/qttest:5 |
1753 |
- dev-qt/qtwebkit:5 |
1754 |
- dev-qt/qtx11extras:5 |
1755 |
- ) |
1756 |
- sqlite? ( dev-db/sqlite:3 ) |
1757 |
- tcl? ( dev-lang/tcl:0= ) |
1758 |
- tk? ( dev-lang/tk:0= )" |
1759 |
-DEPEND="${RDEPEND} |
1760 |
- ${PYTHON_DEPS} |
1761 |
- >=dev-util/cmake-3.4 |
1762 |
- boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) |
1763 |
- doc? ( app-doc/doxygen )" |
1764 |
- |
1765 |
-S="${WORKDIR}/${MY_P}" |
1766 |
- |
1767 |
-pkg_pretend() { |
1768 |
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
1769 |
- eerror "For USE=openmp a gcc with openmp support is required" |
1770 |
- eerror |
1771 |
- return 1 |
1772 |
- fi |
1773 |
-} |
1774 |
- |
1775 |
-pkg_setup() { |
1776 |
- python-single-r1_pkg_setup |
1777 |
- PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} |
1778 |
-} |
1779 |
- |
1780 |
-src_prepare() { |
1781 |
- # see patch headers for description |
1782 |
- epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ |
1783 |
- "${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \ |
1784 |
- "${FILESDIR}"/${PN}-4.4.0-removesqlite.patch |
1785 |
- |
1786 |
- # lib64 fixes |
1787 |
- sed -i \ |
1788 |
- -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ |
1789 |
- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die |
1790 |
- sed -i \ |
1791 |
- -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ |
1792 |
- VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die |
1793 |
- sed -i \ |
1794 |
- -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ |
1795 |
- CMakeLists.txt \ |
1796 |
- Plugins/SciberQuestToolKit/CMakeLists.txt \ |
1797 |
- ParaViewConfig.cmake.in \ |
1798 |
- CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \ |
1799 |
- ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \ |
1800 |
- ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \ |
1801 |
- Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \ |
1802 |
- Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die |
1803 |
- |
1804 |
- # no proper switch |
1805 |
- use nvcontrol || { |
1806 |
- sed -i \ |
1807 |
- -e '/VTK_USE_NVCONTROL/s#1#0#' \ |
1808 |
- VTK/Rendering/OpenGL/CMakeLists.txt || die |
1809 |
- } |
1810 |
-} |
1811 |
- |
1812 |
-src_configure() { |
1813 |
- if use qt5; then |
1814 |
- export QT_SELECT=qt5 |
1815 |
- fi |
1816 |
- |
1817 |
- # VTK_USE_SYSTEM_QTTESTING |
1818 |
- # PARAVIEW_USE_SYSTEM_AUTOBAHN |
1819 |
- local mycmakeargs=( |
1820 |
- -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" |
1821 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
1822 |
- -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include |
1823 |
- -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so |
1824 |
- -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so |
1825 |
- -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so |
1826 |
- -DBUILD_SHARED_LIBS=ON |
1827 |
- -DCMAKE_COLOR_MAKEFILE=TRUE |
1828 |
- -DCMAKE_USE_PTHREADS=ON |
1829 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
1830 |
- -DPARAVIEW_USE_SYSTEM_MPI4PY=ON |
1831 |
- -DPROTOC_LOCATION=$(type -P protoc) |
1832 |
- -DVTK_Group_StandAlone=ON |
1833 |
- -DVTK_RENDERING_BACKEND=OpenGL2 |
1834 |
- -DVTK_USE_FFMPEG_ENCODER=OFF |
1835 |
- -DVTK_USE_OFFSCREEN=TRUE |
1836 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
1837 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
1838 |
- -DVTK_USE_SYSTEM_GL2PS=OFF |
1839 |
- -DVTK_USE_SYSTEM_HDF5=ON |
1840 |
- -DVTK_USE_SYSTEM_JPEG=ON |
1841 |
- -DVTK_USE_SYSTEM_JSONCPP=ON |
1842 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
1843 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
1844 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
1845 |
- -DVTK_USE_SYSTEM_PNG=ON |
1846 |
- -DVTK_USE_SYSTEM_PROTOBUF=ON |
1847 |
- -DVTK_USE_SYSTEM_TIFF=ON |
1848 |
- -DVTK_USE_SYSTEM_TWISTED=ON |
1849 |
- -DVTK_USE_SYSTEM_XDMF2=OFF |
1850 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
1851 |
- -DVTK_USE_SYSTEM_ZOPE=ON |
1852 |
- # force this module due to incorrect build system deps |
1853 |
- # wrt bug 460528 |
1854 |
- -DModule_vtkUtilitiesProcessXML=ON |
1855 |
- ) |
1856 |
- |
1857 |
- # TODO: XDMF_USE_MYSQL? |
1858 |
- # VTK_WRAP_JAVA |
1859 |
- mycmakeargs+=( |
1860 |
- $(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES) |
1861 |
- $(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI) |
1862 |
- $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "") |
1863 |
- $(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL) |
1864 |
- $(cmake-utils_use qt5 Module_vtkGUISupportQtSQL) |
1865 |
- $(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit) |
1866 |
- $(cmake-utils_use qt5 Module_vtkRenderingQt) |
1867 |
- $(cmake-utils_use qt5 Module_vtkViewsQt) |
1868 |
- $(cmake-utils_use qt5 VTK_Group_ParaViewQt) |
1869 |
- $(cmake-utils_use qt5 VTK_Group_Qt) |
1870 |
- $(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT) |
1871 |
- $(cmake-utils_use boost Module_vtkInfovisBoost) |
1872 |
- $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) |
1873 |
- $(cmake-utils_use mpi PARAVIEW_USE_MPI) |
1874 |
- $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) |
1875 |
- $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) |
1876 |
- $(cmake-utils_use mpi VTK_Group_MPI) |
1877 |
- $(cmake-utils_use mpi VTK_XDMF_USE_MPI) |
1878 |
- $(cmake-utils_use mpi XDMF_BUILD_MPI) |
1879 |
- $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) |
1880 |
- $(cmake-utils_use python VTK_Group_ParaViewPython) |
1881 |
- $(cmake-utils_use python XDMF_WRAP_PYTHON) |
1882 |
- $(cmake-utils_use python Module_vtkPython) |
1883 |
- $(cmake-utils_use python Module_pqPython) |
1884 |
- $(cmake-utils_use python Module_vtkWrappingPythonCore) |
1885 |
- $(cmake-utils_use python Module_vtkPVPythonSupport) |
1886 |
- $(cmake-utils_use python Module_AutobahnPython) |
1887 |
- $(cmake-utils_use python Module_Twisted) |
1888 |
- $(cmake-utils_use python Module_ZopeInterface) |
1889 |
- $(cmake-utils_use python Module_vtkmpi4py) |
1890 |
- $(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF") |
1891 |
- $(cmake-utils_use doc BUILD_DOCUMENTATION) |
1892 |
- $(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION) |
1893 |
- $(cmake-utils_use examples BUILD_EXAMPLES) |
1894 |
- $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1895 |
- $(cmake-utils_use mysql Module_vtkIOMySQL) |
1896 |
- $(cmake-utils_use sqlite Module_vtksqlite) |
1897 |
- $(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST) |
1898 |
- $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) |
1899 |
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1900 |
- $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) |
1901 |
- $(cmake-utils_use tk VTK_Group_Tk) |
1902 |
- $(cmake-utils_use tk VTK_USE_TK) |
1903 |
- $(cmake-utils_use tk Module_vtkRenderingTk) |
1904 |
- $(cmake-utils_use tcl Module_vtkTclTk) |
1905 |
- $(cmake-utils_use tcl Module_vtkWrappingTcl) |
1906 |
- $(cmake-utils_use test BUILD_TESTING) |
1907 |
- ) |
1908 |
- |
1909 |
- if use openmp; then |
1910 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP ) |
1911 |
- fi |
1912 |
- |
1913 |
- if use qt5 ; then |
1914 |
- mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) |
1915 |
- if use python ; then |
1916 |
- # paraview cannot guess sip directory properly |
1917 |
- mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) |
1918 |
- fi |
1919 |
- fi |
1920 |
- |
1921 |
- # TODO: MantaView VaporPlugin VRPlugin |
1922 |
- mycmakeargs+=( |
1923 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) |
1924 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO) |
1925 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) |
1926 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) |
1927 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) |
1928 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) |
1929 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) |
1930 |
- $(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl) |
1931 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) |
1932 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) |
1933 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan) |
1934 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) |
1935 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) |
1936 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) |
1937 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) |
1938 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) |
1939 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) |
1940 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles) |
1941 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) |
1942 |
- $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering) |
1943 |
- # these are always needed for plugins |
1944 |
- $(cmake-utils_use plugins Module_vtkFiltersFlowPaths) |
1945 |
- $(cmake-utils_use plugins Module_vtkPVServerManagerApplication) |
1946 |
- ) |
1947 |
- |
1948 |
- cmake-utils_src_configure |
1949 |
-} |
1950 |
- |
1951 |
-src_compile() { |
1952 |
- cmake-utils_src_compile |
1953 |
-} |
1954 |
- |
1955 |
-src_install() { |
1956 |
- cmake-utils_src_install |
1957 |
- |
1958 |
- # set up the environment |
1959 |
- echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} |
1960 |
- |
1961 |
- newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png |
1962 |
- make_desktop_entry paraview "Paraview" paraview |
1963 |
- |
1964 |
- use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} |
1965 |
-} |