1 |
commit: 0b1c35fffdebd4b19b46149b00c83b616c7639bf |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 22:03:12 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 2 22:09:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1c35ff |
7 |
|
8 |
sci-libs/vtk: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
sci-libs/vtk/Manifest | 2 - |
14 |
sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch | 49 --- |
15 |
sci-libs/vtk/files/vtk-5.10.1-libav-9.patch | 117 ------- |
16 |
sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch | 57 --- |
17 |
sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch | 12 - |
18 |
.../vtk/files/vtk-5.4.2-boost-property_map.patch | 194 ---------- |
19 |
sci-libs/vtk/files/vtk-5.4.2-cg-path.patch | 35 -- |
20 |
sci-libs/vtk/files/vtk-5.4.2-libpng14.patch | 20 -- |
21 |
sci-libs/vtk/files/vtk-5.6.0-R.patch | 57 --- |
22 |
.../vtk/files/vtk-5.6.0-boost-property_map.patch | 13 - |
23 |
sci-libs/vtk/files/vtk-5.6.0-cg-path.patch | 36 -- |
24 |
sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch | 42 --- |
25 |
sci-libs/vtk/files/vtk-5.6.0-libpng14.patch | 22 -- |
26 |
sci-libs/vtk/files/vtk-5.6.0-odbc.patch | 12 - |
27 |
sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch | 42 --- |
28 |
sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch | 29 -- |
29 |
sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch | 66 ---- |
30 |
sci-libs/vtk/files/vtk-5.6.1-libpng15.patch | 22 -- |
31 |
sci-libs/vtk/files/vtk-5.8.0-R.patch | 45 --- |
32 |
sci-libs/vtk/files/vtk-5.8.0-boost.patch | 39 --- |
33 |
sci-libs/vtk/files/vtk-6.0.0-cg-path.patch | 16 - |
34 |
sci-libs/vtk/files/vtk-6.0.0-install.patch | 19 - |
35 |
sci-libs/vtk/files/vtk-6.0.0-netcdf.patch | 75 ---- |
36 |
sci-libs/vtk/files/vtk-6.0.0-system.patch | 27 -- |
37 |
sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch | 12 - |
38 |
sci-libs/vtk/vtk-6.0.0.ebuild | 323 ----------------- |
39 |
sci-libs/vtk/vtk-6.1.0-r1.ebuild | 389 --------------------- |
40 |
sci-libs/vtk/vtk-6.1.0.ebuild | 379 -------------------- |
41 |
28 files changed, 2151 deletions(-) |
42 |
|
43 |
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest |
44 |
index 9e64a2f..18fdb61 100644 |
45 |
--- a/sci-libs/vtk/Manifest |
46 |
+++ b/sci-libs/vtk/Manifest |
47 |
@@ -1,6 +1,4 @@ |
48 |
DIST VTK-6.1.0.tar.gz 27608882 SHA256 bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc WHIRLPOOL e387390efdc8cd2e413524794786369ba8a2bfe788913dfb161b82d9bc041e15ed5585286bebe38f955d1def3043481303d3bc74c648bbf5bf856e212ac9950c |
49 |
DIST VTKData-6.1.0.tar.gz 94452190 SHA256 aba27ac05d721e36b9424131f1d0f673448f2b31aac34e9e74590fdf208ad0c7 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 WHIRLPOOL 1ee803055e3bbf0c8150807a77efce81406c8a512c40644c5ccc35279cb1098bb8f0382b5f2bb01f483c8a38a4e81ee70ed39145c52b4375a0545919faee2a28 |
50 |
DIST VTKLargeData-6.1.0.tar.gz 166019220 SHA256 d8985508ff2b7fbfbae0aadedfbe2b293640cf6441d3cce41da5c3f591c96d4c SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f WHIRLPOOL db62af365a5c1d71b209d21578184ff1ee7a5913aefd7e5729b7dc555bdd20a8f070ed83051387634bf6a9fc1141ab68a291ec0d557602fa5802e3e6020b7ae1 |
51 |
-DIST vtk-6.0.0.tar.gz 24170173 SHA256 426df543cffeacf21154dddcd2a6efbd91a586570a07a0db4c426d3e0acd10e4 SHA512 ac238e2d228df4fc4d324826b8729af9ab3274039d5abf834f013fb4deaddc116ba2b1b24fb93aaf4b1bfc4bb321d19bc05566883cf3db1f982c9650d77583e8 WHIRLPOOL b8619e254f97392dae01b8e2376bd70a07ce21504580d29844fcf1ab5621d85ba12bfd6047b4f90afd2b648d8b6c17e4ce5d789d6e1f84b5a4f847de5ee376b9 |
52 |
-DIST vtkDocHtml-6.0.0.tar.gz 204228463 SHA256 f5324c4c197b0cacd19bf1e5721bb012d753d49526e224d9f2dd7412f34e4434 SHA512 b6d5660f3ae6046c63b22b613cab6822f45f6b30a09522277e32f941c75dc48e8c92abc4d7f02b17e3f4d8e625de6dce7f000acc79e2d588a13d1577c139291a WHIRLPOOL b951c4ee62639c6bada2e02c2fceddbdb730c76d80c61a6ed013d8d9878b78a697158f41f53d68b5d62e4baa1f9ecb88e2437490da7610970622a40ecb14db1f |
53 |
DIST vtkDocHtml-6.1.0.tar.gz 230827905 SHA256 e35d0f5b7905e5c827d8daa71ee61b14dc080445efad91f97583a2b9303c1813 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 WHIRLPOOL bc1714223259953a605612c0da124ece60604989458b7de5cf24b37d0f4c339f50c07a13d899f218364e61a35f8e1ace126eda5e83acbc3fe4930b041df0f55d |
54 |
|
55 |
diff --git a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch |
56 |
deleted file mode 100644 |
57 |
index 2cefb12..00000000 |
58 |
--- a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch |
59 |
+++ /dev/null |
60 |
@@ -1,49 +0,0 @@ |
61 |
-https://bugs.gentoo.org/show_bug.cgi?id=450464 |
62 |
- |
63 |
-Index: VTK5.10.1/IO/vtkFFMPEGWriter.cxx |
64 |
-=================================================================== |
65 |
---- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx |
66 |
-+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx |
67 |
-@@ -192,13 +192,6 @@ int vtkFFMPEGWriterInternal::Start() |
68 |
- c->bit_rate_tolerance = this->Writer->GetBitRateTolerance(); |
69 |
- } |
70 |
- |
71 |
-- //apply the chosen parameters |
72 |
-- if (av_set_parameters(this->avFormatContext, NULL) < 0) |
73 |
-- { |
74 |
-- vtkGenericWarningMacro (<< "Invalid output format parameters." ); |
75 |
-- return 0; |
76 |
-- } |
77 |
-- |
78 |
- //manufacture a codec with the chosen parameters |
79 |
- AVCodec *codec = avcodec_find_encoder(c->codec_id); |
80 |
- if (!codec) |
81 |
-@@ -259,14 +252,17 @@ int vtkFFMPEGWriterInternal::Start() |
82 |
- |
83 |
- |
84 |
- //Finally, open the file and start it off. |
85 |
-- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) |
86 |
-+ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) |
87 |
- { |
88 |
- vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." ); |
89 |
- return 0; |
90 |
- } |
91 |
- this->openedFile = 1; |
92 |
- |
93 |
-- av_write_header(this->avFormatContext); |
94 |
-+ if(avformat_write_header(this->avFormatContext, NULL) < 0) { |
95 |
-+ vtkGenericWarningMacro (<< "Failed to write header." ); |
96 |
-+ return 0; |
97 |
-+ } |
98 |
- return 1; |
99 |
- } |
100 |
- |
101 |
-@@ -391,7 +387,7 @@ void vtkFFMPEGWriterInternal::End() |
102 |
- #ifdef VTK_FFMPEG_OLD_URL_FCLOSE |
103 |
- url_fclose(&this->avFormatContext->pb); |
104 |
- #else |
105 |
-- url_fclose(this->avFormatContext->pb); |
106 |
-+ avio_close(this->avFormatContext->pb); |
107 |
- #endif |
108 |
- this->openedFile = 0; |
109 |
- } |
110 |
|
111 |
diff --git a/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch b/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch |
112 |
deleted file mode 100644 |
113 |
index eb7b71c..00000000 |
114 |
--- a/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch |
115 |
+++ /dev/null |
116 |
@@ -1,117 +0,0 @@ |
117 |
-diff -burN VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx |
118 |
---- VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx 2013-05-25 01:26:52.768954436 +0200 |
119 |
-+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2013-05-25 11:13:53.112672449 +0200 |
120 |
-@@ -60,9 +60,6 @@ |
121 |
- |
122 |
- AVStream *avStream; |
123 |
- |
124 |
-- unsigned char *codecBuf; |
125 |
-- int codecBufSize; |
126 |
-- |
127 |
- AVFrame *rgbInput; |
128 |
- AVFrame *yuvOutput; |
129 |
- |
130 |
-@@ -83,7 +80,6 @@ |
131 |
- |
132 |
- this->avStream = NULL; |
133 |
- |
134 |
-- this->codecBuf = NULL; |
135 |
- this->rgbInput = NULL; |
136 |
- this->yuvOutput = NULL; |
137 |
- |
138 |
-@@ -140,7 +136,7 @@ |
139 |
- strcpy(this->avFormatContext->filename, this->Writer->GetFileName()); |
140 |
- |
141 |
- //create a stream for that file |
142 |
-- this->avStream = av_new_stream(this->avFormatContext, 0); |
143 |
-+ this->avStream = avformat_new_stream(this->avFormatContext, NULL); |
144 |
- if (!this->avStream) |
145 |
- { |
146 |
- vtkGenericWarningMacro (<< "Could not create video stream."); |
147 |
-@@ -199,7 +195,7 @@ |
148 |
- vtkGenericWarningMacro (<< "Codec not found." ); |
149 |
- return 0; |
150 |
- } |
151 |
-- if (avcodec_open(c, codec) < 0) |
152 |
-+ if (avcodec_open2(c, codec, NULL) < 0) |
153 |
- { |
154 |
- vtkGenericWarningMacro (<< "Could not open codec."); |
155 |
- return 0; |
156 |
-@@ -207,15 +203,6 @@ |
157 |
- |
158 |
- //create buffers for the codec to work with. |
159 |
- |
160 |
-- //working compression space |
161 |
-- this->codecBufSize = 2*c->width*c->height*4; //hopefully this is enough |
162 |
-- this->codecBuf = new unsigned char[this->codecBufSize]; |
163 |
-- if (!this->codecBuf) |
164 |
-- { |
165 |
-- vtkGenericWarningMacro (<< "Could not make codec working space." ); |
166 |
-- return 0; |
167 |
-- } |
168 |
-- |
169 |
- //for the output of the writer's input... |
170 |
- this->rgbInput = avcodec_alloc_frame(); |
171 |
- if (!this->rgbInput) |
172 |
-@@ -316,38 +303,24 @@ |
173 |
- return 0; |
174 |
- } |
175 |
- #endif |
176 |
-- |
177 |
-+ AVPacket pkt = { 0 }; |
178 |
-+ int got_frame; |
179 |
- |
180 |
- //run the encoder |
181 |
-- int toAdd = avcodec_encode_video(cc, |
182 |
-- this->codecBuf, |
183 |
-- this->codecBufSize, |
184 |
-- this->yuvOutput); |
185 |
-+ int ret = avcodec_encode_video2(cc, |
186 |
-+ &pkt, |
187 |
-+ this->yuvOutput, |
188 |
-+ &got_frame); |
189 |
- |
190 |
- //dump the compressed result to file |
191 |
-- if (toAdd) |
192 |
-+ if (got_frame) |
193 |
- { |
194 |
-- //create an avpacket to output the compressed result |
195 |
-- AVPacket pkt; |
196 |
-- av_init_packet(&pkt); |
197 |
-- |
198 |
-- //to do playback at actual recorded rate, this will need more work |
199 |
-- pkt.pts = cc->coded_frame->pts; |
200 |
-- //pkt.dts = ?; not dure what decompression time stamp should be |
201 |
-- pkt.data = this->codecBuf; |
202 |
-- pkt.size = toAdd; |
203 |
- pkt.stream_index = this->avStream->index; |
204 |
-- if (cc->coded_frame->key_frame) //treat keyframes well |
205 |
-- { |
206 |
-- pkt.flags |= AV_PKT_FLAG_KEY; |
207 |
-- } |
208 |
-- pkt.duration = 0; //presentation duration in time_base units or 0 if NA |
209 |
-- pkt.pos = -1; //byte position in stream or -1 if NA |
210 |
- |
211 |
-- toAdd = av_write_frame(this->avFormatContext, &pkt); |
212 |
-+ ret = av_write_frame(this->avFormatContext, &pkt); |
213 |
- } |
214 |
- |
215 |
-- if (toAdd) //should not have anything left over |
216 |
-+ if (ret < 0) //should not have anything left over |
217 |
- { |
218 |
- vtkGenericWarningMacro (<< "Problem encoding frame." ); |
219 |
- return 0; |
220 |
-@@ -373,12 +346,6 @@ |
221 |
- this->rgbInput = NULL; |
222 |
- } |
223 |
- |
224 |
-- if (this->codecBuf) |
225 |
-- { |
226 |
-- av_free(this->codecBuf); |
227 |
-- this->codecBuf = NULL; |
228 |
-- } |
229 |
-- |
230 |
- if (this->avFormatContext) |
231 |
- { |
232 |
- if (this->openedFile) |
233 |
-Binary files VTK5.10.1.old/IO/.vtkFFMPEGWriter.cxx.swp and VTK5.10.1/IO/.vtkFFMPEGWriter.cxx.swp differ |
234 |
|
235 |
diff --git a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch |
236 |
deleted file mode 100644 |
237 |
index ed7ec08..00000000 |
238 |
--- a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch |
239 |
+++ /dev/null |
240 |
@@ -1,57 +0,0 @@ |
241 |
- Common/vtkTclUtil.cxx | 19 ++++++++++++++----- |
242 |
- 1 file changed, 14 insertions(+), 5 deletions(-) |
243 |
- |
244 |
-diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx |
245 |
-index 390b0a4..2b7bccb 100644 |
246 |
---- a/Common/vtkTclUtil.cxx |
247 |
-+++ b/Common/vtkTclUtil.cxx |
248 |
-@@ -21,6 +21,12 @@ |
249 |
- #include <string> |
250 |
- #include <vtksys/SystemTools.hxx> |
251 |
- |
252 |
-+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) |
253 |
-+#define vtkTclGetErrorLine(m) (m->errorLine) |
254 |
-+#else |
255 |
-+#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m)) |
256 |
-+#endif |
257 |
-+ |
258 |
- extern "C" |
259 |
- { |
260 |
- #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) |
261 |
-@@ -490,13 +496,15 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg) |
262 |
- vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
263 |
- arg2->command << endl << |
264 |
- Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) << |
265 |
-- " at line number " << arg2->interp->errorLine); |
266 |
-+ " at line number " << |
267 |
-+ vtkTclGetErrorLine(arg2->interp)); |
268 |
- } |
269 |
- else |
270 |
- { |
271 |
- vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
272 |
- arg2->command << endl << |
273 |
-- " at line number " << arg2->interp->errorLine); |
274 |
-+ " at line number " << |
275 |
-+ vtkTclGetErrorLine(arg2->interp)); |
276 |
- } |
277 |
- } |
278 |
- } |
279 |
-@@ -723,14 +731,15 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *) |
280 |
- vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
281 |
- this->StringCommand << endl << |
282 |
- Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) << |
283 |
-- " at line number " << this->Interp->errorLine); |
284 |
-+ " at line number " << |
285 |
-+ vtkTclGetErrorLine(this->Interp)); |
286 |
- } |
287 |
- else |
288 |
- { |
289 |
- vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << |
290 |
- this->StringCommand << endl << |
291 |
-- " at line number " << |
292 |
-- this->Interp->errorLine); |
293 |
-+ " at line number " << |
294 |
-+ vtkTclGetErrorLine(this->Interp)); |
295 |
- } |
296 |
- } |
297 |
- else if (res == -1) |
298 |
|
299 |
diff --git a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch |
300 |
deleted file mode 100644 |
301 |
index c7da786..00000000 |
302 |
--- a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch |
303 |
+++ /dev/null |
304 |
@@ -1,12 +0,0 @@ |
305 |
-diff -Naur VTK/CMakeLists.txt VTK.new/CMakeLists.txt |
306 |
---- VTK/CMakeLists.txt 2008-05-13 17:50:09.000000000 -0400 |
307 |
-+++ VTK.new/CMakeLists.txt 2008-10-05 10:34:42.000000000 -0400 |
308 |
-@@ -182,7 +182,7 @@ |
309 |
- # Compute the proper location for installing the Tcl package. This |
310 |
- # must be a fixed relative path below the library install location and |
311 |
- # is therefore not settable by parent projects. |
312 |
--SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_LIB_DIR}) |
313 |
-+SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_PACKAGE_DIR}) |
314 |
- |
315 |
- IF(NOT VTK_INSTALL_JAVA_DIR) |
316 |
- SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java) |
317 |
|
318 |
diff --git a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch |
319 |
deleted file mode 100644 |
320 |
index 90c6d6a..00000000 |
321 |
--- a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch |
322 |
+++ /dev/null |
323 |
@@ -1,194 +0,0 @@ |
324 |
-diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx |
325 |
-index 6af2855..484a9e0 100644 |
326 |
---- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx |
327 |
-+++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx |
328 |
-@@ -36,8 +36,8 @@ |
329 |
- #include <boost/graph/strong_components.hpp> |
330 |
- #include <boost/graph/dijkstra_shortest_paths.hpp> |
331 |
- #include <boost/graph/transitive_closure.hpp> |
332 |
--#include <boost/property_map.hpp> |
333 |
--#include <boost/vector_property_map.hpp> |
334 |
-+#include <boost/property_map/property_map.hpp> |
335 |
-+#include <boost/property_map/vector_property_map.hpp> |
336 |
- |
337 |
- #include "vtkGraph.h" |
338 |
- #include "vtkBoostGraphAdapter.h" |
339 |
-diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx |
340 |
-index 6799dd0..dd759d5 100644 |
341 |
---- a/Infovis/vtkBoostBiconnectedComponents.cxx |
342 |
-+++ b/Infovis/vtkBoostBiconnectedComponents.cxx |
343 |
-@@ -32,7 +32,7 @@ |
344 |
- #include "vtkGraph.h" |
345 |
- #include "vtkBoostGraphAdapter.h" |
346 |
- #include <boost/graph/biconnected_components.hpp> |
347 |
--#include <boost/vector_property_map.hpp> |
348 |
-+#include <boost/property_map/vector_property_map.hpp> |
349 |
- #include <boost/version.hpp> |
350 |
- #include <vtksys/stl/vector> |
351 |
- #include <vtksys/stl/utility> |
352 |
-diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx |
353 |
-index e214a72..443c039 100644 |
354 |
---- a/Infovis/vtkBoostBrandesCentrality.cxx |
355 |
-+++ b/Infovis/vtkBoostBrandesCentrality.cxx |
356 |
-@@ -36,7 +36,7 @@ |
357 |
- |
358 |
- #include <boost/graph/adjacency_list.hpp> |
359 |
- #include <boost/graph/betweenness_centrality.hpp> |
360 |
--#include <boost/vector_property_map.hpp> |
361 |
-+#include <boost/property_map/vector_property_map.hpp> |
362 |
- |
363 |
- using namespace boost; |
364 |
- |
365 |
-diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx |
366 |
-index 7fab585..6e56a7c 100644 |
367 |
---- a/Infovis/vtkBoostBreadthFirstSearch.cxx |
368 |
-+++ b/Infovis/vtkBoostBreadthFirstSearch.cxx |
369 |
-@@ -46,8 +46,8 @@ |
370 |
- |
371 |
- #include <boost/graph/visitors.hpp> |
372 |
- #include <boost/graph/breadth_first_search.hpp> |
373 |
--#include <boost/property_map.hpp> |
374 |
--#include <boost/vector_property_map.hpp> |
375 |
-+#include <boost/property_map/property_map.hpp> |
376 |
-+#include <boost/property_map/vector_property_map.hpp> |
377 |
- #include <boost/pending/queue.hpp> |
378 |
- |
379 |
- #include <vtksys/stl/utility> // for pair |
380 |
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
381 |
-index 5c64516..64ee7b5 100644 |
382 |
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
383 |
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
384 |
-@@ -39,7 +39,7 @@ |
385 |
- #include "vtkTree.h" |
386 |
- |
387 |
- #include <boost/graph/breadth_first_search.hpp> |
388 |
--#include <boost/vector_property_map.hpp> |
389 |
-+#include <boost/property_map/vector_property_map.hpp> |
390 |
- #include <boost/pending/queue.hpp> |
391 |
- |
392 |
- using namespace boost; |
393 |
-diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx |
394 |
-index 69e9d8f..c88f4ab 100644 |
395 |
---- a/Infovis/vtkBoostConnectedComponents.cxx |
396 |
-+++ b/Infovis/vtkBoostConnectedComponents.cxx |
397 |
-@@ -33,7 +33,7 @@ |
398 |
- |
399 |
- #include "vtkBoostGraphAdapter.h" |
400 |
- #include <boost/graph/strong_components.hpp> |
401 |
--#include <boost/vector_property_map.hpp> |
402 |
-+#include <boost/property_map/vector_property_map.hpp> |
403 |
- |
404 |
- using namespace boost; |
405 |
- |
406 |
-diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx |
407 |
-index b0c89de..7ea3aa9 100644 |
408 |
---- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx |
409 |
-+++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx |
410 |
-@@ -40,7 +40,7 @@ PURPOSE. See the above copyright notice for more information. |
411 |
- #include "vtkTree.h" |
412 |
- |
413 |
- #include <boost/graph/kruskal_min_spanning_tree.hpp> |
414 |
--#include <boost/vector_property_map.hpp> |
415 |
-+#include <boost/property_map/vector_property_map.hpp> |
416 |
- #include <boost/pending/queue.hpp> |
417 |
- |
418 |
- using namespace boost; |
419 |
-diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx |
420 |
-index 935d0f7..48716fd 100644 |
421 |
---- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx |
422 |
-+++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx |
423 |
-@@ -39,7 +39,7 @@ PURPOSE. See the above copyright notice for more information. |
424 |
- #include "vtkTree.h" |
425 |
- |
426 |
- #include <boost/graph/prim_minimum_spanning_tree.hpp> |
427 |
--#include <boost/vector_property_map.hpp> |
428 |
-+#include <boost/property_map/vector_property_map.hpp> |
429 |
- #include <boost/pending/queue.hpp> |
430 |
- |
431 |
- using namespace boost; |
432 |
-diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx |
433 |
-index 6efa586..222afe9 100644 |
434 |
---- a/Infovis/vtkTreeLayoutStrategy.cxx |
435 |
-+++ b/Infovis/vtkTreeLayoutStrategy.cxx |
436 |
-@@ -375,8 +375,8 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent) |
437 |
- #include "vtkTreeToBoostAdapter.h" |
438 |
- #include <boost/graph/visitors.hpp> |
439 |
- #include <boost/graph/depth_first_search.hpp> |
440 |
--#include <boost/property_map.hpp> |
441 |
--#include <boost/vector_property_map.hpp> |
442 |
-+#include <boost/property_map/property_map.hpp> |
443 |
-+#include <boost/property_map/vector_property_map.hpp> |
444 |
- #include <boost/pending/queue.hpp> |
445 |
- |
446 |
- using namespace boost; |
447 |
-diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx |
448 |
-index 2b4681b..eebeaa9 100644 |
449 |
---- a/Parallel/vtkPBGLBreadthFirstSearch.cxx |
450 |
-+++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx |
451 |
-@@ -50,8 +50,8 @@ |
452 |
- #include <boost/graph/distributed/breadth_first_search.hpp> |
453 |
- #include <boost/parallel/algorithm.hpp> |
454 |
- #include <boost/graph/visitors.hpp> |
455 |
--#include <boost/property_map.hpp> |
456 |
--#include <boost/vector_property_map.hpp> |
457 |
-+#include <boost/property_map/property_map.hpp> |
458 |
-+#include <boost/property_map/vector_property_map.hpp> |
459 |
- #include <boost/pending/queue.hpp> |
460 |
- |
461 |
- #include <vtksys/stl/utility> // for pair |
462 |
-diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h |
463 |
-index 7b467b0..bacfd3a 100644 |
464 |
---- a/Parallel/vtkPBGLGraphAdapter.h |
465 |
-+++ b/Parallel/vtkPBGLGraphAdapter.h |
466 |
-@@ -31,7 +31,7 @@ |
467 |
- #include <boost/graph/distributed/mpi_process_group.hpp> |
468 |
- #include <boost/graph/properties.hpp> |
469 |
- #include <boost/graph/parallel/container_traits.hpp> |
470 |
--#include <boost/parallel/local_property_map.hpp> |
471 |
-+#include <boost/property_map/parallel/local_property_map.hpp> |
472 |
- #include <boost/serialization/base_object.hpp> |
473 |
- #include <boost/functional/hash.hpp> |
474 |
- //ETX |
475 |
-diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx |
476 |
-index da4647e..f9c3229 100644 |
477 |
---- a/Parallel/vtkPBGLMinimumSpanningTree.cxx |
478 |
-+++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx |
479 |
-@@ -48,8 +48,8 @@ |
480 |
- #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp> |
481 |
- #include <boost/graph/distributed/vertex_list_adaptor.hpp> |
482 |
- #include <boost/parallel/global_index_map.hpp> |
483 |
--#include <boost/property_map.hpp> |
484 |
--#include <boost/vector_property_map.hpp> |
485 |
-+#include <boost/property_map/property_map.hpp> |
486 |
-+#include <boost/property_map/vector_property_map.hpp> |
487 |
- #include <boost/pending/queue.hpp> |
488 |
- |
489 |
- #include <vtksys/stl/utility> // for pair |
490 |
-diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx |
491 |
-index 074143f..8517304 100644 |
492 |
---- a/Parallel/vtkPBGLShortestPaths.cxx |
493 |
-+++ b/Parallel/vtkPBGLShortestPaths.cxx |
494 |
-@@ -49,8 +49,8 @@ |
495 |
- |
496 |
- #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp> |
497 |
- #include <boost/parallel/algorithm.hpp> |
498 |
--#include <boost/property_map.hpp> |
499 |
--#include <boost/vector_property_map.hpp> |
500 |
-+#include <boost/property_map/property_map.hpp> |
501 |
-+#include <boost/property_map/vector_property_map.hpp> |
502 |
- |
503 |
- #include <vtksys/stl/utility> // for pair |
504 |
- |
505 |
-diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx |
506 |
-index 9aa87a0..301a245 100644 |
507 |
---- a/Parallel/vtkPBGLVertexColoring.cxx |
508 |
-+++ b/Parallel/vtkPBGLVertexColoring.cxx |
509 |
-@@ -47,7 +47,7 @@ |
510 |
- |
511 |
- #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp> |
512 |
- #include <boost/parallel/algorithm.hpp> |
513 |
--#include <boost/property_map.hpp> |
514 |
-+#include <boost/property_map/property_map.hpp> |
515 |
- |
516 |
- #include <vtksys/stl/utility> // for pair |
517 |
- |
518 |
|
519 |
diff --git a/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch b/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch |
520 |
deleted file mode 100644 |
521 |
index 53d43ee..00000000 |
522 |
--- a/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch |
523 |
+++ /dev/null |
524 |
@@ -1,35 +0,0 @@ |
525 |
-diff -Naur VTK/CMake/FindCg.cmake VTK.new/CMake/FindCg.cmake |
526 |
---- VTK/CMake/FindCg.cmake 2005-10-04 11:25:51.000000000 -0400 |
527 |
-+++ VTK.new/CMake/FindCg.cmake 2009-07-17 14:10:30.000000000 -0400 |
528 |
-@@ -82,6 +82,7 @@ |
529 |
- FIND_PROGRAM( CG_COMPILER cgc |
530 |
- /usr/bin |
531 |
- /usr/local/bin |
532 |
-+ /opt/nvidia-cg-toolkit/bin |
533 |
- DOC "The Cg Compiler" |
534 |
- ) |
535 |
- GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
536 |
-@@ -89,6 +90,7 @@ |
537 |
- FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
538 |
- /usr/include |
539 |
- /usr/local/include |
540 |
-+ /opt/nvidia-cg-toolkit/include |
541 |
- ${CG_COMPILER_SUPER_DIR}/include |
542 |
- DOC "The directory where Cg/cg.h resides" |
543 |
- ) |
544 |
-@@ -98,6 +100,7 @@ |
545 |
- /usr/lib |
546 |
- /usr/local/lib64 |
547 |
- /usr/local/lib |
548 |
-+ /opt/nvidia-cg-toolkit/lib |
549 |
- ${CG_COMPILER_SUPER_DIR}/lib64 |
550 |
- ${CG_COMPILER_SUPER_DIR}/lib |
551 |
- DOC "The Cg runtime library" |
552 |
-@@ -108,6 +111,7 @@ |
553 |
- /usr/lib |
554 |
- /usr/local/lib64 |
555 |
- /usr/local/lib |
556 |
-+ /opt/nvidia-cg-toolkit/lib |
557 |
- ${CG_COMPILER_SUPER_DIR}/lib64 |
558 |
- ${CG_COMPILER_SUPER_DIR}/lib |
559 |
- DOC "The Cg runtime library" |
560 |
|
561 |
diff --git a/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch |
562 |
deleted file mode 100644 |
563 |
index 1f12ae9..00000000 |
564 |
--- a/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch |
565 |
+++ /dev/null |
566 |
@@ -1,20 +0,0 @@ |
567 |
---- IO/vtkPNGReader.cxx |
568 |
-+++ IO/vtkPNGReader.cxx |
569 |
-@@ -116,7 +116,7 @@ |
570 |
- // minimum of a byte per pixel |
571 |
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) |
572 |
- { |
573 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
574 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
575 |
- } |
576 |
- |
577 |
- // add alpha if any alpha found |
578 |
-@@ -225,7 +225,7 @@ |
579 |
- // minimum of a byte per pixel |
580 |
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) |
581 |
- { |
582 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
583 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
584 |
- } |
585 |
- |
586 |
- // add alpha if any alpha found |
587 |
|
588 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-R.patch b/sci-libs/vtk/files/vtk-5.6.0-R.patch |
589 |
deleted file mode 100644 |
590 |
index 1327121..00000000 |
591 |
--- a/sci-libs/vtk/files/vtk-5.6.0-R.patch |
592 |
+++ /dev/null |
593 |
@@ -1,57 +0,0 @@ |
594 |
-diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake |
595 |
-index ee49570..c830db0 100644 |
596 |
---- a/CMake/FindR.cmake |
597 |
-+++ b/CMake/FindR.cmake |
598 |
-@@ -18,13 +18,12 @@ IF (R_COMMAND) |
599 |
- ENDIF (R_COMMAND) |
600 |
- SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE}) |
601 |
- |
602 |
--FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") |
603 |
-+FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") |
604 |
- FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).") |
605 |
--FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).") |
606 |
--FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).") |
607 |
-+FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).") |
608 |
- FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.") |
609 |
- |
610 |
--SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE}) |
611 |
-+SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE}) |
612 |
- IF (R_LIBRARY_READLINE) |
613 |
- SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE}) |
614 |
- ENDIF (R_LIBRARY_READLINE) |
615 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
616 |
-index 9d4e881..1a828a4 100644 |
617 |
---- a/CMakeLists.txt |
618 |
-+++ b/CMakeLists.txt |
619 |
-@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA) |
620 |
- ENDIF(JAVA_AWT_LIBRARY) |
621 |
- ENDIF(VTK_WRAP_JAVA) |
622 |
- |
623 |
-+IF(VTK_USE_GNU_R) |
624 |
-+ FIND_PACKAGE(R) |
625 |
-+ENDIF(VTK_USE_GNU_R) |
626 |
- |
627 |
-- |
628 |
-+IF(VTK_USE_BOOST) |
629 |
-+ if (VTK_USE_PARALLEL_BGL) |
630 |
-+ FIND_PACKAGE(Boost 1.39.0 REQUIRED |
631 |
-+ COMPONENTS mpi serialization filesystem system graph_parallel) |
632 |
-+ else (VTK_USE_PARALLEL_BGL) |
633 |
-+ FIND_PACKAGE(Boost REQUIRED) |
634 |
-+ endif (VTK_USE_PARALLEL_BGL) |
635 |
-+ENDIF(VTK_USE_BOOST) |
636 |
- #----------------------------------------------------------------------------- |
637 |
- # The entire VTK tree should use the same include path. |
638 |
- |
639 |
-diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx |
640 |
-index 324e845..56a4869 100644 |
641 |
---- a/Graphics/vtkRInterface.cxx |
642 |
-+++ b/Graphics/vtkRInterface.cxx |
643 |
-@@ -23,6 +23,7 @@ |
644 |
- #undef HAVE_UINTPTR_T |
645 |
- #ifdef HAVE_VTK_UINTPTR_T |
646 |
- #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T |
647 |
-+#include <stdint.h> |
648 |
- #endif |
649 |
- |
650 |
- #include "vtkInformation.h" |
651 |
|
652 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch |
653 |
deleted file mode 100644 |
654 |
index 9319378..00000000 |
655 |
--- a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch |
656 |
+++ /dev/null |
657 |
@@ -1,13 +0,0 @@ |
658 |
-diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx |
659 |
-index 4a764ea..74d0b53 100644 |
660 |
---- a/Infovis/vtkTreeLayoutStrategy.cxx |
661 |
-+++ b/Infovis/vtkTreeLayoutStrategy.cxx |
662 |
-@@ -388,7 +388,7 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent) |
663 |
- #include "vtkTreeToBoostAdapter.h" |
664 |
- #include <boost/graph/visitors.hpp> |
665 |
- #include <boost/graph/depth_first_search.hpp> |
666 |
--#include <boost/property_map.hpp> |
667 |
-+#include <boost/property_map/property_map.hpp> |
668 |
- #include <boost/pending/queue.hpp> |
669 |
- |
670 |
- using namespace boost; |
671 |
|
672 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch |
673 |
deleted file mode 100644 |
674 |
index 984bf50..00000000 |
675 |
--- a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch |
676 |
+++ /dev/null |
677 |
@@ -1,36 +0,0 @@ |
678 |
-diff --git a/CMake/FindCg.cmake b/CMake/FindCg.cmake |
679 |
-index ceb41de..5eb6003 100644 |
680 |
---- a/CMake/FindCg.cmake |
681 |
-+++ b/CMake/FindCg.cmake |
682 |
-@@ -82,6 +82,7 @@ ELSE (APPLE) |
683 |
- FIND_PROGRAM( CG_COMPILER cgc |
684 |
- /usr/bin |
685 |
- /usr/local/bin |
686 |
-+ /opt/nvidia-cg-toolkit/bin |
687 |
- DOC "The Cg Compiler" |
688 |
- ) |
689 |
- GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
690 |
-@@ -89,6 +90,7 @@ ELSE (APPLE) |
691 |
- FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
692 |
- /usr/include |
693 |
- /usr/local/include |
694 |
-+ /opt/nvidia-cg-toolkit/include |
695 |
- ${CG_COMPILER_SUPER_DIR}/include |
696 |
- DOC "The directory where Cg/cg.h resides" |
697 |
- ) |
698 |
-@@ -98,6 +100,7 @@ ELSE (APPLE) |
699 |
- /usr/lib |
700 |
- /usr/local/lib64 |
701 |
- /usr/local/lib |
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 +111,7 @@ ELSE (APPLE) |
707 |
- /usr/lib |
708 |
- /usr/local/lib64 |
709 |
- /usr/local/lib |
710 |
-+ /opt/nvidia-cg-toolkit/lib |
711 |
- ${CG_COMPILER_SUPER_DIR}/lib64 |
712 |
- ${CG_COMPILER_SUPER_DIR}/lib |
713 |
- DOC "The Cg runtime library" |
714 |
|
715 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch |
716 |
deleted file mode 100644 |
717 |
index 2b600c0..00000000 |
718 |
--- a/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch |
719 |
+++ /dev/null |
720 |
@@ -1,42 +0,0 @@ |
721 |
- CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- |
722 |
- CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- |
723 |
- IO/vtkFFMPEGWriter.cxx | 2 +- |
724 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
725 |
- |
726 |
-diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx |
727 |
-index ad691e3..1025c22 100644 |
728 |
---- a/CMake/vtkFFMPEGTestAvAlloc.cxx |
729 |
-+++ b/CMake/vtkFFMPEGTestAvAlloc.cxx |
730 |
-@@ -1,6 +1,6 @@ |
731 |
- extern "C" { |
732 |
- #ifdef HAS_OLD_HEADER |
733 |
--# include <ffmpeg/avformat.h> |
734 |
-+# include <libavformat/avformat.h> |
735 |
- #else |
736 |
- # include <libavformat/avformat.h> |
737 |
- #endif |
738 |
-diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx |
739 |
-index 0bf4314..8c1df58 100644 |
740 |
---- a/CMake/vtkFFMPEGTestURLFClose.cxx |
741 |
-+++ b/CMake/vtkFFMPEGTestURLFClose.cxx |
742 |
-@@ -1,6 +1,6 @@ |
743 |
- extern "C" { |
744 |
- #ifdef HAS_OLD_HEADER |
745 |
--# include <ffmpeg/avformat.h> |
746 |
-+# include <libavformat/avformat.h> |
747 |
- #else |
748 |
- # include <libavformat/avformat.h> |
749 |
- #endif |
750 |
-diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx |
751 |
-index b109c08..e056418 100644 |
752 |
---- a/IO/vtkFFMPEGWriter.cxx |
753 |
-+++ b/IO/vtkFFMPEGWriter.cxx |
754 |
-@@ -22,7 +22,7 @@ |
755 |
- |
756 |
- extern "C" { |
757 |
- #ifdef VTK_FFMPEG_HAS_OLD_HEADER |
758 |
--# include <ffmpeg/avformat.h> |
759 |
-+# include <libavformat/avformat.h> |
760 |
- #else |
761 |
- # include <libavformat/avformat.h> |
762 |
- #endif |
763 |
|
764 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch |
765 |
deleted file mode 100644 |
766 |
index db1f87d..00000000 |
767 |
--- a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch |
768 |
+++ /dev/null |
769 |
@@ -1,22 +0,0 @@ |
770 |
-diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx |
771 |
-index d1f5c2f..0bf00e4 100644 |
772 |
---- a/IO/vtkPNGReader.cxx |
773 |
-+++ b/IO/vtkPNGReader.cxx |
774 |
-@@ -116,7 +116,7 @@ void vtkPNGReader::ExecuteInformation() |
775 |
- // minimum of a byte per pixel |
776 |
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) |
777 |
- { |
778 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
779 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
780 |
- } |
781 |
- |
782 |
- // add alpha if any alpha found |
783 |
-@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *outPtr, |
784 |
- // minimum of a byte per pixel |
785 |
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) |
786 |
- { |
787 |
-- png_set_gray_1_2_4_to_8(png_ptr); |
788 |
-+ png_set_expand_gray_1_2_4_to_8(png_ptr); |
789 |
- } |
790 |
- |
791 |
- // add alpha if any alpha found |
792 |
|
793 |
diff --git a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch |
794 |
deleted file mode 100644 |
795 |
index be24af1..00000000 |
796 |
--- a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch |
797 |
+++ /dev/null |
798 |
@@ -1,12 +0,0 @@ |
799 |
-diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake |
800 |
---- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400 |
801 |
-+++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500 |
802 |
-@@ -30,7 +30,7 @@ |
803 |
- ) |
804 |
- |
805 |
- FIND_LIBRARY( ODBC_LIBRARY |
806 |
-- NAMES iodbc unixodbc |
807 |
-+ NAMES iodbc unixodbc odbc |
808 |
- PATHS |
809 |
- /usr/lib |
810 |
- /usr/lib/odbc |
811 |
|
812 |
diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch |
813 |
deleted file mode 100644 |
814 |
index 34ec528..00000000 |
815 |
--- a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch |
816 |
+++ /dev/null |
817 |
@@ -1,42 +0,0 @@ |
818 |
- CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- |
819 |
- CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- |
820 |
- IO/vtkFFMPEGWriter.cxx | 2 +- |
821 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
822 |
- |
823 |
-diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx |
824 |
-index ad691e3..32489d5 100644 |
825 |
---- a/CMake/vtkFFMPEGTestAvAlloc.cxx |
826 |
-+++ b/CMake/vtkFFMPEGTestAvAlloc.cxx |
827 |
-@@ -1,6 +1,6 @@ |
828 |
- extern "C" { |
829 |
- #ifdef HAS_OLD_HEADER |
830 |
--# include <ffmpeg/avformat.h> |
831 |
-+# include <libavformat/avformat.h> |
832 |
- #else |
833 |
- # include <libavformat/avformat.h> |
834 |
- #endif |
835 |
-diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx |
836 |
-index 0bf4314..1c10a93 100644 |
837 |
---- a/CMake/vtkFFMPEGTestURLFClose.cxx |
838 |
-+++ b/CMake/vtkFFMPEGTestURLFClose.cxx |
839 |
-@@ -1,6 +1,6 @@ |
840 |
- extern "C" { |
841 |
- #ifdef HAS_OLD_HEADER |
842 |
--# include <ffmpeg/avformat.h> |
843 |
-+# include <libavformat/avformat.h> |
844 |
- #else |
845 |
- # include <libavformat/avformat.h> |
846 |
- #endif |
847 |
-diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx |
848 |
-index 52673ef..ffbb78f 100644 |
849 |
---- a/IO/vtkFFMPEGWriter.cxx |
850 |
-+++ b/IO/vtkFFMPEGWriter.cxx |
851 |
-@@ -22,7 +22,7 @@ |
852 |
- |
853 |
- extern "C" { |
854 |
- #ifdef VTK_FFMPEG_HAS_OLD_HEADER |
855 |
--# include <ffmpeg/avformat.h> |
856 |
-+# include <libavformat/avformat.h> |
857 |
- #else |
858 |
- # include <libavformat/avformat.h> |
859 |
- #endif |
860 |
|
861 |
diff --git a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch |
862 |
deleted file mode 100644 |
863 |
index 263e24f..00000000 |
864 |
--- a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch |
865 |
+++ /dev/null |
866 |
@@ -1,29 +0,0 @@ |
867 |
- Common/vtkPythonUtil.cxx | 2 ++ |
868 |
- Utilities/vtkmetaio/metaUtils.cxx | 1 + |
869 |
- 2 files changed, 3 insertions(+), 0 deletions(-) |
870 |
- |
871 |
-diff --git a/Common/vtkPythonUtil.cxx b/Common/vtkPythonUtil.cxx |
872 |
-index 7bc7660..d218e0d 100644 |
873 |
---- a/Common/vtkPythonUtil.cxx |
874 |
-+++ b/Common/vtkPythonUtil.cxx |
875 |
-@@ -31,6 +31,8 @@ |
876 |
- #include <vtkstd/map> |
877 |
- #include <vtkstd/string> |
878 |
- |
879 |
-+#include <cstddef> |
880 |
-+ |
881 |
- // Silent warning like |
882 |
- // "dereferencing type-punned pointer will break strict-aliasing rules" |
883 |
- // it happens because this kind of expression: (long *)&ptr |
884 |
-diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx |
885 |
-index 08d3e8d..bbcc9ec 100644 |
886 |
---- a/Utilities/vtkmetaio/metaUtils.cxx |
887 |
-+++ b/Utilities/vtkmetaio/metaUtils.cxx |
888 |
-@@ -37,6 +37,7 @@ |
889 |
- #include <stdlib.h> |
890 |
- #include <string.h> |
891 |
- #include <string> |
892 |
-+#include <cstddef> |
893 |
- |
894 |
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580) |
895 |
- #include <mem.h> |
896 |
|
897 |
diff --git a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch |
898 |
deleted file mode 100644 |
899 |
index 523919d..00000000 |
900 |
--- a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch |
901 |
+++ /dev/null |
902 |
@@ -1,66 +0,0 @@ |
903 |
-Description: Upstream changes introduced in version 5.6.1-6.1 |
904 |
- This patch has been created by dpkg-source during the package build. |
905 |
- Here's the last changelog entry, hopefully it gives details on why |
906 |
- those changes were made: |
907 |
- . |
908 |
- vtk (5.6.1-6.1) unstable; urgency=low |
909 |
- . |
910 |
- [ Michael Schutte ] |
911 |
- * Non-maintainer upload. |
912 |
- * Remove absolute paths to required libraries from |
913 |
- /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: |
914 |
- #506992. Due to the multiarch transition, the original behavior |
915 |
- frequently causes reverse build-deps to FTBFS. This change should |
916 |
- probably be reverted once all required libraries are multiarched. |
917 |
- . |
918 |
- [ Steve M. Robbins ] |
919 |
- * Override lintian diagnostic about embedded libraries ftgl and sqlite. |
920 |
- * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav |
921 |
- 0.7. |
922 |
- . |
923 |
- The person named in the Author field signed this changelog entry. |
924 |
-Author: Steve M. Robbins <smr@××××××.org> |
925 |
-Bug-Debian: http://bugs.debian.org/506992 |
926 |
- |
927 |
---- |
928 |
-The information above should follow the Patch Tagging Guidelines, please |
929 |
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here |
930 |
-are templates for supplementary fields that you might want to add: |
931 |
- |
932 |
-Origin: <vendor|upstream|other>, <url of original patch> |
933 |
-Bug: <url in upstream bugtracker> |
934 |
-Bug-Debian: http://bugs.debian.org/<bugnumber> |
935 |
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
936 |
-Forwarded: <no|not-needed|url proving that it has been forwarded> |
937 |
-Reviewed-By: <name and email of someone who approved the patch> |
938 |
-Last-Update: <YYYY-MM-DD> |
939 |
- |
940 |
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx |
941 |
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx |
942 |
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() |
943 |
- } |
944 |
- |
945 |
- //choose avi media file format |
946 |
-- this->avOutputFormat = guess_format("avi", NULL, NULL); |
947 |
-+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); |
948 |
- if (!this->avOutputFormat) |
949 |
- { |
950 |
- vtkGenericWarningMacro (<< "Could not open the avi media file format."); |
951 |
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() |
952 |
- //Set up the codec. |
953 |
- AVCodecContext *c = this->avStream->codec; |
954 |
- c->codec_id = (CodecID)this->avOutputFormat->video_codec; |
955 |
-- c->codec_type = CODEC_TYPE_VIDEO; |
956 |
-+ c->codec_type = AVMEDIA_TYPE_VIDEO; |
957 |
- c->width = this->Dim[0]; |
958 |
- c->height = this->Dim[1]; |
959 |
- c->pix_fmt = PIX_FMT_YUVJ420P; |
960 |
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm |
961 |
- pkt.stream_index = this->avStream->index; |
962 |
- if (cc->coded_frame->key_frame) //treat keyframes well |
963 |
- { |
964 |
-- pkt.flags |= PKT_FLAG_KEY; |
965 |
-+ pkt.flags |= AV_PKT_FLAG_KEY; |
966 |
- } |
967 |
- pkt.duration = 0; //presentation duration in time_base units or 0 if NA |
968 |
- pkt.pos = -1; //byte position in stream or -1 if NA |
969 |
|
970 |
diff --git a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch |
971 |
deleted file mode 100644 |
972 |
index 5bb5cbf..00000000 |
973 |
--- a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch |
974 |
+++ /dev/null |
975 |
@@ -1,22 +0,0 @@ |
976 |
-http://bugs.gentoo.org/378393 |
977 |
- |
978 |
---- VTK/IO/vtkPNGWriter.cxx |
979 |
-+++ VTK/IO/vtkPNGWriter.cxx |
980 |
-@@ -147,7 +147,7 @@ |
981 |
- void vtkPNGWriteErrorFunction(png_structp png_ptr, |
982 |
- png_const_charp vtkNotUsed(error_msg)) |
983 |
- { |
984 |
-- longjmp(png_ptr->jmpbuf, 1); |
985 |
-+ longjmp(png_jmpbuf(png_ptr), 1); |
986 |
- } |
987 |
- } |
988 |
- |
989 |
-@@ -223,7 +223,7 @@ |
990 |
- png_init_io(png_ptr, this->TempFP); |
991 |
- png_set_error_fn(png_ptr, png_ptr, |
992 |
- vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction); |
993 |
-- if (setjmp(png_ptr->jmpbuf)) |
994 |
-+ if (setjmp(png_jmpbuf(png_ptr))) |
995 |
- { |
996 |
- fclose(this->TempFP); |
997 |
- this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError); |
998 |
|
999 |
diff --git a/sci-libs/vtk/files/vtk-5.8.0-R.patch b/sci-libs/vtk/files/vtk-5.8.0-R.patch |
1000 |
deleted file mode 100644 |
1001 |
index ce6dcde..00000000 |
1002 |
--- a/sci-libs/vtk/files/vtk-5.8.0-R.patch |
1003 |
+++ /dev/null |
1004 |
@@ -1,45 +0,0 @@ |
1005 |
-diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake |
1006 |
-index ee49570..c830db0 100644 |
1007 |
---- a/CMake/FindR.cmake |
1008 |
-+++ b/CMake/FindR.cmake |
1009 |
-@@ -18,13 +18,12 @@ IF (R_COMMAND) |
1010 |
- ENDIF (R_COMMAND) |
1011 |
- SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE}) |
1012 |
- |
1013 |
--FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") |
1014 |
-+FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h") |
1015 |
- FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).") |
1016 |
--FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).") |
1017 |
--FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).") |
1018 |
-+FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).") |
1019 |
- FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.") |
1020 |
- |
1021 |
--SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE}) |
1022 |
-+SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE}) |
1023 |
- IF (R_LIBRARY_READLINE) |
1024 |
- SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE}) |
1025 |
- ENDIF (R_LIBRARY_READLINE) |
1026 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
1027 |
-index 9d4e881..1a828a4 100644 |
1028 |
---- a/CMakeLists.txt |
1029 |
-+++ b/CMakeLists.txt |
1030 |
-@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA) |
1031 |
- ENDIF(JAVA_AWT_LIBRARY) |
1032 |
- ENDIF(VTK_WRAP_JAVA) |
1033 |
- |
1034 |
-+IF(VTK_USE_GNU_R) |
1035 |
-+ FIND_PACKAGE(R) |
1036 |
-+ENDIF(VTK_USE_GNU_R) |
1037 |
- |
1038 |
-- |
1039 |
-+IF(VTK_USE_BOOST) |
1040 |
-+ if (VTK_USE_PARALLEL_BGL) |
1041 |
-+ FIND_PACKAGE(Boost 1.39.0 REQUIRED |
1042 |
-+ COMPONENTS mpi serialization filesystem system graph_parallel) |
1043 |
-+ else (VTK_USE_PARALLEL_BGL) |
1044 |
-+ FIND_PACKAGE(Boost REQUIRED) |
1045 |
-+ endif (VTK_USE_PARALLEL_BGL) |
1046 |
-+ENDIF(VTK_USE_BOOST) |
1047 |
- #----------------------------------------------------------------------------- |
1048 |
- # The entire VTK tree should use the same include path. |
1049 |
- |
1050 |
|
1051 |
diff --git a/sci-libs/vtk/files/vtk-5.8.0-boost.patch b/sci-libs/vtk/files/vtk-5.8.0-boost.patch |
1052 |
deleted file mode 100644 |
1053 |
index 30a0e9a..00000000 |
1054 |
--- a/sci-libs/vtk/files/vtk-5.8.0-boost.patch |
1055 |
+++ /dev/null |
1056 |
@@ -1,39 +0,0 @@ |
1057 |
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
1058 |
-index c789f6b..13e7cb6 100644 |
1059 |
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
1060 |
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx |
1061 |
-@@ -47,6 +47,21 @@ using namespace boost; |
1062 |
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); |
1063 |
- |
1064 |
- |
1065 |
-+#if BOOST_VERSION >= 104800 // Boost 1.48.x |
1066 |
-+namespace { |
1067 |
-+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { |
1068 |
-+ return e.Id; |
1069 |
-+ } |
1070 |
-+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { |
1071 |
-+# if BOOST_VERSION == 104800 |
1072 |
-+ return e.underlying_desc.Id; |
1073 |
-+# else |
1074 |
-+ return e.underlying_descx.Id; |
1075 |
-+# endif |
1076 |
-+ } |
1077 |
-+} |
1078 |
-+#endif |
1079 |
-+ |
1080 |
- // Redefine the bfs visitor, the only visitor we |
1081 |
- // are using is the tree_edge visitor. |
1082 |
- template <typename IdMap> |
1083 |
-@@ -95,7 +106,12 @@ public: |
1084 |
- |
1085 |
- // Copy the vertex and edge data from the graph to the tree. |
1086 |
- tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); |
1087 |
-+#if BOOST_VERSION < 104800 // Boost 1.48.x |
1088 |
- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); |
1089 |
-+#else |
1090 |
-+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), |
1091 |
-+ unwrap_edge_id(e), tree_e.Id); |
1092 |
-+#endif |
1093 |
- } |
1094 |
- |
1095 |
- private: |
1096 |
|
1097 |
diff --git a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch b/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch |
1098 |
deleted file mode 100644 |
1099 |
index c83a06b..00000000 |
1100 |
--- a/sci-libs/vtk/files/vtk-6.0.0-cg-path.patch |
1101 |
+++ /dev/null |
1102 |
@@ -1,16 +0,0 @@ |
1103 |
- Utilities/MaterialLibrary/CMakeLists.txt | 2 +- |
1104 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
1105 |
- |
1106 |
-diff --git a/Utilities/MaterialLibrary/CMakeLists.txt b/Utilities/MaterialLibrary/CMakeLists.txt |
1107 |
-index 330a189..ede97be 100644 |
1108 |
---- a/Utilities/MaterialLibrary/CMakeLists.txt |
1109 |
-+++ b/Utilities/MaterialLibrary/CMakeLists.txt |
1110 |
-@@ -116,7 +116,7 @@ MACRO(get_modules modules prefix files ) |
1111 |
- ENDMACRO(get_modules) |
1112 |
- |
1113 |
- SET(CMD_DEP ProcessShader) |
1114 |
--SET(CMD ProcessShader) |
1115 |
-+SET(CMD ./ProcessShader.sh) |
1116 |
- |
1117 |
- IF (VTK_USE_CG_SHADERS) |
1118 |
- # Create the Cg library. |
1119 |
|
1120 |
diff --git a/sci-libs/vtk/files/vtk-6.0.0-install.patch b/sci-libs/vtk/files/vtk-6.0.0-install.patch |
1121 |
deleted file mode 100644 |
1122 |
index a97755a..00000000 |
1123 |
--- a/sci-libs/vtk/files/vtk-6.0.0-install.patch |
1124 |
+++ /dev/null |
1125 |
@@ -1,19 +0,0 @@ |
1126 |
-diff -up VTK6.0.0/CMake/vtkModuleTop.cmake.install VTK6.0.0/CMake/vtkModuleTop.cmake |
1127 |
---- VTK6.0.0/CMake/vtkModuleTop.cmake.install 2013-06-12 13:47:10.000000000 -0600 |
1128 |
-+++ VTK6.0.0/CMake/vtkModuleTop.cmake 2013-07-12 16:15:15.706008475 -0600 |
1129 |
-@@ -330,10 +330,15 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) |
1130 |
- CMake/pythonmodules.h.in |
1131 |
- CMake/UseVTK.cmake |
1132 |
- CMake/FindTCL.cmake |
1133 |
-+ CMake/TopologicalSort.cmake |
1134 |
- CMake/vtkTclTkMacros.cmake |
1135 |
- CMake/vtk-forward.c.in |
1136 |
- CMake/vtkForwardingExecutable.cmake |
1137 |
-+ CMake/vtkGroups.cmake |
1138 |
- CMake/vtkJavaWrapping.cmake |
1139 |
-+ CMake/vtkMakeInstantiator.cmake |
1140 |
-+ CMake/vtkMakeInstantiator.cxx.in |
1141 |
-+ CMake/vtkMakeInstantiator.h.in |
1142 |
- CMake/vtkModuleAPI.cmake |
1143 |
- CMake/vtkModuleHeaders.cmake.in |
1144 |
- CMake/vtkModuleInfo.cmake.in |
1145 |
|
1146 |
diff --git a/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch b/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch |
1147 |
deleted file mode 100644 |
1148 |
index df0ef94..00000000 |
1149 |
--- a/sci-libs/vtk/files/vtk-6.0.0-netcdf.patch |
1150 |
+++ /dev/null |
1151 |
@@ -1,75 +0,0 @@ |
1152 |
-diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt |
1153 |
---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 |
1154 |
-+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 |
1155 |
-@@ -10,5 +10,5 @@ set(Module_SRCS |
1156 |
- |
1157 |
- vtk_module_library(vtkIONetCDF ${Module_SRCS}) |
1158 |
- |
1159 |
--target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) |
1160 |
-+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf) |
1161 |
- set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") |
1162 |
-diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf VTK/IO/ParallelNetCDF/CMakeLists.txt |
1163 |
---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000 -0700 |
1164 |
-+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 |
1165 |
-@@ -8,4 +8,4 @@ set(Module_SRCS |
1166 |
- |
1167 |
- vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) |
1168 |
- |
1169 |
--target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) |
1170 |
-+target_link_libraries(vtkIOParallelNetCDF netcdf) |
1171 |
-diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt |
1172 |
---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 |
1173 |
-+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28 15:40:27.534030910 -0700 |
1174 |
-@@ -241,7 +241,7 @@ ENDIF(APPLE) |
1175 |
- |
1176 |
- |
1177 |
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) |
1178 |
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) |
1179 |
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) |
1180 |
- |
1181 |
- #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) |
1182 |
- |
1183 |
-diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt |
1184 |
---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28 14:44:36.000000000 -0700 |
1185 |
-+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700 |
1186 |
-@@ -1,8 +1,12 @@ |
1187 |
- set(vtknetcdf_THIRD_PARTY 1) |
1188 |
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) |
1189 |
--set(vtknetcdf_INCLUDE_DIRS |
1190 |
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
1191 |
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf |
1192 |
-- ) |
1193 |
-+if(NOT VTK_USE_SYSTEM_NETCDF) |
1194 |
-+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) |
1195 |
-+ set(vtknetcdf_INCLUDE_DIRS |
1196 |
-+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
1197 |
-+ ${vtknetcdf_BINARY_DIR}/vtknetcdf |
1198 |
-+ ) |
1199 |
-+ add_subdirectory(vtknetcdf) |
1200 |
-+else(NOT VTK_USE_SYSTEM_NETCDF) |
1201 |
-+ set(vtknetcdf_LIBRARIES netcdf) |
1202 |
-+endif() |
1203 |
- vtk_module_export_info() |
1204 |
--add_subdirectory(vtknetcdf) |
1205 |
-diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdfcpp.h |
1206 |
---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28 14:44:36.000000000 -0700 |
1207 |
-+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289 -0700 |
1208 |
-@@ -16,6 +16,6 @@ |
1209 |
- #define __vtk_netcdfcpp_h |
1210 |
- |
1211 |
- /* Use the netcdf library configured for VTK. */ |
1212 |
--#include <vtknetcdf/cxx/netcdfcpp.h> |
1213 |
-+#include <netcdfcpp.h> |
1214 |
- |
1215 |
- #endif |
1216 |
-diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf VTK/ThirdParty/netcdf/vtk_netcdf.h |
1217 |
---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000 -0700 |
1218 |
-+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700 |
1219 |
-@@ -16,6 +16,6 @@ |
1220 |
- #define __vtk_netcdf_h |
1221 |
- |
1222 |
- /* Use the netcdf library configured for VTK. */ |
1223 |
--#include <vtknetcdf/include/netcdf.h> |
1224 |
-+#include <netcdf.h> |
1225 |
- |
1226 |
- #endif |
1227 |
|
1228 |
diff --git a/sci-libs/vtk/files/vtk-6.0.0-system.patch b/sci-libs/vtk/files/vtk-6.0.0-system.patch |
1229 |
deleted file mode 100644 |
1230 |
index 3e5762f..00000000 |
1231 |
--- a/sci-libs/vtk/files/vtk-6.0.0-system.patch |
1232 |
+++ /dev/null |
1233 |
@@ -1,27 +0,0 @@ |
1234 |
-diff -up VTK6.0.0/CMake/vtkModuleMacros.cmake.system VTK6.0.0/CMake/vtkModuleMacros.cmake |
1235 |
---- VTK6.0.0/CMake/vtkModuleMacros.cmake.system 2013-06-12 13:47:10.000000000 -0600 |
1236 |
-+++ VTK6.0.0/CMake/vtkModuleMacros.cmake 2013-12-27 20:59:39.548152746 -0700 |
1237 |
-@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg) |
1238 |
- message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") |
1239 |
- endif() |
1240 |
- |
1241 |
-- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) |
1242 |
-+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) |
1243 |
- mark_as_advanced(VTK_USE_SYSTEM_${_upper}) |
1244 |
- |
1245 |
- if(VTK_USE_SYSTEM_${_upper}) |
1246 |
-diff -up VTK6.0.0/CMakeLists.txt.system VTK6.0.0/CMakeLists.txt |
1247 |
---- VTK6.0.0/CMakeLists.txt.system 2013-06-12 13:47:10.000000000 -0600 |
1248 |
-+++ VTK6.0.0/CMakeLists.txt 2013-12-27 20:59:39.548152746 -0700 |
1249 |
-@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I |
1250 |
- set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) |
1251 |
- |
1252 |
- #----------------------------------------------------------------------------- |
1253 |
-+# Do we try to use system libraries by default? |
1254 |
-+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) |
1255 |
-+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) |
1256 |
-+ |
1257 |
-+#----------------------------------------------------------------------------- |
1258 |
- # The third party macros are still used in one or two third party builds. |
1259 |
- include(vtkThirdParty) |
1260 |
- |
1261 |
|
1262 |
diff --git a/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch b/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch |
1263 |
deleted file mode 100644 |
1264 |
index f310479..00000000 |
1265 |
--- a/sci-libs/vtk/files/vtk-6.0.0-vtkpython.patch |
1266 |
+++ /dev/null |
1267 |
@@ -1,12 +0,0 @@ |
1268 |
-diff -up VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython VTK6.0.0/Wrapping/Python/CMakeLists.txt |
1269 |
---- VTK6.0.0/Wrapping/Python/CMakeLists.txt.vtkpython 2013-06-12 13:47:10.000000000 -0600 |
1270 |
-+++ VTK6.0.0/Wrapping/Python/CMakeLists.txt 2013-07-26 16:44:19.954295281 -0600 |
1271 |
-@@ -371,3 +371,8 @@ endif() |
1272 |
- |
1273 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in |
1274 |
- ${CMAKE_CURRENT_BINARY_DIR}/setup.py @ONLY IMMEDIATE) |
1275 |
-+ |
1276 |
-+if(NOT VTK_INSTALL_NO_RUNTIME AND NOT VTK_INSTALL_NO_PYTHON) |
1277 |
-+ install(TARGETS vtkpython ${VTKPYTHON_EXECUTABLE} |
1278 |
-+ DESTINATION ${VTK_INSTALL_RUNTIME_DIR}) |
1279 |
-+endif() |
1280 |
|
1281 |
diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild |
1282 |
deleted file mode 100644 |
1283 |
index 4ad7b28..00000000 |
1284 |
--- a/sci-libs/vtk/vtk-6.0.0.ebuild |
1285 |
+++ /dev/null |
1286 |
@@ -1,323 +0,0 @@ |
1287 |
-# Copyright 1999-2015 Gentoo Foundation |
1288 |
-# Distributed under the terms of the GNU General Public License v2 |
1289 |
-# $Id$ |
1290 |
- |
1291 |
-EAPI=5 |
1292 |
- |
1293 |
-PYTHON_COMPAT=( python2_7 ) |
1294 |
-CMAKE_MAKEFILE_GENERATOR=ninja |
1295 |
- |
1296 |
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx |
1297 |
- |
1298 |
-# Short package version |
1299 |
-SPV="$(get_version_component_range 1-2)" |
1300 |
- |
1301 |
-DESCRIPTION="The Visualization Toolkit" |
1302 |
-HOMEPAGE="http://www.vtk.org/" |
1303 |
-SRC_URI=" |
1304 |
- http://www.${PN}.org/files/release/${SPV}/${P/_rc/.rc}.tar.gz |
1305 |
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz )" |
1306 |
- |
1307 |
-LICENSE="BSD LGPL-2" |
1308 |
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
1309 |
-SLOT="0" |
1310 |
-IUSE=" |
1311 |
- aqua boost cg doc examples imaging ffmpeg java mpi mysql odbc |
1312 |
- offscreen postgres python qt4 rendering test theora tk tcl |
1313 |
- video_cards_nvidia views R +X" |
1314 |
- |
1315 |
-REQUIRED_USE=" |
1316 |
- java? ( qt4 ) |
1317 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
1318 |
- tcl? ( rendering ) |
1319 |
- test? ( python ) |
1320 |
- tk? ( tcl ) |
1321 |
- ^^ ( X aqua offscreen )" |
1322 |
- |
1323 |
-RDEPEND=" |
1324 |
- dev-libs/expat |
1325 |
- dev-libs/libxml2:2 |
1326 |
- media-libs/freetype |
1327 |
- media-libs/libpng:0 |
1328 |
- media-libs/mesa |
1329 |
- media-libs/libtheora |
1330 |
- media-libs/tiff:0 |
1331 |
- sci-libs/exodusii |
1332 |
- sci-libs/hdf5:= |
1333 |
- sci-libs/netcdf-cxx:3 |
1334 |
- sys-libs/zlib |
1335 |
- virtual/jpeg:0 |
1336 |
- virtual/opengl |
1337 |
- >=x11-libs/gl2ps-1.3.8 |
1338 |
- x11-libs/libX11 |
1339 |
- x11-libs/libXmu |
1340 |
- x11-libs/libXt |
1341 |
- boost? ( >=dev-libs/boost-1.40.0[mpi?] ) |
1342 |
- cg? ( media-gfx/nvidia-cg-toolkit ) |
1343 |
- examples? ( |
1344 |
- dev-qt/qtcore:4 |
1345 |
- dev-qt/qtgui:4 |
1346 |
- sci-libs/vtkdata |
1347 |
- ) |
1348 |
- ffmpeg? ( virtual/ffmpeg ) |
1349 |
- java? ( >=virtual/jre-1.5:* ) |
1350 |
- mpi? ( virtual/mpi[cxx,romio] ) |
1351 |
- mysql? ( virtual/mysql ) |
1352 |
- odbc? ( dev-db/unixODBC ) |
1353 |
- offscreen? ( media-libs/mesa[osmesa] ) |
1354 |
- postgres? ( dev-db/postgresql:= ) |
1355 |
- python? ( |
1356 |
- ${PYTHON_DEPS} |
1357 |
- dev-python/sip[${PYTHON_USEDEP}] |
1358 |
- ) |
1359 |
- qt4? ( |
1360 |
- dev-qt/designer:4 |
1361 |
- dev-qt/qtcore:4 |
1362 |
- dev-qt/qtgui:4 |
1363 |
- dev-qt/qtopengl:4 |
1364 |
- dev-qt/qtsql:4 |
1365 |
- dev-qt/qtwebkit:4 |
1366 |
- python? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) |
1367 |
- ) |
1368 |
- tcl? ( dev-lang/tcl:0= ) |
1369 |
- tk? ( dev-lang/tk:0= ) |
1370 |
- video_cards_nvidia? ( media-video/nvidia-settings ) |
1371 |
- R? ( dev-lang/R )" |
1372 |
-DEPEND="${RDEPEND} |
1373 |
- doc? ( app-doc/doxygen ) |
1374 |
- java? ( >=virtual/jdk-1.5 ) |
1375 |
- test? ( sci-libs/vtkdata )" |
1376 |
- |
1377 |
-S="${WORKDIR}"/VTK${PV} |
1378 |
- |
1379 |
-PATCHES=( |
1380 |
- "${FILESDIR}"/${P}-cg-path.patch |
1381 |
- "${FILESDIR}"/${P}-install.patch |
1382 |
- "${FILESDIR}"/${P}-system.patch |
1383 |
- "${FILESDIR}"/${P}-netcdf.patch |
1384 |
- "${FILESDIR}"/${P}-vtkpython.patch |
1385 |
- ) |
1386 |
- |
1387 |
-RESTRICT=test |
1388 |
- |
1389 |
-pkg_setup() { |
1390 |
- use java && java-pkg-opt-2_pkg_setup |
1391 |
- use python && python-single-r1_pkg_setup |
1392 |
- |
1393 |
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE |
1394 |
-} |
1395 |
- |
1396 |
-src_prepare() { |
1397 |
- sed \ |
1398 |
- -e 's:libproj4:libproj:g' \ |
1399 |
- -e 's:lib_proj.h:lib_abi.h:g' \ |
1400 |
- -i CMake/FindLIBPROJ4.cmake || die |
1401 |
- |
1402 |
- local x |
1403 |
- for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png tiff zlib; do |
1404 |
- rm -r ThirdParty/${x}/vtk${x} || die |
1405 |
- done |
1406 |
- |
1407 |
- if use examples || use test; then |
1408 |
- # Replace relative path ../../../VTKData with |
1409 |
- # otherwise it will break on symlinks. |
1410 |
- grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs \ |
1411 |
- sed \ |
1412 |
- -e "s|\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \ |
1413 |
- -e "s|\.\./\.\./\.\./\.\./\.\./VTKData|${EPREFIX}/usr/share/vtk/data|g" \ |
1414 |
- -i || die |
1415 |
- fi |
1416 |
- |
1417 |
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" |
1418 |
- |
1419 |
- cmake-utils_src_prepare |
1420 |
-} |
1421 |
- |
1422 |
-src_configure() { |
1423 |
- # general configuration |
1424 |
- local mycmakeargs=( |
1425 |
- -Wno-dev |
1426 |
-# -DCMAKE_SKIP_RPATH=YES |
1427 |
- -DVTK_DIR="${S}" |
1428 |
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir) |
1429 |
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data" |
1430 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
1431 |
- -DVTK_CUSTOM_LIBRARY_SUFFIX="" |
1432 |
- -DBUILD_SHARED_LIBS=ON |
1433 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
1434 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
1435 |
- -DVTK_USE_SYSTEM_FreeType=ON |
1436 |
- -DVTK_USE_SYSTEM_GL2PS=ON |
1437 |
- -DVTK_USE_SYSTEM_HDF5=ON |
1438 |
- -DVTK_USE_SYSTEM_JPEG=ON |
1439 |
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF |
1440 |
-# -DLIBPROJ4_DIR="${EPREFIX}/usr" |
1441 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
1442 |
- -DVTK_USE_SYSTEM_LibXml2=ON |
1443 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
1444 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
1445 |
- -DVTK_USE_SYSTEM_PNG=ON |
1446 |
- -DVTK_USE_SYSTEM_TIFF=ON |
1447 |
-# -DVTK_USE_SYSTEM_XDMF2=ON |
1448 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
1449 |
- -DVTK_USE_SYSTEM_LIBRARIES=ON |
1450 |
- -DVTK_USE_GL2PS=ON |
1451 |
- -DVTK_USE_PARALLEL=ON |
1452 |
- ) |
1453 |
- |
1454 |
- mycmakeargs+=( |
1455 |
- -DVTK_EXTRA_COMPILER_WARNINGS=ON |
1456 |
- -DVTK_Group_StandAlone=ON |
1457 |
- ) |
1458 |
- |
1459 |
- mycmakeargs+=( |
1460 |
- $(cmake-utils_use_build doc DOCUMENTATION) |
1461 |
- $(cmake-utils_use_build examples EXAMPLES) |
1462 |
- $(cmake-utils_use_build test TESTING) |
1463 |
- $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS) |
1464 |
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) |
1465 |
- $(cmake-utils_use imaging VTK_Group_Imaging) |
1466 |
- $(cmake-utils_use mpi VTK_Group_MPI) |
1467 |
- $(cmake-utils_use qt4 VTK_Group_Qt) |
1468 |
- $(cmake-utils_use rendering VTK_Group_Rendering) |
1469 |
- $(cmake-utils_use tk VTK_Group_Tk) |
1470 |
- $(cmake-utils_use views VTK_Group_Views) |
1471 |
- $(cmake-utils_use java VTK_WRAP_JAVA) |
1472 |
- $(cmake-utils_use python VTK_WRAP_PYTHON) |
1473 |
- $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) |
1474 |
- $(cmake-utils_use tcl VTK_WRAP_TCL) |
1475 |
-# -DVTK_BUILD_ALL_MODULES=ON |
1476 |
- ) |
1477 |
- |
1478 |
- mycmakeargs+=( |
1479 |
- $(cmake-utils_use boost VTK_USE_BOOST) |
1480 |
- $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1481 |
- $(cmake-utils_use odbc VTK_USE_ODBC) |
1482 |
- $(cmake-utils_use offscreen VTK_USE_OFFSCREEN) |
1483 |
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) |
1484 |
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) |
1485 |
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1486 |
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL) |
1487 |
- $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR) |
1488 |
- $(cmake-utils_use X VTK_USE_X) |
1489 |
- ) |
1490 |
- |
1491 |
- # Apple stuff, does it really work? |
1492 |
- mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) ) |
1493 |
- |
1494 |
- if use java; then |
1495 |
-# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm |
1496 |
-# |
1497 |
-# mycmakeargs+=( |
1498 |
-# -DJAVAC=${EPREFIX}/usr/bin/javac |
1499 |
-# -DJAVAC=$(java-config -c) |
1500 |
-# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include |
1501 |
-# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include |
1502 |
-# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux |
1503 |
-# ) |
1504 |
-# |
1505 |
- if [ "${ARCH}" == "amd64" ]; then |
1506 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" ) |
1507 |
- else |
1508 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" ) |
1509 |
- fi |
1510 |
- fi |
1511 |
- if use python; then |
1512 |
- mycmakeargs+=( |
1513 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
1514 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
1515 |
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" |
1516 |
- -DSIP_INCLUDE_DIR="$(python_get_includedir)" |
1517 |
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
1518 |
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
1519 |
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}" |
1520 |
- ) |
1521 |
- fi |
1522 |
- |
1523 |
- if use qt4; then |
1524 |
- mycmakeargs+=( |
1525 |
- -DVTK_USE_QVTK=ON |
1526 |
- -DVTK_USE_QVTK_OPENGL=ON |
1527 |
- -DVTK_USE_QVTK_QTOPENGL=ON |
1528 |
- -DQT_WRAP_CPP=ON |
1529 |
- -DQT_WRAP_UI=ON |
1530 |
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer |
1531 |
- -DDESIRED_QT_VERSION=4 |
1532 |
- -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc" |
1533 |
- -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic" |
1534 |
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4" |
1535 |
- -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" |
1536 |
- ) |
1537 |
- fi |
1538 |
- |
1539 |
- if use R; then |
1540 |
- mycmakeargs+=( |
1541 |
-# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas) |
1542 |
-# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack) |
1543 |
- -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so |
1544 |
- -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so |
1545 |
- ) |
1546 |
- fi |
1547 |
- |
1548 |
- cmake-utils_src_configure |
1549 |
- |
1550 |
- cat >> "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh <<- EOF |
1551 |
- #!${EPREFIX}/bin/bash |
1552 |
- |
1553 |
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib |
1554 |
- "${BUILD_DIR}"/bin/vtkProcessShader \$@ |
1555 |
- EOF |
1556 |
- chmod 750 "${BUILD_DIR}"/Utilities/MaterialLibrary/ProcessShader.sh || die |
1557 |
-} |
1558 |
- |
1559 |
-src_test() { |
1560 |
- local tcllib |
1561 |
- ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die |
1562 |
- for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do |
1563 |
- ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die |
1564 |
- done |
1565 |
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/ |
1566 |
- local VIRTUALX_COMMAND="cmake-utils_src_test" |
1567 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java" |
1568 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365" |
1569 |
- virtualmake |
1570 |
-} |
1571 |
- |
1572 |
-src_install() { |
1573 |
- # install docs |
1574 |
- HTML_DOCS=( "${S}"/README.html ) |
1575 |
- |
1576 |
- cmake-utils_src_install |
1577 |
- |
1578 |
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar |
1579 |
- |
1580 |
- if use tcl; then |
1581 |
- # install Tcl docs |
1582 |
- docinto vtk_tcl |
1583 |
- dodoc "${S}"/Wrapping/Tcl/README |
1584 |
- fi |
1585 |
- |
1586 |
- # install examples |
1587 |
- if use examples; then |
1588 |
- insinto /usr/share/${PN} |
1589 |
- mv -v Examples examples || die |
1590 |
- doins -r examples |
1591 |
- fi |
1592 |
- |
1593 |
- #install big docs |
1594 |
- if use doc; then |
1595 |
- cd "${WORKDIR}"/html || die |
1596 |
- rm -f *.md5 || die "Failed to remove superfluous hashes" |
1597 |
- einfo "Installing API docs. This may take some time." |
1598 |
- insinto "/usr/share/doc/${PF}/api-docs" |
1599 |
- doins -r ./* |
1600 |
- fi |
1601 |
- |
1602 |
- # environment |
1603 |
- cat >> "${T}"/40${PN} <<- EOF |
1604 |
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data |
1605 |
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} |
1606 |
- VTKHOME=${EPREFIX}/usr |
1607 |
- EOF |
1608 |
- doenvd "${T}"/40${PN} |
1609 |
-} |
1610 |
|
1611 |
diff --git a/sci-libs/vtk/vtk-6.1.0-r1.ebuild b/sci-libs/vtk/vtk-6.1.0-r1.ebuild |
1612 |
deleted file mode 100644 |
1613 |
index ba84258..00000000 |
1614 |
--- a/sci-libs/vtk/vtk-6.1.0-r1.ebuild |
1615 |
+++ /dev/null |
1616 |
@@ -1,389 +0,0 @@ |
1617 |
-# Copyright 1999-2015 Gentoo Foundation |
1618 |
-# Distributed under the terms of the GNU General Public License v2 |
1619 |
-# $Id$ |
1620 |
- |
1621 |
-EAPI=5 |
1622 |
- |
1623 |
-PYTHON_COMPAT=( python2_7 ) |
1624 |
-CMAKE_MAKEFILE_GENERATOR=ninja |
1625 |
-WEBAPP_OPTIONAL=yes |
1626 |
-WEBAPP_MANUAL_SLOT=yes |
1627 |
- |
1628 |
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp |
1629 |
- |
1630 |
-# Short package version |
1631 |
-SPV="$(get_version_component_range 1-2)" |
1632 |
- |
1633 |
-DESCRIPTION="The Visualization Toolkit" |
1634 |
-HOMEPAGE="http://www.vtk.org/" |
1635 |
-SRC_URI=" |
1636 |
- http://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz |
1637 |
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz ) |
1638 |
- test? ( |
1639 |
- http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz |
1640 |
- http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz |
1641 |
- ) |
1642 |
- " |
1643 |
- |
1644 |
-LICENSE="BSD LGPL-2" |
1645 |
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
1646 |
-SLOT="0" |
1647 |
-IUSE=" |
1648 |
- all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi |
1649 |
- mysql odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl |
1650 |
- video_cards_nvidia views web xdmf2 R +X" |
1651 |
- |
1652 |
-REQUIRED_USE=" |
1653 |
- all-modules? ( python xdmf2 ) |
1654 |
- java? ( qt4 ) |
1655 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
1656 |
- tcl? ( rendering ) |
1657 |
- smp? ( ^^ ( kaapi tbb ) ) |
1658 |
- test? ( python ) |
1659 |
- tk? ( tcl ) |
1660 |
- web? ( python ) |
1661 |
- ^^ ( X aqua offscreen ) |
1662 |
- " |
1663 |
- |
1664 |
-RDEPEND=" |
1665 |
- dev-libs/expat |
1666 |
- dev-libs/jsoncpp |
1667 |
- dev-libs/libxml2:2 |
1668 |
- >=media-libs/freetype-2.5.4 |
1669 |
- media-libs/libpng:0 |
1670 |
- media-libs/mesa |
1671 |
- media-libs/libtheora |
1672 |
- media-libs/tiff:0 |
1673 |
- sci-libs/exodusii |
1674 |
- sci-libs/hdf5:= |
1675 |
- sci-libs/netcdf-cxx:3 |
1676 |
- sys-libs/zlib |
1677 |
- virtual/jpeg:0 |
1678 |
- virtual/opengl |
1679 |
- >=x11-libs/gl2ps-1.3.8 |
1680 |
- x11-libs/libX11 |
1681 |
- x11-libs/libXmu |
1682 |
- x11-libs/libXt |
1683 |
- boost? ( >=dev-libs/boost-1.40.0[mpi?] ) |
1684 |
- cg? ( media-gfx/nvidia-cg-toolkit ) |
1685 |
- examples? ( |
1686 |
- dev-qt/qtcore:4 |
1687 |
- dev-qt/qtgui:4 |
1688 |
- sci-libs/vtkdata |
1689 |
- ) |
1690 |
- ffmpeg? ( virtual/ffmpeg ) |
1691 |
- gdal? ( sci-libs/gdal ) |
1692 |
- java? ( >=virtual/jre-1.5:* ) |
1693 |
- kaapi? ( <sci-libs/xkaapi-3 ) |
1694 |
- mpi? ( |
1695 |
- virtual/mpi[cxx,romio] |
1696 |
- python? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
1697 |
- mysql? ( virtual/mysql ) |
1698 |
- odbc? ( dev-db/unixODBC ) |
1699 |
- offscreen? ( media-libs/mesa[osmesa] ) |
1700 |
- postgres? ( dev-db/postgresql:= ) |
1701 |
- python? ( |
1702 |
- ${PYTHON_DEPS} |
1703 |
- dev-python/sip[${PYTHON_USEDEP}] |
1704 |
- ) |
1705 |
- ) |
1706 |
- qt4? ( |
1707 |
- dev-qt/designer:4 |
1708 |
- dev-qt/qtcore:4 |
1709 |
- dev-qt/qtgui:4 |
1710 |
- dev-qt/qtopengl:4 |
1711 |
- dev-qt/qtsql:4 |
1712 |
- dev-qt/qtwebkit:4 |
1713 |
- python? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) |
1714 |
- ) |
1715 |
- tbb? ( dev-cpp/tbb ) |
1716 |
- tcl? ( dev-lang/tcl:0= ) |
1717 |
- tk? ( dev-lang/tk:0= ) |
1718 |
- video_cards_nvidia? ( media-video/nvidia-settings ) |
1719 |
- web? ( |
1720 |
- ${WEBAPP_DEPEND} |
1721 |
- python? ( |
1722 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
1723 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
1724 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
1725 |
- ) |
1726 |
- ) |
1727 |
- xdmf2? ( sci-libs/xdmf2 ) |
1728 |
- R? ( dev-lang/R )" |
1729 |
-DEPEND="${RDEPEND} |
1730 |
- doc? ( app-doc/doxygen ) |
1731 |
- java? ( >=virtual/jdk-1.5 )" |
1732 |
- |
1733 |
-S="${WORKDIR}"/VTK-${PV} |
1734 |
- |
1735 |
-PATCHES=( |
1736 |
- "${FILESDIR}"/${P}-freetype.patch |
1737 |
- "${FILESDIR}"/${P}-install.patch |
1738 |
- "${FILESDIR}"/${P}-system.patch |
1739 |
- "${FILESDIR}"/${P}-netcdf.patch |
1740 |
- "${FILESDIR}"/${P}-web.patch |
1741 |
- "${FILESDIR}"/${P}-glext.patch |
1742 |
- "${FILESDIR}"/${P}-memset.patch |
1743 |
- ) |
1744 |
- |
1745 |
-RESTRICT=test |
1746 |
- |
1747 |
-pkg_setup() { |
1748 |
- use java && java-pkg-opt-2_pkg_setup |
1749 |
- use python && python-single-r1_pkg_setup |
1750 |
- use web && webapp_pkg_setup |
1751 |
- |
1752 |
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE |
1753 |
-} |
1754 |
- |
1755 |
-src_prepare() { |
1756 |
- sed \ |
1757 |
- -e 's:libproj4:libproj:g' \ |
1758 |
- -e 's:lib_proj.h:lib_abi.h:g' \ |
1759 |
- -i CMake/FindLIBPROJ4.cmake || die |
1760 |
- |
1761 |
- local x |
1762 |
- # missing: VPIC alglib exodusII freerange ftgl libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 |
1763 |
- for x in expat freetype gl2ps hdf5 jpeg jsoncpp libxml2 netcdf oggtheora png tiff zlib; do |
1764 |
- ebegin "Dropping bundled ${x}" |
1765 |
- rm -r ThirdParty/${x}/vtk${x} || die |
1766 |
- eend $? |
1767 |
- done |
1768 |
- rm -r \ |
1769 |
- ThirdParty/AutobahnPython/autobahn \ |
1770 |
- ThirdParty/Twisted/twisted \ |
1771 |
- ThirdParty/ZopeInterface/zope \ |
1772 |
- || die |
1773 |
- |
1774 |
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" |
1775 |
- |
1776 |
- if use mpi; then |
1777 |
- export CC=mpicc |
1778 |
- export CXX=mpicxx |
1779 |
- export FC=mpif90 |
1780 |
- export F90=mpif90 |
1781 |
- export F77=mpif77 |
1782 |
- fi |
1783 |
- |
1784 |
- cmake-utils_src_prepare |
1785 |
-} |
1786 |
- |
1787 |
-src_configure() { |
1788 |
- # general configuration |
1789 |
- local mycmakeargs=( |
1790 |
- -Wno-dev |
1791 |
-# -DCMAKE_SKIP_RPATH=YES |
1792 |
- -DVTK_DIR="${S}" |
1793 |
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir) |
1794 |
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data" |
1795 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
1796 |
- -DVTK_CUSTOM_LIBRARY_SUFFIX="" |
1797 |
- -DBUILD_SHARED_LIBS=ON |
1798 |
- -DVTK_USE_SYSTEM_AUTOBAHN=ON |
1799 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
1800 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
1801 |
- -DVTK_USE_SYSTEM_FreeType=ON |
1802 |
- -DVTK_USE_SYSTEM_GL2PS=ON |
1803 |
- -DVTK_USE_SYSTEM_HDF5=ON |
1804 |
- -DVTK_USE_SYSTEM_JPEG=ON |
1805 |
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF |
1806 |
-# -DLIBPROJ4_DIR="${EPREFIX}/usr" |
1807 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
1808 |
- -DVTK_USE_SYSTEM_LibXml2=ON |
1809 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
1810 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
1811 |
- -DVTK_USE_SYSTEM_PNG=ON |
1812 |
- -DVTK_USE_SYSTEM_TIFF=ON |
1813 |
- -DVTK_USE_SYSTEM_TWISTED=ON |
1814 |
- -DVTK_USE_SYSTEM_XDMF2=OFF |
1815 |
- -DVTK_USE_SYSTEM_XDMF3=OFF |
1816 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
1817 |
- -DVTK_USE_SYSTEM_ZOPE=ON |
1818 |
- -DVTK_USE_SYSTEM_LIBRARIES=ON |
1819 |
- -DVTK_USE_GL2PS=ON |
1820 |
- -DVTK_USE_LARGE_DATA=ON |
1821 |
- -DVTK_USE_PARALLEL=ON |
1822 |
- ) |
1823 |
- |
1824 |
- mycmakeargs+=( |
1825 |
- -DVTK_EXTRA_COMPILER_WARNINGS=ON |
1826 |
- -DVTK_Group_StandAlone=ON |
1827 |
- ) |
1828 |
- |
1829 |
- mycmakeargs+=( |
1830 |
- $(cmake-utils_use_build doc DOCUMENTATION) |
1831 |
- $(cmake-utils_use_build examples EXAMPLES) |
1832 |
- $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS) |
1833 |
- $(cmake-utils_use all-modules VTK_BUILD_ALL_MODULES) |
1834 |
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) |
1835 |
- $(cmake-utils_use imaging VTK_Group_Imaging) |
1836 |
- $(cmake-utils_use mpi VTK_Group_MPI) |
1837 |
- $(cmake-utils_use qt4 VTK_Group_Qt) |
1838 |
- $(cmake-utils_use rendering VTK_Group_Rendering) |
1839 |
- $(cmake-utils_use tk VTK_Group_Tk) |
1840 |
- $(cmake-utils_use views VTK_Group_Views) |
1841 |
- $(cmake-utils_use web VTK_Group_Web) |
1842 |
- $(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}") |
1843 |
- $(cmake-utils_use java VTK_WRAP_JAVA) |
1844 |
- $(cmake-utils_use python VTK_WRAP_PYTHON) |
1845 |
- $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) |
1846 |
- $(cmake-utils_use tcl VTK_WRAP_TCL) |
1847 |
- ) |
1848 |
- |
1849 |
- mycmakeargs+=( |
1850 |
- $(cmake-utils_use boost VTK_USE_BOOST) |
1851 |
- $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
1852 |
- $(cmake-utils_use odbc VTK_USE_ODBC) |
1853 |
- $(cmake-utils_use offscreen VTK_USE_OFFSCREEN) |
1854 |
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) |
1855 |
- $(cmake-utils_use smp vtkFiltersSMP) |
1856 |
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) |
1857 |
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL) |
1858 |
- $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR) |
1859 |
- $(cmake-utils_use X VTK_USE_X) |
1860 |
- ) |
1861 |
- |
1862 |
- # IO |
1863 |
- mycmakeargs+=( |
1864 |
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
1865 |
- $(cmake-utils_use gdal Module_vtkIOGDAL) |
1866 |
- $(cmake-utils_use json Module_vtkIOGeoJSON) |
1867 |
- $(cmake-utils_use xdmf2 Module_vtkIOXdmf2) |
1868 |
- ) |
1869 |
- # Apple stuff, does it really work? |
1870 |
- mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) ) |
1871 |
- |
1872 |
- if use examples || use test; then |
1873 |
- mycmakeargs+=( -DBUILD_TESTING=ON ) |
1874 |
- fi |
1875 |
- |
1876 |
- if use kaapi; then |
1877 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" ) |
1878 |
- elif use tbb; then |
1879 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) |
1880 |
- else |
1881 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) |
1882 |
- fi |
1883 |
- |
1884 |
- if use java; then |
1885 |
-# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm |
1886 |
-# |
1887 |
-# mycmakeargs+=( |
1888 |
-# -DJAVAC=${EPREFIX}/usr/bin/javac |
1889 |
-# -DJAVAC=$(java-config -c) |
1890 |
-# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include |
1891 |
-# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include |
1892 |
-# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux |
1893 |
-# ) |
1894 |
-# |
1895 |
- if [ "${ARCH}" == "amd64" ]; then |
1896 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" ) |
1897 |
- else |
1898 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" ) |
1899 |
- fi |
1900 |
- fi |
1901 |
- if use python; then |
1902 |
- mycmakeargs+=( |
1903 |
- -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)" |
1904 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
1905 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
1906 |
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" |
1907 |
- -DSIP_INCLUDE_DIR="$(python_get_includedir)" |
1908 |
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
1909 |
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
1910 |
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}" |
1911 |
- ) |
1912 |
- fi |
1913 |
- |
1914 |
- if use qt4; then |
1915 |
- mycmakeargs+=( |
1916 |
- -DVTK_USE_QVTK=ON |
1917 |
- -DVTK_USE_QVTK_OPENGL=ON |
1918 |
- -DVTK_USE_QVTK_QTOPENGL=ON |
1919 |
- -DQT_WRAP_CPP=ON |
1920 |
- -DQT_WRAP_UI=ON |
1921 |
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer |
1922 |
- -DDESIRED_QT_VERSION=4 |
1923 |
- -DVTK_QT_VERSION=4 |
1924 |
- -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc" |
1925 |
- -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic" |
1926 |
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4" |
1927 |
- -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" |
1928 |
- ) |
1929 |
- fi |
1930 |
- |
1931 |
- if use R; then |
1932 |
- mycmakeargs+=( |
1933 |
-# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas) |
1934 |
-# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack) |
1935 |
- -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so |
1936 |
- -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so |
1937 |
- ) |
1938 |
- fi |
1939 |
- |
1940 |
- cmake-utils_src_configure |
1941 |
-} |
1942 |
- |
1943 |
-src_test() { |
1944 |
- local tcllib |
1945 |
- ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die |
1946 |
- for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do |
1947 |
- ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die |
1948 |
- done |
1949 |
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/ |
1950 |
- local VIRTUALX_COMMAND="cmake-utils_src_test" |
1951 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java" |
1952 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365" |
1953 |
- virtualmake |
1954 |
-} |
1955 |
- |
1956 |
-src_install() { |
1957 |
- use web && webapp_src_preinst |
1958 |
- # install docs |
1959 |
- HTML_DOCS=( "${S}"/README.html ) |
1960 |
- |
1961 |
- cmake-utils_src_install |
1962 |
- |
1963 |
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar |
1964 |
- |
1965 |
- if use tcl; then |
1966 |
- # install Tcl docs |
1967 |
- docinto vtk_tcl |
1968 |
- dodoc "${S}"/Wrapping/Tcl/README |
1969 |
- fi |
1970 |
- |
1971 |
- # install examples |
1972 |
- if use examples; then |
1973 |
- insinto /usr/share/${PN} |
1974 |
- mv -v Examples examples || die |
1975 |
- doins -r examples |
1976 |
- fi |
1977 |
- |
1978 |
- #install big docs |
1979 |
- if use doc; then |
1980 |
- cd "${WORKDIR}"/html || die |
1981 |
- rm -f *.md5 || die "Failed to remove superfluous hashes" |
1982 |
- einfo "Installing API docs. This may take some time." |
1983 |
- docinto html |
1984 |
- dodoc -r ./* |
1985 |
- fi |
1986 |
- |
1987 |
- # environment |
1988 |
- cat >> "${T}"/40${PN} <<- EOF |
1989 |
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data |
1990 |
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} |
1991 |
- VTKHOME=${EPREFIX}/usr |
1992 |
- EOF |
1993 |
- doenvd "${T}"/40${PN} |
1994 |
- |
1995 |
- use web && webapp_src_install |
1996 |
-} |
1997 |
- |
1998 |
-# webapp.eclass exports these but we want it optional #534036 |
1999 |
-pkg_postinst() { |
2000 |
- use web && webapp_pkg_postinst |
2001 |
-} |
2002 |
- |
2003 |
-pkg_prerm() { |
2004 |
- use web && webapp_pkg_prerm |
2005 |
-} |
2006 |
|
2007 |
diff --git a/sci-libs/vtk/vtk-6.1.0.ebuild b/sci-libs/vtk/vtk-6.1.0.ebuild |
2008 |
deleted file mode 100644 |
2009 |
index d6e71e1..00000000 |
2010 |
--- a/sci-libs/vtk/vtk-6.1.0.ebuild |
2011 |
+++ /dev/null |
2012 |
@@ -1,379 +0,0 @@ |
2013 |
-# Copyright 1999-2015 Gentoo Foundation |
2014 |
-# Distributed under the terms of the GNU General Public License v2 |
2015 |
-# $Id$ |
2016 |
- |
2017 |
-EAPI=5 |
2018 |
- |
2019 |
-PYTHON_COMPAT=( python2_7 ) |
2020 |
-CMAKE_MAKEFILE_GENERATOR=ninja |
2021 |
-WEBAPP_OPTIONAL=yes |
2022 |
-WEBAPP_MANUAL_SLOT=yes |
2023 |
- |
2024 |
-inherit eutils flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp |
2025 |
- |
2026 |
-# Short package version |
2027 |
-SPV="$(get_version_component_range 1-2)" |
2028 |
- |
2029 |
-DESCRIPTION="The Visualization Toolkit" |
2030 |
-HOMEPAGE="http://www.vtk.org/" |
2031 |
-SRC_URI=" |
2032 |
- http://www.${PN}.org/files/release/${SPV}/VTK-${PV}.tar.gz |
2033 |
- doc? ( http://www.${PN}.org/files/release/${SPV}/${PN}DocHtml-${PV}.tar.gz ) |
2034 |
- test? ( |
2035 |
- http://www.${PN}.org/files/release/${SPV}/VTKData-${PV}.tar.gz |
2036 |
- http://www.${PN}.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz |
2037 |
- ) |
2038 |
- " |
2039 |
- |
2040 |
-LICENSE="BSD LGPL-2" |
2041 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
2042 |
-SLOT="0" |
2043 |
-IUSE=" |
2044 |
- all-modules aqua boost cg doc examples imaging ffmpeg gdal java json kaapi mpi |
2045 |
- mysql odbc offscreen postgres python qt4 rendering smp tbb test theora tk tcl |
2046 |
- video_cards_nvidia views web xdmf2 R +X" |
2047 |
- |
2048 |
-REQUIRED_USE=" |
2049 |
- all-modules? ( python xdmf2 ) |
2050 |
- java? ( qt4 ) |
2051 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
2052 |
- tcl? ( rendering ) |
2053 |
- smp? ( ^^ ( kaapi tbb ) ) |
2054 |
- test? ( python ) |
2055 |
- tk? ( tcl ) |
2056 |
- web? ( python ) |
2057 |
- ^^ ( X aqua offscreen ) |
2058 |
- " |
2059 |
- |
2060 |
-RDEPEND=" |
2061 |
- dev-libs/expat |
2062 |
- dev-libs/libxml2:2 |
2063 |
- >=media-libs/freetype-2.5.4 |
2064 |
- media-libs/libpng:0 |
2065 |
- media-libs/mesa |
2066 |
- media-libs/libtheora |
2067 |
- media-libs/tiff:0 |
2068 |
- sci-libs/exodusii |
2069 |
- sci-libs/hdf5:= |
2070 |
- sci-libs/netcdf-cxx:3 |
2071 |
- sys-libs/zlib |
2072 |
- virtual/jpeg:0 |
2073 |
- virtual/opengl |
2074 |
- >=x11-libs/gl2ps-1.3.8 |
2075 |
- x11-libs/libX11 |
2076 |
- x11-libs/libXmu |
2077 |
- x11-libs/libXt |
2078 |
- boost? ( >=dev-libs/boost-1.40.0[mpi?] ) |
2079 |
- cg? ( media-gfx/nvidia-cg-toolkit ) |
2080 |
- examples? ( |
2081 |
- dev-qt/qtcore:4 |
2082 |
- dev-qt/qtgui:4 |
2083 |
- sci-libs/vtkdata |
2084 |
- ) |
2085 |
- ffmpeg? ( virtual/ffmpeg ) |
2086 |
- gdal? ( sci-libs/gdal ) |
2087 |
- java? ( >=virtual/jre-1.5:* ) |
2088 |
- kaapi? ( <sci-libs/xkaapi-3 ) |
2089 |
- mpi? ( |
2090 |
- virtual/mpi[cxx,romio] |
2091 |
- python? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
2092 |
- mysql? ( virtual/mysql ) |
2093 |
- odbc? ( dev-db/unixODBC ) |
2094 |
- offscreen? ( media-libs/mesa[osmesa] ) |
2095 |
- postgres? ( dev-db/postgresql:= ) |
2096 |
- python? ( |
2097 |
- ${PYTHON_DEPS} |
2098 |
- dev-python/sip[${PYTHON_USEDEP}] |
2099 |
- ) |
2100 |
- ) |
2101 |
- qt4? ( |
2102 |
- dev-qt/designer:4 |
2103 |
- dev-qt/qtcore:4 |
2104 |
- dev-qt/qtgui:4 |
2105 |
- dev-qt/qtopengl:4 |
2106 |
- dev-qt/qtsql:4 |
2107 |
- dev-qt/qtwebkit:4 |
2108 |
- python? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) |
2109 |
- ) |
2110 |
- tbb? ( dev-cpp/tbb ) |
2111 |
- tcl? ( dev-lang/tcl:0= ) |
2112 |
- tk? ( dev-lang/tk:0= ) |
2113 |
- video_cards_nvidia? ( media-video/nvidia-settings ) |
2114 |
- web? ( |
2115 |
- ${WEBAPP_DEPEND} |
2116 |
- python? ( |
2117 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
2118 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
2119 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
2120 |
- ) |
2121 |
- ) |
2122 |
- xdmf2? ( sci-libs/xdmf2 ) |
2123 |
- R? ( dev-lang/R )" |
2124 |
-DEPEND="${RDEPEND} |
2125 |
- doc? ( app-doc/doxygen ) |
2126 |
- java? ( >=virtual/jdk-1.5 )" |
2127 |
- |
2128 |
-S="${WORKDIR}"/VTK-${PV} |
2129 |
- |
2130 |
-PATCHES=( |
2131 |
- "${FILESDIR}"/${P}-freetype.patch |
2132 |
- "${FILESDIR}"/${P}-install.patch |
2133 |
- "${FILESDIR}"/${P}-system.patch |
2134 |
- "${FILESDIR}"/${P}-netcdf.patch |
2135 |
- "${FILESDIR}"/${P}-web.patch |
2136 |
- "${FILESDIR}"/${P}-glext.patch |
2137 |
- ) |
2138 |
- |
2139 |
-RESTRICT=test |
2140 |
- |
2141 |
-pkg_setup() { |
2142 |
- use java && java-pkg-opt-2_pkg_setup |
2143 |
- use python && python-single-r1_pkg_setup |
2144 |
- use web && webapp_pkg_setup |
2145 |
- |
2146 |
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE |
2147 |
-} |
2148 |
- |
2149 |
-src_prepare() { |
2150 |
- sed \ |
2151 |
- -e 's:libproj4:libproj:g' \ |
2152 |
- -e 's:lib_proj.h:lib_abi.h:g' \ |
2153 |
- -i CMake/FindLIBPROJ4.cmake || die |
2154 |
- |
2155 |
- local x |
2156 |
- # missing: VPIC alglib exodusII freerange ftgl libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 |
2157 |
- for x in expat freetype gl2ps hdf5 jpeg jsoncpp libxml2 netcdf oggtheora png tiff zlib; do |
2158 |
- ebegin "Dropping bundled ${x}" |
2159 |
- rm -r ThirdParty/${x}/vtk${x} || die |
2160 |
- eend $? |
2161 |
- done |
2162 |
- rm -r \ |
2163 |
- ThirdParty/AutobahnPython/autobahn \ |
2164 |
- ThirdParty/Twisted/twisted \ |
2165 |
- ThirdParty/ZopeInterface/zope \ |
2166 |
- || die |
2167 |
- |
2168 |
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" |
2169 |
- |
2170 |
- if use mpi; then |
2171 |
- export CC=mpicc |
2172 |
- export CXX=mpicxx |
2173 |
- export FC=mpif90 |
2174 |
- export F90=mpif90 |
2175 |
- export F77=mpif77 |
2176 |
- fi |
2177 |
- |
2178 |
- cmake-utils_src_prepare |
2179 |
-} |
2180 |
- |
2181 |
-src_configure() { |
2182 |
- # general configuration |
2183 |
- local mycmakeargs=( |
2184 |
- -Wno-dev |
2185 |
-# -DCMAKE_SKIP_RPATH=YES |
2186 |
- -DVTK_DIR="${S}" |
2187 |
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir) |
2188 |
- -DVTK_DATA_ROOT:PATH="${EPREFIX}/usr/share/${PN}/data" |
2189 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
2190 |
- -DVTK_CUSTOM_LIBRARY_SUFFIX="" |
2191 |
- -DBUILD_SHARED_LIBS=ON |
2192 |
- -DVTK_USE_SYSTEM_AUTOBAHN=ON |
2193 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
2194 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
2195 |
- -DVTK_USE_SYSTEM_FreeType=ON |
2196 |
- -DVTK_USE_SYSTEM_GL2PS=ON |
2197 |
- -DVTK_USE_SYSTEM_HDF5=ON |
2198 |
- -DVTK_USE_SYSTEM_JPEG=ON |
2199 |
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF |
2200 |
-# -DLIBPROJ4_DIR="${EPREFIX}/usr" |
2201 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
2202 |
- -DVTK_USE_SYSTEM_LibXml2=ON |
2203 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
2204 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
2205 |
- -DVTK_USE_SYSTEM_PNG=ON |
2206 |
- -DVTK_USE_SYSTEM_TIFF=ON |
2207 |
- -DVTK_USE_SYSTEM_TWISTED=ON |
2208 |
- -DVTK_USE_SYSTEM_XDMF2=OFF |
2209 |
- -DVTK_USE_SYSTEM_XDMF3=OFF |
2210 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
2211 |
- -DVTK_USE_SYSTEM_ZOPE=ON |
2212 |
- -DVTK_USE_SYSTEM_LIBRARIES=ON |
2213 |
- -DVTK_USE_GL2PS=ON |
2214 |
- -DVTK_USE_LARGE_DATA=ON |
2215 |
- -DVTK_USE_PARALLEL=ON |
2216 |
- -DVTK_INSTALL_NO_DEVELOPMENT=ON |
2217 |
- ) |
2218 |
- |
2219 |
- mycmakeargs+=( |
2220 |
- -DVTK_EXTRA_COMPILER_WARNINGS=ON |
2221 |
- -DVTK_Group_StandAlone=ON |
2222 |
- ) |
2223 |
- |
2224 |
- mycmakeargs+=( |
2225 |
- $(cmake-utils_use_build doc DOCUMENTATION) |
2226 |
- $(cmake-utils_use_build examples EXAMPLES) |
2227 |
- $(cmake-utils_use_build test VTK_BUILD_ALL_MODULES_FOR_TESTS) |
2228 |
- $(cmake-utils_use all-modules VTK_BUILD_ALL_MODULES) |
2229 |
- $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) |
2230 |
- $(cmake-utils_use imaging VTK_Group_Imaging) |
2231 |
- $(cmake-utils_use mpi VTK_Group_MPI) |
2232 |
- $(cmake-utils_use qt4 VTK_Group_Qt) |
2233 |
- $(cmake-utils_use rendering VTK_Group_Rendering) |
2234 |
- $(cmake-utils_use tk VTK_Group_Tk) |
2235 |
- $(cmake-utils_use views VTK_Group_Views) |
2236 |
- $(cmake-utils_use web VTK_Group_Web) |
2237 |
- $(cmake-utils_use web VTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}") |
2238 |
- $(cmake-utils_use java VTK_WRAP_JAVA) |
2239 |
- $(cmake-utils_use python VTK_WRAP_PYTHON) |
2240 |
- $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) |
2241 |
- $(cmake-utils_use tcl VTK_WRAP_TCL) |
2242 |
- ) |
2243 |
- |
2244 |
- mycmakeargs+=( |
2245 |
- $(cmake-utils_use boost VTK_USE_BOOST) |
2246 |
- $(cmake-utils_use cg VTK_USE_CG_SHADERS) |
2247 |
- $(cmake-utils_use odbc VTK_USE_ODBC) |
2248 |
- $(cmake-utils_use offscreen VTK_USE_OFFSCREEN) |
2249 |
- $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) |
2250 |
- $(cmake-utils_use smp vtkFiltersSMP) |
2251 |
- $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) |
2252 |
- $(cmake-utils_use video_cards_nvidia VTK_USE_NVCONTROL) |
2253 |
- $(cmake-utils_use R Module_vtkFiltersStatisticsGnuR) |
2254 |
- $(cmake-utils_use X VTK_USE_X) |
2255 |
- ) |
2256 |
- |
2257 |
- # IO |
2258 |
- mycmakeargs+=( |
2259 |
- $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) |
2260 |
- $(cmake-utils_use gdal Module_vtkIOGDAL) |
2261 |
- $(cmake-utils_use json Module_vtkIOGeoJSON) |
2262 |
- $(cmake-utils_use xdmf2 Module_vtkIOXdmf2) |
2263 |
- ) |
2264 |
- # Apple stuff, does it really work? |
2265 |
- mycmakeargs+=( $(cmake-utils_use aqua VTK_USE_COCOA) ) |
2266 |
- |
2267 |
- if use examples || use test; then |
2268 |
- mycmakeargs+=( -DBUILD_TESTING=ON ) |
2269 |
- fi |
2270 |
- |
2271 |
- if use kaapi; then |
2272 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" ) |
2273 |
- elif use tbb; then |
2274 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) |
2275 |
- else |
2276 |
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) |
2277 |
- fi |
2278 |
- |
2279 |
- if use java; then |
2280 |
-# local _ejavahome=${EPREFIX}/etc/java-config-2/current-system-vm |
2281 |
-# |
2282 |
-# mycmakeargs+=( |
2283 |
-# -DJAVAC=${EPREFIX}/usr/bin/javac |
2284 |
-# -DJAVAC=$(java-config -c) |
2285 |
-# -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include |
2286 |
-# -DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include |
2287 |
-# -DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/linux |
2288 |
-# ) |
2289 |
-# |
2290 |
- if [ "${ARCH}" == "amd64" ]; then |
2291 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so;${JAVA_HOME}/jre/lib/${ARCH}/xawt/libmawt.so" ) |
2292 |
- else |
2293 |
- mycmakeargs+=( -DJAVA_AWT_LIBRARY="${JAVA_HOME}/jre/lib/i386/libjawt.so;${JAVA_HOME}/jre/lib/i386/xawt/libmawt.so" ) |
2294 |
- fi |
2295 |
- fi |
2296 |
- if use python; then |
2297 |
- mycmakeargs+=( |
2298 |
- -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)" |
2299 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
2300 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
2301 |
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" |
2302 |
- -DSIP_INCLUDE_DIR="$(python_get_includedir)" |
2303 |
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
2304 |
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
2305 |
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${PREFIX} --root=${D}" |
2306 |
- ) |
2307 |
- fi |
2308 |
- |
2309 |
- if use qt4; then |
2310 |
- mycmakeargs+=( |
2311 |
- -DVTK_USE_QVTK=ON |
2312 |
- -DVTK_USE_QVTK_OPENGL=ON |
2313 |
- -DVTK_USE_QVTK_QTOPENGL=ON |
2314 |
- -DQT_WRAP_CPP=ON |
2315 |
- -DQT_WRAP_UI=ON |
2316 |
- -DVTK_INSTALL_QT_DIR=/$(get_libdir)/qt4/plugins/designer |
2317 |
- -DDESIRED_QT_VERSION=4 |
2318 |
- -DVTK_QT_VERSION=4 |
2319 |
- -DQT_MOC_EXECUTABLE="$(qt4_get_bindir)/moc" |
2320 |
- -DQT_UIC_EXECUTABLE="$(qt4_get_bindir)/uic" |
2321 |
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt4" |
2322 |
- -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" |
2323 |
- ) |
2324 |
- fi |
2325 |
- |
2326 |
- if use R; then |
2327 |
- mycmakeargs+=( |
2328 |
-# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas) |
2329 |
-# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack) |
2330 |
- -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so |
2331 |
- -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so |
2332 |
- ) |
2333 |
- fi |
2334 |
- |
2335 |
- cmake-utils_src_configure |
2336 |
-} |
2337 |
- |
2338 |
-src_test() { |
2339 |
- local tcllib |
2340 |
- ln -sf "${BUILD_DIR}"/lib "${BUILD_DIR}"/lib/Release || die |
2341 |
- for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do |
2342 |
- ln -sf $(basename "${tcllib}").1 "${tcllib/.so/-${SPV}.so}" || die |
2343 |
- done |
2344 |
- export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/ |
2345 |
- local VIRTUALX_COMMAND="cmake-utils_src_test" |
2346 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -R Java" |
2347 |
-# local VIRTUALX_COMMAND="cmake-utils_src_test -I 364,365" |
2348 |
- virtualmake |
2349 |
-} |
2350 |
- |
2351 |
-src_install() { |
2352 |
- use web && webapp_src_preinst |
2353 |
- # install docs |
2354 |
- HTML_DOCS=( "${S}"/README.html ) |
2355 |
- |
2356 |
- cmake-utils_src_install |
2357 |
- |
2358 |
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar |
2359 |
- |
2360 |
- if use tcl; then |
2361 |
- # install Tcl docs |
2362 |
- docinto vtk_tcl |
2363 |
- dodoc "${S}"/Wrapping/Tcl/README |
2364 |
- fi |
2365 |
- |
2366 |
- # install examples |
2367 |
- if use examples; then |
2368 |
- insinto /usr/share/${PN} |
2369 |
- mv -v Examples examples || die |
2370 |
- doins -r examples |
2371 |
- fi |
2372 |
- |
2373 |
- #install big docs |
2374 |
- if use doc; then |
2375 |
- cd "${WORKDIR}"/html || die |
2376 |
- rm -f *.md5 || die "Failed to remove superfluous hashes" |
2377 |
- einfo "Installing API docs. This may take some time." |
2378 |
- docinto html |
2379 |
- dodoc -r ./* |
2380 |
- fi |
2381 |
- |
2382 |
- # environment |
2383 |
- cat >> "${T}"/40${PN} <<- EOF |
2384 |
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data |
2385 |
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} |
2386 |
- VTKHOME=${EPREFIX}/usr |
2387 |
- EOF |
2388 |
- doenvd "${T}"/40${PN} |
2389 |
- |
2390 |
- use web && webapp_src_install |
2391 |
-} |