diff --git a/.gitignore b/.gitignore index 515da09..dcad2bd 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ vtk-5.6.0.tar.gz /VTKData-9.3.0.tar.gz /VTK-9.3.1.tar.gz /VTKData-9.3.1.tar.gz +/VTK-9.4.1.tar.gz +/VTKData-9.4.1.tar.gz diff --git a/11159.patch b/11159.patch deleted file mode 100644 index ff3cda4..0000000 --- a/11159.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 761aa1d15970fcb6aadb7d6152737fa9b2d4b0d0 Mon Sep 17 00:00:00 2001 -From: Lars Glud -Date: Fri, 24 May 2024 07:58:23 +0200 -Subject: [PATCH] Make compatible with opencascade 7.8.0. - ---- - IO/OCCT/CMakeLists.txt | 28 ++++++++++++++++++++-------- - IO/OCCT/vtkOCCTReader.cxx | 13 ++++++++++++- - 2 files changed, 32 insertions(+), 9 deletions(-) - -diff --git a/IO/OCCT/CMakeLists.txt b/IO/OCCT/CMakeLists.txt -index e81444ecebd..4baddeb719b 100644 ---- a/IO/OCCT/CMakeLists.txt -+++ b/IO/OCCT/CMakeLists.txt -@@ -4,12 +4,25 @@ vtk_module_find_package(PRIVATE_IF_SHARED - VERSION_VAR "@OpenCASCADE_MAJOR_VERSION@.@OpenCASCADE_MINOR_VERSION@.@OpenCASCADE_MAINTENANCE_VERSION@" - ) - --set(opencascade_req_targets -- TKSTEP -- TKIGES -- TKMesh -- TKXDESTEP -- TKXDEIGES) -+if (OpenCASCADE_VERSION VERSION_GREATER_EQUAL "7.8.0") -+ set(opencascade_req_targets -+ TKDESTEP -+ TKDEIGES -+ TKernel -+ TKMath -+ TKMesh -+ TKBRep -+ TKXSBase -+ TKLCAF -+ TKXCAF) -+else() -+ set(opencascade_req_targets -+ TKSTEP -+ TKIGES -+ TKMesh -+ TKXDESTEP -+ TKXDEIGES) -+endif() - set(opencascade_missing_targets) - foreach (opencascade_req_target IN LISTS opencascade_req_targets) - if (NOT TARGET "${opencascade_req_target}") -@@ -35,8 +48,7 @@ vtk_module_link(VTK::IOOCCT - ${opencascade_req_targets}) - - # OpenCASCADE started putting include directory usage requirements in 7.7.0. --set(OpenCASCADE_VERSION -- "${OpenCASCADE_MAJOR_VERSION}.${OpenCASCADE_MINOR_VERSION}.${OpenCASCADE_MAINTENANCE_VERSION}") -+ - if (OpenCASCADE_VERSION VERSION_LESS "7.7.0") - vtk_module_include(VTK::IOOCCT PRIVATE "${OpenCASCADE_INCLUDE_DIR}") - endif () -diff --git a/IO/OCCT/vtkOCCTReader.cxx b/IO/OCCT/vtkOCCTReader.cxx -index 52e76be72c1..5aca5c93c8c 100644 ---- a/IO/OCCT/vtkOCCTReader.cxx -+++ b/IO/OCCT/vtkOCCTReader.cxx -@@ -345,11 +345,19 @@ public: - } - - //---------------------------------------------------------------------------- -+#if VTK_OCCT_VERSION(7, 8, 0) <= OCC_VERSION_HEX -+ size_t GetHash(const TDF_Label& label) -+ { -+ TopoDS_Shape aShape; -+ return this->ShapeTool->GetShape(label, aShape) ? std::hash{}(aShape) : 0; -+ } -+#else - int GetHash(const TDF_Label& label) - { - TopoDS_Shape aShape; - return this->ShapeTool->GetShape(label, aShape) ? aShape.HashCode(INT_MAX) : 0; - } -+#endif - - //---------------------------------------------------------------------------- - static void GetMatrix(const TopLoc_Location& loc, vtkMatrix4x4* mat) -@@ -381,8 +389,11 @@ public: - GetMatrix(hLoc->Get(), location); - } - } -- -+#if VTK_OCCT_VERSION(7, 8, 0) <= OCC_VERSION_HEX -+ std::unordered_map> ShapeMap; -+#else - std::unordered_map> ShapeMap; -+#endif - Handle(XCAFDoc_ShapeTool) ShapeTool; - Handle(XCAFDoc_ColorTool) ColorTool; - --- -GitLab - diff --git a/11486.patch b/11486.patch deleted file mode 100644 index c401a19..0000000 --- a/11486.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 675929762a09ad0b40cb2667918a7061c47a418c Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Sat, 14 Sep 2024 08:35:21 -0600 -Subject: [PATCH 1/3] Python 3.13 fix for missing dict segfault - -Python 3.13 removed a safety net from PyModule_Type's tp_init slot -that created the module's md_dict member if it was NULL. This -safety net was removed because, since Python 3.11, the md_dict is -created by tp_new and is never expected to be NULL. So, in our -own code, we must ensure that tp_new is called before tp_init. ---- - Wrapping/PythonCore/PyVTKNamespace.cxx | 6 ++++-- - Wrapping/PythonCore/PyVTKTemplate.cxx | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx -index bed60dc47cb..c1823084086 100644 ---- a/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -112,8 +112,10 @@ PyObject* PyVTKNamespace_New(const char* name) - { - // make sure python has readied the type object - PyType_Ready(&PyVTKNamespace_Type); -- // call the allocator provided by python for this type -- self = PyVTKNamespace_Type.tp_alloc(&PyVTKNamespace_Type, 0); -+ // call the superclass new function -+ PyObject* empty = PyTuple_New(0); -+ self = PyVTKNamespace_Type.tp_base->tp_new(&PyVTKNamespace_Type, empty, nullptr); -+ Py_DECREF(empty); - // call the superclass init function - PyObject* pyname = PyUnicode_FromString(name); - PyObject* args = PyTuple_Pack(1, pyname); -diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx -index 26421f60f07..e7780bf1007 100644 ---- a/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -761,8 +761,10 @@ PyObject* PyVTKTemplate_New(const char* name, const char* docstring) - { - // make sure python has readied the type object - PyType_Ready(&PyVTKTemplate_Type); -- // call the allocator provided by python for this type -- PyObject* self = PyVTKTemplate_Type.tp_alloc(&PyVTKTemplate_Type, 0); -+ // call the superclass new function -+ PyObject* empty = PyTuple_New(0); -+ PyObject* self = PyVTKTemplate_Type.tp_base->tp_new(&PyVTKTemplate_Type, empty, nullptr); -+ Py_DECREF(empty); - // call the superclass init function - PyObject* pyname = PyUnicode_FromString(name); - PyObject* pydoc = PyUnicode_FromString(docstring); --- -GitLab - - -From aa647dfeb453a6028ec57285b9f659426595c943 Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Sat, 14 Sep 2024 11:55:31 -0600 -Subject: [PATCH 2/3] Work around deprecated unittest.makeSuite - -The Python unittest.makeSuite() function is gone in Python 3.13, -replace with unittest.TestLoader.loadTestsFromTestCase() ---- - Wrapping/Python/vtkmodules/test/Testing.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Wrapping/Python/vtkmodules/test/Testing.py b/Wrapping/Python/vtkmodules/test/Testing.py -index 2891474a6d4..e0b8675a48b 100644 ---- a/Wrapping/Python/vtkmodules/test/Testing.py -+++ b/Wrapping/Python/vtkmodules/test/Testing.py -@@ -515,8 +515,10 @@ def test(cases): - """ - # Make the test suites from the arguments. - suites = [] -- for case in cases: -- suites.append(unittest.makeSuite(case[0], case[1])) -+ loader = unittest.TestLoader() -+ # the "name" is ignored (it was always just 'test') -+ for test,name in cases: -+ suites.append(loader.loadTestsFromTestCase(test)) - test_suite = unittest.TestSuite(suites) - - # Now run the tests. --- -GitLab - - -From 718db8b7b95b1f75be4491c50f0ac41b58d1174a Mon Sep 17 00:00:00 2001 -From: David Gobbi -Date: Sat, 14 Sep 2024 16:58:26 -0600 -Subject: [PATCH 3/3] Avoid use of deprecated Py_GetProgramName - -Py_GetProgramName() was deprecated in Python 3.13 and will be -removed in Python 3.15. The same information can be retrieved -from sys.executable. Note that since we stopped using -Py_SetProgramName() for Python>=3.8, for consistency the #ifdef -for Py_GetProgramName() also checks Python>=3.8. ---- - .../PythonInterpreter/vtkPythonInterpreter.cxx | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -index deff95758c2..1e9b6e12145 100644 ---- a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -+++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -@@ -97,6 +97,7 @@ wchar_t* vtk_Py_UTF8ToWide(const char* arg) - return result; - } - -+#if PY_VERSION_HEX < 0x03080000 - std::string vtk_Py_WideToUTF8(const wchar_t* arg) - { - std::string result; -@@ -110,6 +111,7 @@ std::string vtk_Py_WideToUTF8(const wchar_t* arg) - - return result; - } -+#endif - - std::vector>* GlobalInterpreters; - std::vector PythonPaths; -@@ -335,12 +337,21 @@ void SetupPythonPaths(bool isolated, std::string vtklib, const char* landmark) - if (vtklib.empty()) - { - VTKPY_DEBUG_MESSAGE( -- "`GetVTKVersion` library couldn't be found. Will use `Py_GetProgramName` next."); -+ "`GetVTKVersion` library couldn't be found. Will use `sys.executable` next."); - } - - if (vtklib.empty()) - { -+#if PY_VERSION_HEX >= 0x03080000 -+ vtkPythonScopeGilEnsurer gilEnsurer; -+ PyObject* executable_path = PySys_GetObject("executable"); -+ if (executable_path != Py_None) -+ { -+ vtklib = PyUnicode_AsUTF8AndSize(executable_path, nullptr); -+ } -+#else - vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); -+#endif - } - - vtklib = systools::CollapseFullPath(vtklib); --- -GitLab - diff --git a/sources b/sources index 6c62cea..49d0828 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.3.1.tar.gz) = 5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3 -SHA512 (VTKData-9.3.1.tar.gz) = befc6b68e33d2c2fb6928006d4fe6feda7e0bbaf31df4488911ab8e3865e3fc1cf3834301301aa2b6de94c4489eebf5e2e8521e8830315d2a1f0e65cb73a6fd3 +SHA512 (VTK-9.4.1.tar.gz) = f441953c4befdda0aa2383810cdfa76cd510b275b14624dc6e56da1c711598b9e003e4acbd000171c43d6b8f1bcb2533391ce7d7542fd15b04cb5f9c62f38976 +SHA512 (VTKData-9.4.1.tar.gz) = 8750021b245374e63b9d85faebd450592f77964adabdd901b1a45812c894e6f074f4160d47245882a4d205b7c44347454e3e87baedab71f7803ce10ea79a68ec diff --git a/vtk-build.patch b/vtk-build.patch deleted file mode 100644 index e1ab822..0000000 --- a/vtk-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN VTK-9.2.6/Utilities/octree/octree/octree_node.txx VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx ---- VTK-9.2.6/Utilities/octree/octree/octree_node.txx 2023-02-15 05:03:53.000000000 +0100 -+++ VTK-9.2.6-new/Utilities/octree/octree/octree_node.txx 2025-01-24 14:12:16.855255487 +0100 -@@ -207,7 +207,7 @@ const octree_node& octree_no - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. diff --git a/vtk-fmt11.patch b/vtk-fmt11.patch deleted file mode 100644 index 03449c2..0000000 --- a/vtk-fmt11.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Decomposition.C 2024-10-08 21:19:19.992041276 -0600 -@@ -15,6 +15,7 @@ - #include - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include - - #if !defined(NO_ZOLTAN_SUPPORT) -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C 2024-10-08 21:29:59.986677415 -0600 -@@ -12,6 +12,7 @@ - #include // for nullptr - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include // for _Rb_tree_iterator, etc - #include // for basic_ostream, etc - #include -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ParallelUtils.h.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ParallelUtils.h ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ParallelUtils.h.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ParallelUtils.h 2024-10-08 21:19:56.331288311 -0600 -@@ -20,6 +20,7 @@ - #include "vtk_fmt.h" - #include VTK_FMT(fmt/format.h) - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #endif - - #ifdef SEACAS_HAVE_MPI -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C 2024-10-08 21:38:42.152664394 -0600 -@@ -15,6 +15,7 @@ - #include - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - - #include // for size_t - #include -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.C 2024-10-08 21:45:05.101527796 -0600 -@@ -21,6 +21,7 @@ - #include VTK_FMT(fmt/chrono.h) - #include VTK_FMT(fmt/format.h) - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include - #include - #include -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.h.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_Utils.h -diff -up VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C.fmt11 VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C ---- VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C.fmt11 2024-06-28 10:00:10.000000000 -0600 -+++ VTK-9.3.1/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C 2024-10-08 21:49:40.766552085 -0600 -@@ -9,6 +9,7 @@ - #include // for size_t - #include "vtk_fmt.h" - #include VTK_FMT(fmt/ostream.h) -+#include VTK_FMT(fmt/ranges.h) - #include // for string - #include // for vector - diff --git a/vtk-itlib-cstdint.patch b/vtk-itlib-cstdint.patch new file mode 100644 index 0000000..65519fc --- /dev/null +++ b/vtk-itlib-cstdint.patch @@ -0,0 +1,22 @@ +diff -up VTK-9.4.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/itlib/small_vector.hpp.cstdint VTK-9.4.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/itlib/small_vector.hpp +--- VTK-9.4.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/itlib/small_vector.hpp.cstdint 2024-12-27 10:08:14.000000000 -0700 ++++ VTK-9.4.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/itlib/small_vector.hpp 2025-02-17 16:26:27.950611287 -0700 +@@ -140,6 +140,7 @@ + + #include + #include ++#include + #include + + #define ITLIB_SMALL_VECTOR_ERROR_HANDLING_NONE 0 +diff -up VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp.cstdint VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp +--- VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp.cstdint 2024-12-27 10:08:14.000000000 -0700 ++++ VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp 2025-02-17 16:26:36.924266397 -0700 +@@ -140,6 +140,7 @@ + + #include + #include ++#include + #include + + #define ITLIB_SMALL_VECTOR_ERROR_HANDLING_NONE 0 diff --git a/vtk.spec b/vtk.spec index e1a24a5..247f371 100644 --- a/vtk.spec +++ b/vtk.spec @@ -60,28 +60,21 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.3.1%{?rc:~%{rc}} +Version: 9.4.1%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause %global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} -Source0: https://www.vtk.org/files/release/9.3/VTK-%{srcver}.tar.gz -Source1: https://www.vtk.org/files/release/9.3/VTKData-%{srcver}.tar.gz +Source0: https://www.vtk.org/files/release/9.4/VTK-%{srcver}.tar.gz +Source1: https://www.vtk.org/files/release/9.4/VTKData-%{srcver}.tar.gz Source2: xorg.conf -# Fix build -Patch: vtk-build.patch -Patch: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486.patch # Patch required libharu version (Fedora 33+ contains the needed VTK patches) Patch: vtk-libharu.patch # Allow building with external zfp # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10689 Patch: vtk-zfp.patch -# FMT-11 support in IOSS, based on https://github.com/sandialabs/seacas/pull/477 -Patch: vtk-fmt11.patch -# OpenCascade 7.8 support -Patch: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11159.patch -# Add #include to chobo +# Add #include to itlib # https://gitlab.kitware.com/vtk/vtk/-/issues/19422 -Patch: vtk-chobo-cstdint.patch +Patch: vtk-itlib-cstdint.patch # Fix vtkm Patch: vtk-vtkm.patch @@ -98,6 +91,7 @@ BuildRequires: java-devel Obsoletes: %{name}-java < %{version}-%{release} Obsoletes: %{name}-java-devel < %{version}-%{release} %endif +BuildRequires: alembic-devel %if %{with flexiblas} BuildRequires: flexiblas-devel %else @@ -121,7 +115,6 @@ BuildRequires: gdal-devel %if %{with gl2ps} BuildRequires: gl2ps-devel %endif -BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: json-devel BuildRequires: jsoncpp-devel @@ -222,7 +215,6 @@ Requires: gdal-devel%{?_isa} \ %if %{with gl2ps} \ Requires: gl2ps-devel%{?_isa} \ %endif \ -Requires: glew-devel%{?_isa} \ Requires: json-devel%{?_isa} \ Requires: jsoncpp-devel%{?_isa} \ Requires: lapack-devel%{?_isa} \ @@ -306,6 +298,8 @@ Provides: bundled(ioss) = 20221014 Provides: bundled(kissfft) Provides: bundled(loguru) = 2.1 Provides: bundled(metaio) +# kitware library https://gitlab.kitware.com/utils/token +Provides: bundled(token) = 23.09 Provides: bundled(verdict) = 1.4.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 @@ -563,7 +557,7 @@ programming languages. %prep %autosetup -p1 -b 1 -n VTK-%{srcver} # Remove included thirdparty sources just to be sure -# ls VTK-9.3.0/ThirdParty/*/vtk* -dl | grep ^d +# ls VTK-*/ThirdParty/*/vtk* -dl | grep ^d # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged # TODO - exprtk - not yet packaged @@ -576,7 +570,7 @@ programming languages. # TODO - VPIC - not yet packaged # TODO - xdmf2 - not yet packaged # TODO - xdmf3 - not yet packaged -for x in vtk{cgns,cli11,doubleconversion,eigen,expat,fast_float,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,nlohmannjson,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} +for x in vtk{cgns,cli11,doubleconversion,eigen,expat,fast_float,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,nlohmannjson,ogg,pegtl,png,pugixml,sqlite,theora,tiff,utf8,zfp,zlib} do rm -r ThirdParty/*/${x} done @@ -587,6 +581,9 @@ rm -r ThirdParty/xdmf3 # Remove version requirements sed -i -e '/VERSION *"/d' ThirdParty/fast_float/CMakeLists.txt +# Remove version requirements +sed -i -e '/VERSION *"/d' ThirdParty/fast_float/CMakeLists.txt + # Remove unused KWSys items find Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|Status|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm @@ -634,13 +631,13 @@ find vtk-examples -type f | xargs chmod -R a-x -DVTK_MODULE_ENABLE_VTK_IOMySQL:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOOMF:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOParallelLSDyna:STRING=YES \\\ - -DVTK_MODULE_ENABLE_VTK_IOPIO:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOVPIC:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_IOXdmf2:STRING=YES \\\ %ifarch %{ix86} \ -DVTK_MODULE_ENABLE_VTK_IOXdmf3:STRING=NO \\\ %endif \ + -DVTK_MODULE_ENABLE_VTK_RenderingAnari:STRING=NO \\\ -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR:STRING=YES \\\ -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \\\ @@ -668,7 +665,6 @@ find vtk-examples -type f | xargs chmod -R a-x -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS:STRING=NO \\\ -DVTK_MODULE_ENABLE_VTK_IOADIOS2:STRING=NO \\\ -DVTK_MODULE_ENABLE_VTK_IOOpenVDB:STRING=NO \\\ - -DVTK_MODULE_ENABLE_VTK_RenderingZSpace:STRING=NO \\\ %if !%{with fmt} \ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \\\ %endif \ @@ -677,6 +673,7 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} @@ -725,6 +722,7 @@ do -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ + -DVTK_MODULE_ENABLE_VTK_IOPIO:STRING=YES \ -DVTK_USE_MPI:BOOL=ON module purge done