1 |
commit: 1a1324aa105beed8878503f55dd6783255127de0 |
2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
3 |
AuthorDate: Thu Jan 20 16:55:55 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 21 23:23:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1324aa |
7 |
|
8 |
sci-libs/vtk: drop 8.2.0 |
9 |
|
10 |
Only one package, sci-libs/oce, which is masked for last-riting, depends |
11 |
on this version. |
12 |
Won't build with ffmpeg-5. |
13 |
|
14 |
Bug: https://bugs.gentoo.org/831595 |
15 |
Bug: https://bugs.gentoo.org/832625 |
16 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
17 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
18 |
Closes: https://github.com/gentoo/gentoo/pull/23886 |
19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
20 |
|
21 |
sci-libs/vtk/Manifest | 4 - |
22 |
.../files/vtk-8.1.0-openmpi-4-compatibility.patch | 14 - |
23 |
...01-fix-library-installation-dir-for-xdmf3.patch | 57 ---- |
24 |
sci-libs/vtk/files/vtk-8.2.0-fno-common.patch | 40 --- |
25 |
sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch | 16 - |
26 |
sci-libs/vtk/files/vtk-8.2.0-pugixml.patch | 12 - |
27 |
sci-libs/vtk/files/vtk-8.2.0-py38.patch | 175 ---------- |
28 |
sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch | 37 -- |
29 |
sci-libs/vtk/metadata.xml | 1 - |
30 |
sci-libs/vtk/vtk-8.2.0-r6.ebuild | 375 --------------------- |
31 |
10 files changed, 731 deletions(-) |
32 |
|
33 |
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest |
34 |
index d345d4831ee0..52b37377441f 100644 |
35 |
--- a/sci-libs/vtk/Manifest |
36 |
+++ b/sci-libs/vtk/Manifest |
37 |
@@ -1,14 +1,10 @@ |
38 |
-DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286 |
39 |
DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 |
40 |
DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a |
41 |
-DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b |
42 |
DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 |
43 |
DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e SHA512 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a |
44 |
DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36 |
45 |
-DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588 |
46 |
DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1 |
47 |
DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9 |
48 |
DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc |
49 |
-DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317 |
50 |
DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800 |
51 |
DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a |
52 |
|
53 |
diff --git a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch b/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch |
54 |
deleted file mode 100644 |
55 |
index 267c1d91b0cb..000000000000 |
56 |
--- a/sci-libs/vtk/files/vtk-8.1.0-openmpi-4-compatibility.patch |
57 |
+++ /dev/null |
58 |
@@ -1,14 +0,0 @@ |
59 |
-diff --git a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
60 |
-index 3173831..e8ee74b 100644 |
61 |
---- a/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
62 |
-+++ b/ThirdParty/mpi4py/vtkmpi4py/src/lib-mpi/config/openmpi.h |
63 |
-@@ -141,4 +141,9 @@ |
64 |
- |
65 |
- #endif |
66 |
- |
67 |
-+ #if OMPI_NUMVERSION >= 40000 |
68 |
-+ #undef PyMPI_HAVE_MPI_LB |
69 |
-+ #undef PyMPI_HAVE_MPI_UB |
70 |
-+ #endif /* OMPI >= 4.0.0 */ |
71 |
-+ |
72 |
- #endif /* !PyMPI_CONFIG_OPENMPI_H */ |
73 |
|
74 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch |
75 |
deleted file mode 100644 |
76 |
index d03cab326f4f..000000000000 |
77 |
--- a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch |
78 |
+++ /dev/null |
79 |
@@ -1,57 +0,0 @@ |
80 |
-From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001 |
81 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
82 |
-Date: Thu, 3 Jun 2021 13:13:38 +0200 |
83 |
-Subject: [PATCH] fix library installation dir for xdmf3 |
84 |
- |
85 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
86 |
---- |
87 |
- ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++++++------- |
88 |
- 1 file changed, 7 insertions(+), 7 deletions(-) |
89 |
- |
90 |
-diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt |
91 |
-index 86d688f8..7d009dfe 100644 |
92 |
---- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt |
93 |
-+++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt |
94 |
-@@ -269,10 +269,10 @@ endif() |
95 |
- |
96 |
- if(UNIX) |
97 |
- if (BUILD_SHARED_LIBS) |
98 |
-- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so |
99 |
-+ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so |
100 |
- PARENT_SCOPE) |
101 |
- else() |
102 |
-- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a |
103 |
-+ set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a |
104 |
- PARENT_SCOPE) |
105 |
- endif() |
106 |
- endif() |
107 |
-@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT) |
108 |
- endif() |
109 |
- install(TARGETS XdmfCore |
110 |
- RUNTIME DESTINATION bin |
111 |
-- LIBRARY DESTINATION lib |
112 |
-- ARCHIVE DESTINATION lib) |
113 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
114 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
115 |
- if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS) |
116 |
- install(TARGETS XdmfCore_Static |
117 |
- RUNTIME DESTINATION bin |
118 |
-- LIBRARY DESTINATION lib |
119 |
-- ARCHIVE DESTINATION lib) |
120 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
121 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
122 |
- endif () |
123 |
- |
124 |
- if (Boost_FOUND) |
125 |
-@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS |
126 |
- CACHE INTERNAL "") |
127 |
- |
128 |
- set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE) |
129 |
--set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib) |
130 |
-+set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) |
131 |
- set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE) |
132 |
- set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin) |
133 |
- |
134 |
--- |
135 |
-2.31.1 |
136 |
- |
137 |
|
138 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch |
139 |
deleted file mode 100644 |
140 |
index d7268ef7566b..000000000000 |
141 |
--- a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch |
142 |
+++ /dev/null |
143 |
@@ -1,40 +0,0 @@ |
144 |
-From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001 |
145 |
-From: Seacas Upstream <kwrobot@×××××××.com> |
146 |
-Date: Tue, 28 Jan 2020 09:13:38 -0500 |
147 |
-Subject: [PATCH] exodusII 2020-01-28 (d97eb08d) |
148 |
- |
149 |
-Code extracted from: |
150 |
- |
151 |
- https://gitlab.kitware.com/third-party/seacas.git |
152 |
- |
153 |
-at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18). |
154 |
---- |
155 |
- ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +- |
156 |
- ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c | 2 +- |
157 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
158 |
- |
159 |
-diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c |
160 |
-index 8d5d6734f0..ef439618da 100644 |
161 |
---- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c |
162 |
-+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c |
163 |
-@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI |
164 |
- * Prevent warning in some versions of ranlib(1) because the object |
165 |
- * file has no symbols. |
166 |
- */ |
167 |
--const char exodus_unused_symbol_dummy_1; |
168 |
-+const char exodus_unused_symbol_dummy_ex_create_par; |
169 |
- #endif |
170 |
-diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c |
171 |
-index b2faa22c29..9df4818767 100644 |
172 |
---- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c |
173 |
-+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c |
174 |
-@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float |
175 |
- * Prevent warning in some versions of ranlib(1) because the object |
176 |
- * file has no symbols. |
177 |
- */ |
178 |
--const char exodus_unused_symbol_dummy_1; |
179 |
-+const char exodus_unused_symbol_dummy_ex_open_par; |
180 |
- #endif |
181 |
--- |
182 |
-2.26.2 |
183 |
- |
184 |
|
185 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch |
186 |
deleted file mode 100644 |
187 |
index a903b0375304..000000000000 |
188 |
--- a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch |
189 |
+++ /dev/null |
190 |
@@ -1,16 +0,0 @@ |
191 |
---- a/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:12.154603698 -0600 |
192 |
-+++ b/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:34.864603776 -0600 |
193 |
-@@ -174,8 +174,12 @@ |
194 |
- execute_process(COMMAND ${CMAKE_C_COMPILER} --version |
195 |
- OUTPUT_VARIABLE _gcc_version_info |
196 |
- ERROR_VARIABLE _gcc_version_info) |
197 |
-- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" |
198 |
-+ string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*" |
199 |
- _gcc_version "${_gcc_version_info}") |
200 |
-+ if(NOT _gcc_version) |
201 |
-+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" |
202 |
-+ _gcc_version "${_gcc_version_info}") |
203 |
-+ endif() |
204 |
- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the |
205 |
- # patch level, handle this here: |
206 |
- if(NOT _gcc_version) |
207 |
\ No newline at end of file |
208 |
|
209 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch |
210 |
deleted file mode 100644 |
211 |
index d890f696388d..000000000000 |
212 |
--- a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch |
213 |
+++ /dev/null |
214 |
@@ -1,12 +0,0 @@ |
215 |
-https://bugs.gentoo.org/758611 |
216 |
---- a/IO/CityGML/CMakeLists.txt |
217 |
-+++ b/IO/CityGML/CMakeLists.txt |
218 |
-@@ -5,7 +5,4 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) |
219 |
- if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) |
220 |
- find_package(pugixml REQUIRED) |
221 |
-- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) |
222 |
-- get_target_property(pugixml_LIBRARIES pugixml LOCATION) |
223 |
-- include_directories(${pugixml_INCLUDE_DIRS}) |
224 |
-- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) |
225 |
-+ vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml::pugixml) |
226 |
- endif() |
227 |
|
228 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch |
229 |
deleted file mode 100644 |
230 |
index c4c235dafd3f..000000000000 |
231 |
--- a/sci-libs/vtk/files/vtk-8.2.0-py38.patch |
232 |
+++ /dev/null |
233 |
@@ -1,175 +0,0 @@ |
234 |
-From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001 |
235 |
-From: David Gobbi <david.gobbi@×××××.com> |
236 |
-Date: Tue, 20 Aug 2019 17:02:24 -0600 |
237 |
-Subject: [PATCH] Compatibility for Python 3.8 |
238 |
- |
239 |
-The PyTypeObject struct was modified in Python 3.8, this change is |
240 |
-required to avoid compile errors. |
241 |
---- |
242 |
- .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++ |
243 |
- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +- |
244 |
- Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +- |
245 |
- Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++---- |
246 |
- Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +- |
247 |
- Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++- |
248 |
- Wrapping/Tools/vtkWrapPythonClass.c | 2 +- |
249 |
- Wrapping/Tools/vtkWrapPythonEnum.c | 2 +- |
250 |
- Wrapping/Tools/vtkWrapPythonType.c | 2 +- |
251 |
- 9 files changed, 23 insertions(+), 11 deletions(-) |
252 |
- |
253 |
-diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h |
254 |
-index b1c12c83de..14ccfbe928 100644 |
255 |
---- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h |
256 |
-+++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h |
257 |
-@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = { |
258 |
- #if PY_VERSION_HEX >= 0x03040000 |
259 |
- 0, // tp_finalize |
260 |
- #endif |
261 |
-+#if PY_VERSION_HEX >= 0x03080000 |
262 |
-+ 0, // tp_vectorcall |
263 |
-+#if PY_VERSION_HEX < 0x03090000 |
264 |
-+ 0, // tp_print |
265 |
-+#endif |
266 |
-+#endif |
267 |
- }; |
268 |
- |
269 |
- static PyObject* vtkWrite(PyObject* self, PyObject* args) |
270 |
-diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx |
271 |
-index 2b0d443537..3840038498 100644 |
272 |
---- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx |
273 |
-+++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx |
274 |
-@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = { |
275 |
- sizeof(PyMethodDescrObject), // tp_basicsize |
276 |
- 0, // tp_itemsize |
277 |
- PyVTKMethodDescriptor_Delete, // tp_dealloc |
278 |
-- nullptr, // tp_print |
279 |
-+ 0, // tp_vectorcall_offset |
280 |
- nullptr, // tp_getattr |
281 |
- nullptr, // tp_setattr |
282 |
- nullptr, // tp_compare |
283 |
-diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx |
284 |
-index 71ee2a3516..5cf5bfbe6b 100644 |
285 |
---- a/Wrapping/PythonCore/PyVTKNamespace.cxx |
286 |
-+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx |
287 |
-@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = { |
288 |
- 0, // tp_basicsize |
289 |
- 0, // tp_itemsize |
290 |
- PyVTKNamespace_Delete, // tp_dealloc |
291 |
-- nullptr, // tp_print |
292 |
-+ 0, // tp_vectorcall_offset |
293 |
- nullptr, // tp_getattr |
294 |
- nullptr, // tp_setattr |
295 |
- nullptr, // tp_compare |
296 |
-diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx |
297 |
-index 943ac71080..b7104091c0 100644 |
298 |
---- a/Wrapping/PythonCore/PyVTKReference.cxx |
299 |
-+++ b/Wrapping/PythonCore/PyVTKReference.cxx |
300 |
-@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = { |
301 |
- sizeof(PyVTKReference), // tp_basicsize |
302 |
- 0, // tp_itemsize |
303 |
- PyVTKReference_Delete, // tp_dealloc |
304 |
-- nullptr, // tp_print |
305 |
-+ 0, // tp_vectorcall_offset |
306 |
- nullptr, // tp_getattr |
307 |
- nullptr, // tp_setattr |
308 |
- nullptr, // tp_compare |
309 |
-@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = { |
310 |
- sizeof(PyVTKReference), // tp_basicsize |
311 |
- 0, // tp_itemsize |
312 |
- PyVTKReference_Delete, // tp_dealloc |
313 |
-- nullptr, // tp_print |
314 |
-+ 0, // tp_vectorcall_offset |
315 |
- nullptr, // tp_getattr |
316 |
- nullptr, // tp_setattr |
317 |
- nullptr, // tp_compare |
318 |
-@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = { |
319 |
- sizeof(PyVTKReference), // tp_basicsize |
320 |
- 0, // tp_itemsize |
321 |
- PyVTKReference_Delete, // tp_dealloc |
322 |
-- nullptr, // tp_print |
323 |
-+ 0, // tp_vectorcall_offset |
324 |
- nullptr, // tp_getattr |
325 |
- nullptr, // tp_setattr |
326 |
- nullptr, // tp_compare |
327 |
-@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = { |
328 |
- sizeof(PyVTKReference), // tp_basicsize |
329 |
- 0, // tp_itemsize |
330 |
- PyVTKReference_Delete, // tp_dealloc |
331 |
-- nullptr, // tp_print |
332 |
-+ 0, // tp_vectorcall_offset |
333 |
- nullptr, // tp_getattr |
334 |
- nullptr, // tp_setattr |
335 |
- nullptr, // tp_compare |
336 |
-diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx |
337 |
-index be200985b3..340fe7953b 100644 |
338 |
---- a/Wrapping/PythonCore/PyVTKTemplate.cxx |
339 |
-+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx |
340 |
-@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = { |
341 |
- 0, // tp_basicsize |
342 |
- 0, // tp_itemsize |
343 |
- nullptr, // tp_dealloc |
344 |
-- nullptr, // tp_print |
345 |
-+ 0, // tp_vectorcall_offset |
346 |
- nullptr, // tp_getattr |
347 |
- nullptr, // tp_setattr |
348 |
- nullptr, // tp_compare |
349 |
-diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h |
350 |
-index 4a767844a6..be208faeef 100644 |
351 |
---- a/Wrapping/PythonCore/vtkPythonCompatibility.h |
352 |
-+++ b/Wrapping/PythonCore/vtkPythonCompatibility.h |
353 |
-@@ -64,7 +64,13 @@ |
354 |
- #endif |
355 |
- |
356 |
- // PyTypeObject compatibility |
357 |
--#if PY_VERSION_HEX >= 0x03040000 |
358 |
-+#if PY_VERSION_HEX >= 0x03090000 |
359 |
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ |
360 |
-+ 0, 0, 0, 0, |
361 |
-+#elif PY_VERSION_HEX >= 0x03080000 |
362 |
-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ |
363 |
-+ 0, 0, 0, 0, 0, |
364 |
-+#elif PY_VERSION_HEX >= 0x03040000 |
365 |
- #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \ |
366 |
- 0, 0, 0, |
367 |
- #else |
368 |
-diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c |
369 |
-index b1e45f8e80..4d558ea081 100644 |
370 |
---- a/Wrapping/Tools/vtkWrapPythonClass.c |
371 |
-+++ b/Wrapping/Tools/vtkWrapPythonClass.c |
372 |
-@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType( |
373 |
- " sizeof(PyVTKObject), // tp_basicsize\n" |
374 |
- " 0, // tp_itemsize\n" |
375 |
- " PyVTKObject_Delete, // tp_dealloc\n" |
376 |
-- " nullptr, // tp_print\n" |
377 |
-+ " 0, // tp_vectorcall_offset\n" |
378 |
- " nullptr, // tp_getattr\n" |
379 |
- " nullptr, // tp_setattr\n" |
380 |
- " nullptr, // tp_compare\n" |
381 |
-diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c |
382 |
-index b933702242..1249362854 100644 |
383 |
---- a/Wrapping/Tools/vtkWrapPythonEnum.c |
384 |
-+++ b/Wrapping/Tools/vtkWrapPythonEnum.c |
385 |
-@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType( |
386 |
- " sizeof(PyIntObject), // tp_basicsize\n" |
387 |
- " 0, // tp_itemsize\n" |
388 |
- " nullptr, // tp_dealloc\n" |
389 |
-- " nullptr, // tp_print\n" |
390 |
-+ " 0, // tp_vectorcall_offset\n" |
391 |
- " nullptr, // tp_getattr\n" |
392 |
- " nullptr, // tp_setattr\n" |
393 |
- " nullptr, // tp_compare\n" |
394 |
-diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c |
395 |
-index 744cb1b9d3..0a1375e541 100644 |
396 |
---- a/Wrapping/Tools/vtkWrapPythonType.c |
397 |
-+++ b/Wrapping/Tools/vtkWrapPythonType.c |
398 |
-@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType( |
399 |
- " sizeof(PyVTKSpecialObject), // tp_basicsize\n" |
400 |
- " 0, // tp_itemsize\n" |
401 |
- " Py%s_Delete, // tp_dealloc\n" |
402 |
-- " nullptr, // tp_print\n" |
403 |
-+ " 0, // tp_vectorcall_offset\n" |
404 |
- " nullptr, // tp_getattr\n" |
405 |
- " nullptr, // tp_setattr\n" |
406 |
- " nullptr, // tp_compare\n" |
407 |
--- |
408 |
-2.21.0 |
409 |
|
410 |
diff --git a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch |
411 |
deleted file mode 100644 |
412 |
index d5a02ca75929..000000000000 |
413 |
--- a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch |
414 |
+++ /dev/null |
415 |
@@ -1,37 +0,0 @@ |
416 |
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001 |
417 |
-From: "Andrew J. P. Maclean" <andrew.amaclean@×××××.com> |
418 |
-Date: Wed, 27 May 2020 15:27:15 +1000 |
419 |
-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath |
420 |
- |
421 |
---- |
422 |
- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 + |
423 |
- Rendering/Qt/vtkQtStringToImage.cxx | 1 + |
424 |
- 2 files changed, 2 insertions(+) |
425 |
- |
426 |
-diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
427 |
-index afda585cca..eca65c64cd 100644 |
428 |
---- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
429 |
-+++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
430 |
-@@ -41,6 +41,7 @@ |
431 |
- #include <QImage> |
432 |
- #include <QMap> |
433 |
- #include <QPainter> |
434 |
-+#include <QPainterPath> |
435 |
- #include <QPair> |
436 |
- #include <QPixmap> |
437 |
- #include <QTextDocument> |
438 |
-diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx |
439 |
-index 659c71570e..fbb9b78f05 100644 |
440 |
---- a/Rendering/Qt/vtkQtStringToImage.cxx |
441 |
-+++ b/Rendering/Qt/vtkQtStringToImage.cxx |
442 |
-@@ -30,6 +30,7 @@ |
443 |
- #include <QFontMetrics> |
444 |
- #include <QImage> |
445 |
- #include <QPainter> |
446 |
-+#include <QPainterPath> |
447 |
- #include <QPixmap> |
448 |
- #include <QString> |
449 |
- #include <QTextDocument> |
450 |
--- |
451 |
-2.26.2 |
452 |
- |
453 |
|
454 |
diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml |
455 |
index 78fb93f57d22..50a77432780d 100644 |
456 |
--- a/sci-libs/vtk/metadata.xml |
457 |
+++ b/sci-libs/vtk/metadata.xml |
458 |
@@ -27,6 +27,5 @@ |
459 |
<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> to handle smp support</flag> |
460 |
<flag name="views">Building Views modules</flag> |
461 |
<flag name="web">Install web component</flag> |
462 |
- <flag name="R">Enable support for dev-lang/R</flag> |
463 |
</use> |
464 |
</pkgmetadata> |
465 |
|
466 |
diff --git a/sci-libs/vtk/vtk-8.2.0-r6.ebuild b/sci-libs/vtk/vtk-8.2.0-r6.ebuild |
467 |
deleted file mode 100644 |
468 |
index 6cbd67167e03..000000000000 |
469 |
--- a/sci-libs/vtk/vtk-8.2.0-r6.ebuild |
470 |
+++ /dev/null |
471 |
@@ -1,375 +0,0 @@ |
472 |
-# Copyright 1999-2021 Gentoo Authors |
473 |
-# Distributed under the terms of the GNU General Public License v2 |
474 |
- |
475 |
-EAPI=7 |
476 |
- |
477 |
-PYTHON_COMPAT=( python3_{8,9} ) |
478 |
-WEBAPP_OPTIONAL=yes |
479 |
-WEBAPP_MANUAL_SLOT=yes |
480 |
- |
481 |
-# Short package version |
482 |
-MY_PV="$(ver_cut 1-2)" |
483 |
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp |
484 |
- |
485 |
-DESCRIPTION="The Visualization Toolkit" |
486 |
-HOMEPAGE="https://www.vtk.org/" |
487 |
-SRC_URI=" |
488 |
- https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz |
489 |
- doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz ) |
490 |
- examples? ( |
491 |
- https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz |
492 |
- https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz |
493 |
- )" |
494 |
- |
495 |
-LICENSE="BSD LGPL-2" |
496 |
-SLOT="0/${MY_PV}" |
497 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" |
498 |
-IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi |
499 |
- mysql odbc offscreen postgres python qt5 R rendering tbb tcl theora tk |
500 |
- video_cards_nvidia views web +X" |
501 |
- |
502 |
-REQUIRED_USE=" |
503 |
- all-modules? ( boost ffmpeg gdal mpi mysql odbc postgres python qt5 ) |
504 |
- java? ( qt5 ) |
505 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
506 |
- tcl? ( rendering ) |
507 |
- examples? ( python ) |
508 |
- tk? ( tcl ) |
509 |
- web? ( python ) |
510 |
- ^^ ( X aqua offscreen )" |
511 |
- |
512 |
-RDEPEND=" |
513 |
- app-arch/lz4 |
514 |
- dev-cpp/eigen |
515 |
- dev-db/sqlite |
516 |
- dev-libs/double-conversion:0= |
517 |
- dev-libs/expat |
518 |
- dev-libs/jsoncpp:= |
519 |
- dev-libs/libxml2:2 |
520 |
- >=dev-libs/pugixml-1.11 |
521 |
- >=media-libs/freetype-2.5.4 |
522 |
- media-libs/glew:0= |
523 |
- >=media-libs/libharu-2.3.0-r2 |
524 |
- media-libs/libpng:0= |
525 |
- media-libs/libtheora |
526 |
- media-libs/mesa |
527 |
- media-libs/tiff:0 |
528 |
- sci-libs/exodusii |
529 |
- sci-libs/hdf5:= |
530 |
- sci-libs/netcdf:0= |
531 |
- sci-libs/netcdf-cxx:3 |
532 |
- sys-libs/zlib |
533 |
- virtual/jpeg:0 |
534 |
- virtual/opengl |
535 |
- x11-libs/libX11 |
536 |
- x11-libs/libXmu |
537 |
- x11-libs/libXt |
538 |
- all-modules? ( |
539 |
- !sci-libs/xdmf2 |
540 |
- <dev-libs/pegtl-3 |
541 |
- sci-libs/kissfft |
542 |
- ) |
543 |
- boost? ( dev-libs/boost:=[mpi?] ) |
544 |
- examples? ( |
545 |
- dev-qt/qtcore:5 |
546 |
- dev-qt/qtgui:5 |
547 |
- ) |
548 |
- ffmpeg? ( media-video/ffmpeg ) |
549 |
- gdal? ( sci-libs/gdal ) |
550 |
- java? ( >=virtual/jdk-1.8:* ) |
551 |
- mpi? ( |
552 |
- virtual/mpi[cxx,romio] |
553 |
- $(python_gen_cond_dep ' |
554 |
- python? ( dev-python/mpi4py[${PYTHON_USEDEP}] ) |
555 |
- ') |
556 |
- ) |
557 |
- mysql? ( dev-db/mysql-connector-c ) |
558 |
- odbc? ( dev-db/unixODBC ) |
559 |
- offscreen? ( media-libs/mesa[osmesa] ) |
560 |
- postgres? ( dev-db/postgresql:= ) |
561 |
- python? ( |
562 |
- ${PYTHON_DEPS} |
563 |
- $(python_gen_cond_dep ' |
564 |
- dev-python/sip:5[${PYTHON_USEDEP}] |
565 |
- ') |
566 |
- ) |
567 |
- qt5? ( |
568 |
- dev-qt/designer:5 |
569 |
- dev-qt/qtcore:5 |
570 |
- dev-qt/qtgui:5 |
571 |
- dev-qt/qtopengl:5 |
572 |
- dev-qt/qtsql:5 |
573 |
- dev-qt/qtx11extras:5 |
574 |
- $(python_gen_cond_dep ' |
575 |
- python? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) |
576 |
- ') |
577 |
- ) |
578 |
- R? ( dev-lang/R ) |
579 |
- tbb? ( <dev-cpp/tbb-2021:= ) |
580 |
- tcl? ( dev-lang/tcl:0= ) |
581 |
- tk? ( dev-lang/tk:0= ) |
582 |
- video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) |
583 |
- web? ( |
584 |
- ${WEBAPP_DEPEND} |
585 |
- $(python_gen_cond_dep ' |
586 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
587 |
- dev-python/constantly[${PYTHON_USEDEP}] |
588 |
- dev-python/hyperlink[${PYTHON_USEDEP}] |
589 |
- dev-python/incremental[${PYTHON_USEDEP}] |
590 |
- dev-python/six[${PYTHON_USEDEP}] |
591 |
- dev-python/twisted[${PYTHON_USEDEP}] |
592 |
- dev-python/txaio[${PYTHON_USEDEP}] |
593 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
594 |
- ') |
595 |
- ) |
596 |
-" |
597 |
-DEPEND="${RDEPEND}" |
598 |
-BDEPEND=" |
599 |
- doc? ( app-doc/doxygen ) |
600 |
- mpi? ( app-admin/chrpath ) |
601 |
-" |
602 |
- |
603 |
-S="${WORKDIR}"/VTK-${PV} |
604 |
- |
605 |
-PATCHES=( |
606 |
- "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch |
607 |
- "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960 |
608 |
- "${FILESDIR}"/${P}-gcc-10.patch # bug 723374 |
609 |
- "${FILESDIR}"/${P}-fno-common.patch # bug 721048 |
610 |
- "${FILESDIR}"/${P}-py38.patch |
611 |
- "${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088 |
612 |
- "${FILESDIR}"/${P}-pugixml.patch |
613 |
- "${FILESDIR}"/${P}-0001-fix-library-installation-dir-for-xdmf3.patch |
614 |
-) |
615 |
- |
616 |
-RESTRICT="test" |
617 |
- |
618 |
-pkg_setup() { |
619 |
- use java && java-pkg-opt-2_pkg_setup |
620 |
- use python && python-single-r1_pkg_setup |
621 |
- use web && webapp_pkg_setup |
622 |
-} |
623 |
- |
624 |
-src_prepare() { |
625 |
- cmake_src_prepare |
626 |
- |
627 |
- local x |
628 |
- # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3 zfp |
629 |
- for x in expat freetype hdf5 jpeg jsoncpp kissfft libharu libxml2 lz4 netcdf pugixml png tiff zlib; do |
630 |
- ebegin "Dropping bundled ${x}" |
631 |
- rm -r ThirdParty/${x}/vtk${x} || die |
632 |
- eend $? |
633 |
- done |
634 |
- |
635 |
- sed -i -e '/add_subdirectory(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die |
636 |
- sed -i -e '/vtk_target_export(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die |
637 |
- |
638 |
- # my_bool is no longer used in MySQL and MariaDB isn't supported in vtk-8 |
639 |
- sed -e 's/my_bool/bool/' -i IO/MySQL/vtkMySQL{Database,Query}.cxx || die |
640 |
- |
641 |
- if use doc; then |
642 |
- einfo "Removing .md5 files from documents." |
643 |
- rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" |
644 |
- sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ |
645 |
- -i Utilities/Doxygen/CMakeLists.txt || die |
646 |
- fi |
647 |
-} |
648 |
- |
649 |
-src_configure() { |
650 |
- # general configuration |
651 |
- local mycmakeargs=( |
652 |
- -Wno-dev |
653 |
- -DVTK_DIR="${S}" |
654 |
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir) |
655 |
- -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${MY_PV}" |
656 |
- -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
657 |
- -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data" |
658 |
- -DVTK_CUSTOM_LIBRARY_SUFFIX="" |
659 |
- -DBUILD_SHARED_LIBS=ON |
660 |
- -DVTK_USE_SYSTEM_AUTOBAHN=ON |
661 |
- -DVTK_USE_SYSTEM_EXPAT=ON |
662 |
- -DVTK_USE_SYSTEM_FREETYPE=ON |
663 |
- -DVTK_USE_SYSTEM_FreeType=ON |
664 |
- # Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible) |
665 |
- -DVTK_USE_SYSTEM_GL2PS=OFF |
666 |
- -DVTK_USE_SYSTEM_HDF5=ON |
667 |
- -DVTK_USE_SYSTEM_JPEG=ON |
668 |
- -DVTK_USE_SYSTEM_LIBPROJ=OFF |
669 |
- -DVTK_USE_SYSTEM_LIBXML2=ON |
670 |
- -DVTK_USE_SYSTEM_LibXml2=ON |
671 |
- -DVTK_USE_SYSTEM_NETCDF=ON |
672 |
- -DVTK_USE_SYSTEM_OGGTHEORA=ON |
673 |
- -DVTK_USE_SYSTEM_PUGIXML=ON |
674 |
- -DVTK_USE_SYSTEM_PNG=ON |
675 |
- -DVTK_USE_SYSTEM_TIFF=ON |
676 |
- -DVTK_USE_SYSTEM_TWISTED=ON |
677 |
- -DVTK_USE_SYSTEM_XDMF2=OFF |
678 |
- -DVTK_USE_SYSTEM_XDMF3=OFF |
679 |
- -DVTK_USE_SYSTEM_ZLIB=ON |
680 |
- -DVTK_USE_SYSTEM_ZOPE=ON |
681 |
- -DVTK_USE_SYSTEM_LIBRARIES=ON |
682 |
- # Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake) |
683 |
- -DVTK_USE_SYSTEM_DIY2=OFF |
684 |
- -DVTK_USE_GL2PS=ON |
685 |
- -DVTK_USE_LARGE_DATA=ON |
686 |
- -DVTK_USE_PARALLEL=ON |
687 |
- -DVTK_EXTRA_COMPILER_WARNINGS=ON |
688 |
- -DVTK_Group_StandAlone=ON |
689 |
- -DBUILD_DOCUMENTATION=$(usex doc) |
690 |
- -DBUILD_EXAMPLES=$(usex examples) |
691 |
- -DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off |
692 |
- -DVTK_BUILD_ALL_MODULES=$(usex all-modules) |
693 |
- -DUSE_DOCUMENTATION_HTML_HELP=$(usex doc) |
694 |
- -DVTK_Group_Imaging=$(usex imaging) |
695 |
- -DVTK_Group_MPI=$(usex mpi) |
696 |
- -DVTK_Group_Rendering=$(usex rendering) |
697 |
- -DVTK_Group_Tk=$(usex tk) |
698 |
- -DVTK_Group_Views=$(usex views) |
699 |
- -DVTK_Group_Web=$(usex web) |
700 |
- -DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)" |
701 |
- -DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}" |
702 |
- -DVTK_WRAP_JAVA=$(usex java) |
703 |
- -DVTK_WRAP_PYTHON=$(usex python) |
704 |
- -DVTK_WRAP_PYTHON_SIP=$(usex python) |
705 |
- -DVTK_WRAP_TCL=$(usex tcl) |
706 |
- -DVTK_USE_BOOST=$(usex boost) |
707 |
- -DUSE_VTK_USE_BOOST=$(usex boost) |
708 |
- -DModule_vtkInfovisBoost=$(usex boost) |
709 |
- -DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost) |
710 |
- -DVTK_USE_ODBC=$(usex odbc) |
711 |
- -DModule_vtkIOODBC=$(usex odbc) |
712 |
- -DVTK_USE_OFFSCREEN=$(usex offscreen) |
713 |
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen) |
714 |
- -DVTK_USE_OGGTHEORA_ENCODER=$(usex theora) |
715 |
- -DVTK_USE_NVCONTROL=$(usex video_cards_nvidia) |
716 |
- -DModule_vtkFiltersStatisticsGnuR=$(usex R) |
717 |
- -DVTK_USE_X=$(usex X) |
718 |
- # IO |
719 |
- -DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg) |
720 |
- -DModule_vtkIOGDAL=$(usex gdal) |
721 |
- -DModule_vtkIOGeoJSON=$(usex json) |
722 |
- -DModule_vtkIOXdmf2=$(usex all-modules) |
723 |
- -DBUILD_TESTING=$(usex examples) |
724 |
- # Apple stuff, does it really work? |
725 |
- -DVTK_USE_COCOA=$(usex aqua) |
726 |
- ) |
727 |
- |
728 |
- if use all-modules; then |
729 |
- mycmakeargs+=( |
730 |
- -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON |
731 |
- # we don't have a package for zfp yet |
732 |
- -DVTK_USE_SYSTEM_ZFP=OFF |
733 |
- ) |
734 |
- fi |
735 |
- |
736 |
- if use java; then |
737 |
- local javacargs=$(java-pkg_javac-args) |
738 |
- mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} ) |
739 |
- fi |
740 |
- |
741 |
- if use mpi; then |
742 |
- mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON ) |
743 |
- fi |
744 |
- |
745 |
- if use python; then |
746 |
- mycmakeargs+=( |
747 |
- -DVTK_INSTALL_PYTHON_MODULES_DIR="$(python_get_sitedir)" |
748 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
749 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
750 |
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" |
751 |
- -DSIP_INCLUDE_DIR="$(python_get_includedir)" |
752 |
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)" |
753 |
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)" |
754 |
- -DVTK_USE_SYSTEM_SIX=ON |
755 |
- ) |
756 |
- fi |
757 |
- |
758 |
- if use qt5; then |
759 |
- mycmakeargs+=( |
760 |
- -DVTK_USE_QVTK=ON |
761 |
- -DVTK_USE_QVTK_OPENGL=ON |
762 |
- -DVTK_USE_QVTK_QTOPENGL=ON |
763 |
- -DQT_WRAP_CPP=ON |
764 |
- -DQT_WRAP_UI=ON |
765 |
- -DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer" |
766 |
- -DDESIRED_QT_VERSION=5 |
767 |
- -DVTK_QT_VERSION=5 |
768 |
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" |
769 |
- -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic" |
770 |
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5" |
771 |
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake" |
772 |
- -DVTK_Group_Qt:BOOL=ON |
773 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON |
774 |
- ) |
775 |
- fi |
776 |
- |
777 |
- if use R; then |
778 |
- mycmakeargs+=( |
779 |
- -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so |
780 |
- -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so |
781 |
- ) |
782 |
- fi |
783 |
- |
784 |
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE |
785 |
- |
786 |
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" |
787 |
- |
788 |
- if use mpi; then |
789 |
- export CC=mpicc |
790 |
- export CXX=mpicxx |
791 |
- export FC=mpif90 |
792 |
- export F90=mpif90 |
793 |
- export F77=mpif77 |
794 |
- fi |
795 |
- |
796 |
- cmake_src_configure |
797 |
-} |
798 |
- |
799 |
-src_install() { |
800 |
- use web && webapp_src_preinst |
801 |
- |
802 |
- cmake_src_install |
803 |
- |
804 |
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar |
805 |
- |
806 |
- # Stop web page images from being compressed |
807 |
- use doc && docompress -x /usr/share/doc/${PF}/doxygen |
808 |
- |
809 |
- # install examples |
810 |
- if use examples; then |
811 |
- einfo "Installing examples" |
812 |
- mv -v {E,e}xamples || die |
813 |
- dodoc -r examples |
814 |
- docompress -x /usr/share/doc/${PF}/examples |
815 |
- fi |
816 |
- |
817 |
- # with MPI, rpaths are not deleted properly |
818 |
- if use mpi; then |
819 |
- chrpath -d "${ED}"/usr/$(get_libdir)/*.so* || die |
820 |
- chrpath -d "${ED}"/usr/bin/* || die |
821 |
- if use python; then |
822 |
- chrpath -d "${ED}"/$(python_get_sitedir)/vtkmodules/*.so || die |
823 |
- fi |
824 |
- fi |
825 |
- |
826 |
- use python && python_optimize |
827 |
- |
828 |
- # environment |
829 |
- cat >> "${T}"/40${PN} <<- EOF || die |
830 |
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data |
831 |
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${MY_PV} |
832 |
- VTKHOME=${EPREFIX}/usr |
833 |
- EOF |
834 |
- doenvd "${T}"/40${PN} |
835 |
- |
836 |
- use web && webapp_src_install |
837 |
-} |
838 |
- |
839 |
-# webapp.eclass exports these but we want it optional #534036 |
840 |
-pkg_postinst() { |
841 |
- use web && webapp_pkg_postinst |
842 |
-} |
843 |
- |
844 |
-pkg_prerm() { |
845 |
- use web && webapp_pkg_prerm |
846 |
-} |