summaryrefslogtreecommitdiff
path: root/sci-libs/vtk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-13 10:39:22 +0100
commit9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree8ac67e26b45f34d71c5aab3621813b100a0d5f00 /sci-libs/vtk
parentf516638b7fe9592837389826a6152a7e1b251c54 (diff)
gentoo resync : 13.06.2020
Diffstat (limited to 'sci-libs/vtk')
-rw-r--r--sci-libs/vtk/Manifest11
-rw-r--r--sci-libs/vtk/files/vtk-8.2.0-fno-common.patch40
-rw-r--r--sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch16
-rw-r--r--sci-libs/vtk/files/vtk-8.2.0-py38.patch175
-rw-r--r--sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch37
-rw-r--r--sci-libs/vtk/vtk-8.1.0-r7.ebuild340
-rw-r--r--sci-libs/vtk/vtk-8.2.0.ebuild80
7 files changed, 318 insertions, 381 deletions
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 2c74bdd2e521..2d3e28d3f680 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,12 +1,11 @@
AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
-DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
+AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
+AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
+AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
+AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
-DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
-DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
-DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.1.0-r7.ebuild 9242 BLAKE2B e7ba2acec19ff4808cf1bebd137c387769165ba9c1870caa5279fdb272da440fb38e8c0c27fb1ee760b92cc366b7e06db065eace71fb9089ef2eca95be12d8c5 SHA512 570281a2090406371f92d5f4d7b11c5649cbf0e7c1778b7b2a961a974a4d8e52463a2019505f751f5d33b2c908767ce62286f56deb6735907518a215f01d3467
-EBUILD vtk-8.2.0.ebuild 9034 BLAKE2B 7a2ddffb44db83c1a88c664f4a42a24d2647943fea5df02f209e248ea9ffdb7a2b4735d1eb9ae21da4c88545dd92698ef5f84a4cf922d2a6120f43789ed7d09e SHA512 6bfc12c34a26aec09347ec5ebd122b5011e4660df2874a5f952aa382c9f1acb21ba1e9b37b49c35e0701596dc947ff87ea2fb08ff831a3e0e9cf81b742179a94
+EBUILD vtk-8.2.0.ebuild 9331 BLAKE2B 05cbcf1bf05e64e529efcabd092d9a4ef8e9b50e1b734eda3b03eff3f63973a51ecafb2d500271dba7b96669782f255b73d4f2ff2f20db5a584ba9b37391a102 SHA512 aa613e41002ec63bb311cbdf1be2313f78ff748599035802862fdec5960211e406ae3b4dac6dbc6eff3eeaefa563965f09cb87b1cc192d815fe713b40f6e6a0e
MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
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
new file mode 100644
index 000000000000..d7268ef7566b
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
@@ -0,0 +1,40 @@
+From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001
+From: Seacas Upstream <kwrobot@kitware.com>
+Date: Tue, 28 Jan 2020 09:13:38 -0500
+Subject: [PATCH] exodusII 2020-01-28 (d97eb08d)
+
+Code extracted from:
+
+ https://gitlab.kitware.com/third-party/seacas.git
+
+at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18).
+---
+ ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +-
+ ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+index 8d5d6734f0..ef439618da 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI
+ * Prevent warning in some versions of ranlib(1) because the object
+ * file has no symbols.
+ */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_create_par;
+ #endif
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+index b2faa22c29..9df4818767 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float
+ * Prevent warning in some versions of ranlib(1) because the object
+ * file has no symbols.
+ */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_open_par;
+ #endif
+--
+2.26.2
+
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
new file mode 100644
index 000000000000..a903b0375304
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
@@ -0,0 +1,16 @@
+--- a/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:12.154603698 -0600
++++ b/CMake/VTKGenerateExportHeader.cmake 2020-05-24 14:33:34.864603776 -0600
+@@ -174,8 +174,12 @@
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++ string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*"
+ _gcc_version "${_gcc_version_info}")
++ if(NOT _gcc_version)
++ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++ _gcc_version "${_gcc_version_info}")
++ endif()
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+ # patch level, handle this here:
+ if(NOT _gcc_version) \ No newline at end of file
diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
new file mode 100644
index 000000000000..c4c235dafd3f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
@@ -0,0 +1,175 @@
+From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
+From: David Gobbi <david.gobbi@gmail.com>
+Date: Tue, 20 Aug 2019 17:02:24 -0600
+Subject: [PATCH] Compatibility for Python 3.8
+
+The PyTypeObject struct was modified in Python 3.8, this change is
+required to avoid compile errors.
+---
+ .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++
+ Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +-
+ Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +-
+ Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++----
+ Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +-
+ Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++-
+ Wrapping/Tools/vtkWrapPythonClass.c | 2 +-
+ Wrapping/Tools/vtkWrapPythonEnum.c | 2 +-
+ Wrapping/Tools/vtkWrapPythonType.c | 2 +-
+ 9 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+index b1c12c83de..14ccfbe928 100644
+--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
++++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
+ #if PY_VERSION_HEX >= 0x03040000
+ 0, // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++ 0, // tp_print
++#endif
++#endif
+ };
+
+ static PyObject* vtkWrite(PyObject* self, PyObject* args)
+diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+index 2b0d443537..3840038498 100644
+--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
++++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
+ sizeof(PyMethodDescrObject), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKMethodDescriptor_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx
+index 71ee2a3516..5cf5bfbe6b 100644
+--- a/Wrapping/PythonCore/PyVTKNamespace.cxx
++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
+@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
+ 0, // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKNamespace_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx
+index 943ac71080..b7104091c0 100644
+--- a/Wrapping/PythonCore/PyVTKReference.cxx
++++ b/Wrapping/PythonCore/PyVTKReference.cxx
+@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
+index be200985b3..340fe7953b 100644
+--- a/Wrapping/PythonCore/PyVTKTemplate.cxx
++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
+@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
+ 0, // tp_basicsize
+ 0, // tp_itemsize
+ nullptr, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
+index 4a767844a6..be208faeef 100644
+--- a/Wrapping/PythonCore/vtkPythonCompatibility.h
++++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
+@@ -64,7 +64,13 @@
+ #endif
+
+ // PyTypeObject compatibility
+-#if PY_VERSION_HEX >= 0x03040000
++#if PY_VERSION_HEX >= 0x03090000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++ 0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03080000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++ 0, 0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03040000
+ #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
+ 0, 0, 0,
+ #else
+diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
+index b1e45f8e80..4d558ea081 100644
+--- a/Wrapping/Tools/vtkWrapPythonClass.c
++++ b/Wrapping/Tools/vtkWrapPythonClass.c
+@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
+ " sizeof(PyVTKObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " PyVTKObject_Delete, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
+index b933702242..1249362854 100644
+--- a/Wrapping/Tools/vtkWrapPythonEnum.c
++++ b/Wrapping/Tools/vtkWrapPythonEnum.c
+@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
+ " sizeof(PyIntObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " nullptr, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
+index 744cb1b9d3..0a1375e541 100644
+--- a/Wrapping/Tools/vtkWrapPythonType.c
++++ b/Wrapping/Tools/vtkWrapPythonType.c
+@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
+ " sizeof(PyVTKSpecialObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " Py%s_Delete, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+--
+2.21.0
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
new file mode 100644
index 000000000000..d5a02ca75929
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
+From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
+Date: Wed, 27 May 2020 15:27:15 +1000
+Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
+
+---
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
+ Rendering/Qt/vtkQtStringToImage.cxx | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+index afda585cca..eca65c64cd 100644
+--- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
++++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+@@ -41,6 +41,7 @@
+ #include <QImage>
+ #include <QMap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPair>
+ #include <QPixmap>
+ #include <QTextDocument>
+diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx
+index 659c71570e..fbb9b78f05 100644
+--- a/Rendering/Qt/vtkQtStringToImage.cxx
++++ b/Rendering/Qt/vtkQtStringToImage.cxx
+@@ -30,6 +30,7 @@
+ #include <QFontMetrics>
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QString>
+ #include <QTextDocument>
+--
+2.26.2
+
diff --git a/sci-libs/vtk/vtk-8.1.0-r7.ebuild b/sci-libs/vtk/vtk-8.1.0-r7.ebuild
deleted file mode 100644
index dc399b3e2c54..000000000000
--- a/sci-libs/vtk/vtk-8.1.0-r7.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
- https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
- doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
- examples? (
- https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
- https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
- )"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
- all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
- odbc offscreen postgres python qt5 rendering tbb theora tk tcl
- video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
- all-modules? ( python xdmf2 boost )
- java? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- tcl? ( rendering )
- examples? ( python )
- tk? ( tcl )
- web? ( python )
- ^^ ( X aqua offscreen )"
-
-RDEPEND="
- app-arch/lz4
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libxml2:2
- >=media-libs/freetype-2.5.4
- >=media-libs/libharu-2.3.0-r2
- media-libs/libpng:0=
- media-libs/libtheora
- media-libs/mesa
- media-libs/tiff:0
- sci-libs/exodusii
- sci-libs/hdf5:=
- sci-libs/netcdf:0=
- sci-libs/netcdf-cxx:3
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- boost? ( dev-libs/boost:=[mpi?] )
- examples? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- )
- ffmpeg? ( media-video/ffmpeg )
- gdal? ( sci-libs/gdal )
- java? ( >=virtual/jdk-1.7:* )
- odbc? ( dev-db/unixODBC )
- offscreen? ( media-libs/mesa[osmesa] )
- postgres? ( dev-db/postgresql:= )
- R? ( dev-lang/R )
- tbb? ( dev-cpp/tbb )
- tcl? ( dev-lang/tcl:0= )
- tk? ( dev-lang/tk:0= )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- web? (
- ${WEBAPP_DEPEND}
- $(python_gen_cond_dep '
- dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
- dev-python/constantly[${PYTHON_MULTI_USEDEP}]
- dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
- dev-python/incremental[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- dev-python/twisted[${PYTHON_MULTI_USEDEP}]
- dev-python/txaio[${PYTHON_MULTI_USEDEP}]
- dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
- ')
- )
- xdmf2? ( sci-libs/xdmf2 )
- $(python_gen_cond_dep "
- mpi? (
- virtual/mpi[cxx,romio]
- python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
- )
- python? (
- ${PYTHON_DEPS}
- dev-python/sip[\${PYTHON_MULTI_USEDEP}]
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtx11extras:5
- python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
- )
- ")"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
- "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
- use java && java-pkg-opt-2_pkg_setup
- use python && python-single-r1_pkg_setup
- use web && webapp_pkg_setup
-}
-
-src_prepare() {
- default
-
- local x
- # missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
- for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
- ebegin "Dropping bundled ${x}"
- rm -r ThirdParty/${x}/vtk${x} || die
- eend $?
- done
- rm -r \
- ThirdParty/AutobahnPython/vtkAutobahn \
- || die
-
- if use doc; then
- einfo "Removing .md5 files from documents."
- rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
- sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
- -i Utilities/Doxygen/CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # general configuration
- local mycmakeargs=(
- -Wno-dev
- -DVTK_DIR="${S}"
- -DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
- -DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
- -DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
- -DVTK_CUSTOM_LIBRARY_SUFFIX=""
- -DBUILD_SHARED_LIBS=ON
- -DVTK_USE_SYSTEM_AUTOBAHN=ON
- -DVTK_USE_SYSTEM_EXPAT=ON
- -DVTK_USE_SYSTEM_FREETYPE=ON
- -DVTK_USE_SYSTEM_FreeType=ON
- # Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
- -DVTK_USE_SYSTEM_GL2PS=OFF
- -DVTK_USE_SYSTEM_HDF5=ON
- -DVTK_USE_SYSTEM_JPEG=ON
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF
- -DVTK_USE_SYSTEM_LIBXML2=ON
- -DVTK_USE_SYSTEM_LibXml2=ON
- -DVTK_USE_SYSTEM_NETCDF=ON
- -DVTK_USE_SYSTEM_OGGTHEORA=ON
- -DVTK_USE_SYSTEM_PNG=ON
- -DVTK_USE_SYSTEM_TIFF=ON
- -DVTK_USE_SYSTEM_TWISTED=ON
- -DVTK_USE_SYSTEM_XDMF2=OFF
- -DVTK_USE_SYSTEM_XDMF3=OFF
- -DVTK_USE_SYSTEM_ZLIB=ON
- -DVTK_USE_SYSTEM_ZOPE=ON
- -DVTK_USE_SYSTEM_LIBRARIES=ON
- # Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
- -DVTK_USE_SYSTEM_DIY2=OFF
- -DVTK_USE_GL2PS=ON
- -DVTK_USE_LARGE_DATA=ON
- -DVTK_USE_PARALLEL=ON
- -DVTK_EXTRA_COMPILER_WARNINGS=ON
- -DVTK_Group_StandAlone=ON
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DBUILD_EXAMPLES=$(usex examples)
- -DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
- -DVTK_BUILD_ALL_MODULES=$(usex all-modules)
- -DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
- -DVTK_Group_Imaging=$(usex imaging)
- -DVTK_Group_MPI=$(usex mpi)
- -DVTK_Group_Rendering=$(usex rendering)
- -DVTK_Group_Tk=$(usex tk)
- -DVTK_Group_Views=$(usex views)
- -DVTK_Group_Web=$(usex web)
- -DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
- -DVTK_WRAP_JAVA=$(usex java)
- -DVTK_WRAP_PYTHON=$(usex python)
- -DVTK_WRAP_PYTHON_SIP=$(usex python)
- -DVTK_WRAP_TCL=$(usex tcl)
- -DVTK_USE_BOOST=$(usex boost)
- -DUSE_VTK_USE_BOOST=$(usex boost)
- -DModule_vtkInfovisBoost=$(usex boost)
- -DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
- -DVTK_USE_ODBC=$(usex odbc)
- -DModule_vtkIOODBC=$(usex odbc)
- -DVTK_USE_OFFSCREEN=$(usex offscreen)
- -DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
- -DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
- -DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
- -DModule_vtkFiltersStatisticsGnuR=$(usex R)
- -DVTK_USE_X=$(usex X)
- # IO
- -DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
- -DModule_vtkIOGDAL=$(usex gdal)
- -DModule_vtkIOGeoJSON=$(usex json)
- -DModule_vtkIOXdmf2=$(usex xdmf2)
- -DBUILD_TESTING=$(usex examples)
- # Apple stuff, does it really work?
- -DVTK_USE_COCOA=$(usex aqua)
- )
-
- if use java; then
- local javacargs=$(java-pkg_javac-args)
- mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
- fi
-
- if use tbb; then
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
- else
- mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
- -DSIP_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
- -DVTK_USE_SYSTEM_SIX=ON
- )
- fi
-
- if use qt5; then
- mycmakeargs+=(
- -DVTK_USE_QVTK=ON
- -DVTK_USE_QVTK_OPENGL=ON
- -DVTK_USE_QVTK_QTOPENGL=ON
- -DQT_WRAP_CPP=ON
- -DQT_WRAP_UI=ON
- -DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
- -DDESIRED_QT_VERSION=5
- -DVTK_QT_VERSION=5
- -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
- -DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
- -DVTK_Group_Qt:BOOL=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
- )
- fi
-
- if use R; then
- mycmakeargs+=(
- -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
- -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
- )
- fi
-
- append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
- use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
- if use mpi; then
- export CC=mpicc
- export CXX=mpicxx
- export FC=mpif90
- export F90=mpif90
- export F77=mpif77
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- use web && webapp_src_preinst
-
- cmake-utils_src_install
-
- use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
- # Stop web page images from being compressed
- use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
- if use tcl; then
- # install Tcl docs
- docinto vtk_tcl
- dodoc Wrapping/Tcl/README
- docinto .
- fi
-
- # install examples
- if use examples; then
- einfo "Installing examples"
- mv -v {E,e}xamples || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- # environment
- cat >> "${T}"/40${PN} <<- EOF || die
- VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
- VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
- VTKHOME=${EPREFIX}/usr
- EOF
- doenvd "${T}"/40${PN}
-
- use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
- use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
- use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index ee000cf9d837..ea05c1e55496 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -3,14 +3,13 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake-utils virtualx webapp
-
# Short package version
SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
DESCRIPTION="The Visualization Toolkit"
HOMEPAGE="https://www.vtk.org/"
@@ -23,12 +22,11 @@ SRC_URI="
)"
LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
-IUSE="
- all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
- odbc offscreen postgres python qt5 rendering tbb theora tk tcl
- video_cards_nvidia views web R +X xdmf2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+ odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+ video_cards_nvidia views web +X xdmf2"
REQUIRED_USE="
all-modules? ( python xdmf2 boost )
@@ -42,10 +40,15 @@ REQUIRED_USE="
RDEPEND="
app-arch/lz4
+ dev-cpp/eigen
+ dev-db/sqlite
+ dev-libs/double-conversion:0=
dev-libs/expat
dev-libs/jsoncpp:=
dev-libs/libxml2:2
+ dev-libs/pugixml
>=media-libs/freetype-2.5.4
+ media-libs/glew:0=
>=media-libs/libharu-2.3.0-r2
media-libs/libpng:0=
media-libs/libtheora
@@ -69,9 +72,32 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg )
gdal? ( sci-libs/gdal )
java? ( >=virtual/jdk-1.7:* )
+ mpi? (
+ virtual/mpi[cxx,romio]
+ $(python_gen_cond_dep '
+ python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
odbc? ( dev-db/unixODBC )
offscreen? ( media-libs/mesa[osmesa] )
postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtx11extras:5
+ $(python_gen_cond_dep '
+ python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+ ')
+ )
R? ( dev-lang/R )
tbb? ( dev-cpp/tbb )
tcl? ( dev-lang/tcl:0= )
@@ -91,32 +117,18 @@ RDEPEND="
')
)
xdmf2? ( sci-libs/xdmf2 )
- $(python_gen_cond_dep "
- mpi? (
- virtual/mpi[cxx,romio]
- python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
- )
- python? (
- ${PYTHON_DEPS}
- dev-python/sip[\${PYTHON_MULTI_USEDEP}]
- )
- qt5? (
- dev-qt/designer:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtx11extras:5
- python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
- )
- ")"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
S="${WORKDIR}"/VTK-${PV}
PATCHES=(
- "${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+ "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+ "${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+ "${FILESDIR}"/${P}-fno-common.patch # bug 721048
+ "${FILESDIR}"/${P}-py38.patch
)
RESTRICT="test"
@@ -128,7 +140,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ cmake_src_prepare
local x
# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
@@ -144,8 +156,6 @@ src_prepare() {
sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-i Utilities/Doxygen/CMakeLists.txt || die
fi
-
- cmake-utils_src_prepare
}
src_configure() {
@@ -287,13 +297,13 @@ src_configure() {
export F77=mpif77
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
use web && webapp_src_preinst
- cmake-utils_src_install
+ cmake_src_install
use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar