From a6301b86a6ee0098b203cbb3bd08ed777476d7de Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 11:34:51 +0100 Subject: [PATCH 01/62] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 3dab677..49174f8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 17%{?dist} +Release: 18%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -844,6 +844,9 @@ cat xorg.log %changelog +* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 +- Rebuild (gdal) + * Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 - Remove all of vtkdata/Wrapping to keep vtk-data noarch From 5cef47821ac1ac368fc8903bdd5e3565019b833e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 24 Jun 2022 07:50:00 -0600 Subject: [PATCH 02/62] Update to 9.2.5 Use SPDX License tag --- .gitignore | 2 + 9616.patch | 79 ++++++++++++++++++++++++ sources | 4 +- vtk-AllValues.patch | 132 ----------------------------------------- vtk-kissfft-libm.patch | 11 ---- vtk-libharu.patch | 15 ++--- vtk-netcdf.patch | 13 ---- vtk-qt5.15.patch | 22 ------- vtk.spec | 43 +++++++------- 9 files changed, 112 insertions(+), 209 deletions(-) create mode 100644 9616.patch delete mode 100644 vtk-AllValues.patch delete mode 100644 vtk-kissfft-libm.patch delete mode 100644 vtk-netcdf.patch delete mode 100644 vtk-qt5.15.patch diff --git a/.gitignore b/.gitignore index c9fc96e..43fc717 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ vtk-5.6.0.tar.gz /VTKData-9.0.3.tar.gz /VTK-9.1.0.tar.gz /VTKData-9.1.0.tar.gz +/VTK-9.2.5.tar.gz +/VTKData-9.2.5.tar.gz diff --git a/9616.patch b/9616.patch new file mode 100644 index 0000000..4dfd591 --- /dev/null +++ b/9616.patch @@ -0,0 +1,79 @@ +From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001 +From: Eric Larson +Date: Tue, 11 Oct 2022 12:12:38 -0400 +Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable() + +Also remove old nullptr assignments as they are unnecessary +when using vtkSmartPointer. +--- + .../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx | 2 ++ + Charts/Core/vtkPlotBar.cxx | 10 +++++++--- + .../release/dev/fix-vtkPlotBar-GetLookupTable.md | 4 ++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md + +diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx +index 2d0ed46b128..919319a6b4d 100644 +--- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx ++++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx +@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[]) + + // Add bar plot and handles + vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR)); ++ // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974 ++ barPlot->GetLookupTable(); + barPlot->SetInputData(table, "Months", "Books"); + chart->SetBarWidthFraction(1.0); + +diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx +index a68a26c0ecd..220e8199d02 100644 +--- a/Charts/Core/vtkPlotBar.cxx ++++ b/Charts/Core/vtkPlotBar.cxx +@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar); + vtkPlotBar::vtkPlotBar() + { + this->Private = new vtkPlotBarPrivate(this); ++ // Points is not a vtkSmartPointer, so set it explicitly to nullptr + this->Points = nullptr; +- this->AutoLabels = nullptr; + this->Width = 1.0; + this->Pen->SetWidth(1.0); + this->Offset = 1.0; +- this->ColorSeries = nullptr; + this->Orientation = vtkPlotBar::VERTICAL; + this->ScalarVisibility = false; + this->EnableOpacityMapping = true; +@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled) + + // Get the x and y arrays (index 0 and 1 respectively) + vtkTable* table = this->Data->GetInput(); ++ if (!table) ++ { ++ return; ++ } + vtkDataArray* x = + this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table); + vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table); +@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable() + // rainbow - blue to red + lut->SetHueRange(0.6667, 0.0); + lut->Build(); +- double bounds[4]; ++ // set reasonable defaults in case no data has been set ++ double bounds[4] = { 0.0, 1.0, 0.0, 1.0 }; + this->GetBounds(bounds); + lut->SetRange(bounds[0], bounds[1]); + this->LookupTable = lut; +diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md +new file mode 100644 +index 00000000000..ba6a96753ac +--- /dev/null ++++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md +@@ -0,0 +1,4 @@ ++## Fixes for vtkPlotBar.GetLookupTable ++ ++Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation ++fault in the case where no data had been plotted yet. +-- +GitLab + diff --git a/sources b/sources index 07ce256..bb8f778 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.1.0.tar.gz) = b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a -SHA512 (VTKData-9.1.0.tar.gz) = 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a +SHA512 (VTK-9.2.5.tar.gz) = b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf +SHA512 (VTKData-9.2.5.tar.gz) = c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 diff --git a/vtk-AllValues.patch b/vtk-AllValues.patch deleted file mode 100644 index 7f6de66..0000000 --- a/vtk-AllValues.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx ---- VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.cxx 2021-10-04 19:27:42.557502417 -0600 -@@ -1674,7 +1674,7 @@ struct ScalarRangeDispatchWrapper - void operator()(ArrayT* array) - { - this->Success = vtkDataArrayPrivate::DoComputeScalarRange( -- array, this->Range, vtkDataArrayPrivate::AllValues()); -+ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); - } - }; - -@@ -1693,7 +1693,7 @@ struct VectorRangeDispatchWrapper - void operator()(ArrayT* array) - { - this->Success = vtkDataArrayPrivate::DoComputeVectorRange( -- array, this->Range, vtkDataArrayPrivate::AllValues()); -+ array, this->Range, vtkDataArrayPrivate::vtkAllValues()); - } - }; - -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArray.h ---- VTK-9.1.0.rc1/Common/Core/vtkDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArray.h 2021-10-04 19:27:42.557502417 -0600 -@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr - // vtkGenericDataArray.h as well. - namespace vtkDataArrayPrivate - { --struct AllValues -+struct vtkAllValues - { - }; - struct FiniteValues -diff -up VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx ---- VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkDataArrayPrivate.txx 2021-10-04 19:27:42.559502435 -0600 -@@ -310,7 +310,7 @@ template - struct ComputeScalarRange - { - template -- bool operator()(ArrayT* array, RangeValueType* ranges, AllValues) -+ bool operator()(ArrayT* array, RangeValueType* ranges, vtkAllValues) - { - AllValuesMinAndMax minmax(array); - vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -447,7 +447,7 @@ public: - }; - - template --bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, AllValues) -+bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, vtkAllValues) - { - AllValuesGenericMinAndMax minmax(array); - vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax); -@@ -530,7 +530,7 @@ bool DoComputeScalarRange(ArrayT* array, - //---------------------------------------------------------------------------- - // generic implementation that operates on ValueType. - template --bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], AllValues) -+bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], vtkAllValues) - { - range[0] = vtkTypeTraits::Max(); - range[1] = vtkTypeTraits::Min(); -diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h ---- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.h 2021-10-04 19:27:42.559502435 -0600 -@@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate - template - bool DoComputeScalarRange(A*, R*, T); - template --bool DoComputeVectorRange(A*, R[2], AllValues); -+bool DoComputeVectorRange(A*, R[2], vtkAllValues); - template - bool DoComputeVectorRange(A*, R[2], FiniteValues); - } // namespace vtkDataArrayPrivate -@@ -466,11 +466,11 @@ class vtkScaledSOADataArrayTemplate; - - #define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ - template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ -- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ - ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ -- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ - template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ - ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); - -@@ -516,18 +516,18 @@ namespace vtkDataArrayPrivate - template - bool DoComputeScalarRange(A*, R*, T); - template --bool DoComputeVectorRange(A*, R[2], AllValues); -+bool DoComputeVectorRange(A*, R[2], vtkAllValues); - template - bool DoComputeVectorRange(A*, R[2], FiniteValues); - } // namespace vtkDataArrayPrivate - - #define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType) \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ -- ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange( \ - ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ -- ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues); \ -+ ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues); \ - extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange( \ - ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues); - -diff -up VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx ---- VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx.AllValues 2021-10-01 12:23:49.000000000 -0600 -+++ VTK-9.1.0.rc1/Common/Core/vtkGenericDataArray.txx 2021-10-04 19:27:42.558502426 -0600 -@@ -1190,7 +1190,7 @@ bool vtkGenericDataArray; - return ComputeScalarValueRangeImpl( -- static_cast(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- -@@ -1200,7 +1200,7 @@ bool vtkGenericDataArray; - return ComputeVectorValueRangeImpl( -- static_cast(this), range, vtkDataArrayPrivate::AllValues{}, Supported{}); -+ static_cast(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{}); - } - - //----------------------------------------------------------------------------- diff --git a/vtk-kissfft-libm.patch b/vtk-kissfft-libm.patch deleted file mode 100644 index e598bf2..0000000 --- a/vtk-kissfft-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt ---- VTK-9.1.0/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2021-11-04 13:48:20.000000000 -0600 -+++ VTK-9.2.0.rc1/ThirdParty/kissfft/vtkkissfft/CMakeLists.txt 2022-06-20 10:08:06.000000000 -0600 -@@ -40,3 +40,7 @@ - target_include_directories(kissfft - PRIVATE - "$") -+ -+if (UNIX) -+ vtk_module_link(VTK::kissfft PRIVATE m) -+endif () diff --git a/vtk-libharu.patch b/vtk-libharu.patch index 2d03ab6..7100aa3 100644 --- a/vtk-libharu.patch +++ b/vtk-libharu.patch @@ -1,10 +1,11 @@ -diff -up VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt ---- VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt.libharu 2020-05-01 13:29:00.000000000 -0600 -+++ VTK-9.0.0/ThirdParty/libharu/CMakeLists.txt 2020-05-12 16:47:18.298133406 -0600 -@@ -8,7 +8,7 @@ vtk_module_third_party( - # Unreleased. Requires these PRs: - # https://github.com/libharu/libharu/pull/157 - # https://github.com/libharu/libharu/pull/187 +diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt +index b18b7a1..3793f4b 100644 +--- a/ThirdParty/libharu/CMakeLists.txt ++++ b/ThirdParty/libharu/CMakeLists.txt +@@ -5,7 +5,7 @@ vtk_module_third_party( + STANDARD_INCLUDE_DIRS + EXTERNAL + PACKAGE LibHaru - VERSION 2.4.0 + VERSION 2.3.0 TARGETS LibHaru::LibHaru diff --git a/vtk-netcdf.patch b/vtk-netcdf.patch deleted file mode 100644 index fbe18be..0000000 --- a/vtk-netcdf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c ---- VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.netcdf 2021-11-04 13:48:20.000000000 -0600 -+++ VTK-9.1.0/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2022-06-28 07:04:11.574398570 -0600 -@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, in - */ - - /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ -+#if !defined(NC_SZIP_NN) - const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ -+#endif - /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ - const int SZIP_PIXELS_PER_BLOCK = - file->compression_level == 0 ? 32 : file->compression_level; diff --git a/vtk-qt5.15.patch b/vtk-qt5.15.patch deleted file mode 100644 index cff62f8..0000000 --- a/vtk-qt5.15.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx ---- VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx.qt5.15 2019-01-30 10:15:13.000000000 -0700 -+++ VTK-8.2.0/Rendering/Qt/vtkQtLabelRenderStrategy.cxx 2020-09-17 21:44:08.125697274 -0600 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -up VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx ---- VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx.qt5.15 2020-09-17 21:44:08.125697274 -0600 -+++ VTK-8.2.0/Rendering/Qt/vtkQtStringToImage.cxx 2020-09-17 21:45:46.126513263 -0600 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/vtk.spec b/vtk.spec index 49174f8..4180136 100644 --- a/vtk.spec +++ b/vtk.spec @@ -39,25 +39,16 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.1.0 -Release: 18%{?dist} -# This is a variant BSD license, a cross between BSD and ZLIB. -# For all intents, it has the same rights and restrictions as BSD. -# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant -License: BSD -Source0: https://www.vtk.org/files/release/9.1/VTK-%{version}.tar.gz -Source1: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz +Version: 9.2.5 +Release: 1%{?dist} +License: BSD-3-Clause +Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz +Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) Patch0: vtk-libharu.patch -# Upstream patch to link kissfft with libm -Patch1: vtk-kissfft-libm.patch -# Upstream patch to support netcdf 4.9.0 -# https://gitlab.kitware.com/vtk/vtk/-/issues/18576 -Patch2: vtk-netcdf.patch -# Duplicate define conflict with Xutil, see: -# https://gitlab.kitware.com/vtk/vtk/-/issues/18048 -Patch3: vtk-AllValues.patch +# Fix issue with Mayavi +Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch URL: https://vtk.org/ @@ -94,11 +85,11 @@ BuildRequires: gl2ps-devel %endif BuildRequires: glew-devel BuildRequires: hdf5-devel +BuildRequires: json-devel BuildRequires: jsoncpp-devel BuildRequires: libarchive-devel BuildRequires: libGL-devel -# Requires special patched version of libharu -BuildRequires: libharu-devel >= 2.3.0-9 +BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libICE-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -107,6 +98,7 @@ BuildRequires: libtheora-devel BuildRequires: libtiff-devel BuildRequires: libxml2-devel BuildRequires: libX11-devel +BuildRequires: libXcursor-devel BuildRequires: libXext-devel BuildRequires: libXt-devel BuildRequires: lz4-devel @@ -179,6 +171,7 @@ Requires: gdal-devel%{?_isa} \ Requires: gl2ps-devel%{?_isa} \ %endif \ Requires: glew-devel%{?_isa} \ +Requires: json-devel%{?_isa} \ Requires: jsoncpp-devel%{?_isa} \ Requires: lapack-devel%{?_isa} \ Requires: libarchive-devel%{?_isa} \ @@ -192,6 +185,7 @@ Requires: libtheora-devel%{?_isa} \ Requires: libtiff-devel%{?_isa} \ Requires: libxml2-devel%{?_isa} \ Requires: libX11-devel%{?_isa} \ +Requires: libXcursor-devel%{?_isa} \ Requires: libXext-devel%{?_isa} \ Requires: libXt-devel%{?_isa} \ Requires: lz4-devel%{?_isa} \ @@ -246,7 +240,7 @@ Provides: bundled(gl2ps) = 1.4.0 Provides: bundled(ioss) = 20210512 Provides: bundled(kissfft) Provides: bundled(metaio) -Provides: bundled(verdict) = 1.2.0 +Provides: bundled(verdict) = 1.4.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) @@ -566,6 +560,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} # https://gitlab.kitware.com/cmake/cmake/issues/17223 @@ -577,7 +572,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ -DVTK_BUILD_TESTING:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %cmake_build --target DoxygenDoc %if %{with mpich} @@ -593,7 +588,7 @@ export CXX=mpic++ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %_mpich_unload %endif @@ -610,7 +605,7 @@ export CXX=mpic++ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ -DVTK_USE_MPI:BOOL=ON -%cmake_build +%cmake_build -- --output-sync %_openmpi_unload %endif @@ -844,6 +839,10 @@ cat xorg.log %changelog +* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 +- Update to 9.2.5 +- Use SPDX License tag + * Sat Nov 12 2022 Sandro Mani - 9.1.0-18 - Rebuild (gdal) From 085f74c1ef78eefd356da6a4c715e052eea5851b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 17 Jan 2023 17:13:50 -0700 Subject: [PATCH 03/62] Add patch to fix build with gcc 13 --- vtk-include.patch | 11 +++++++++++ vtk.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 vtk-include.patch diff --git a/vtk-include.patch b/vtk-include.patch new file mode 100644 index 0000000..85d6e2f --- /dev/null +++ b/vtk-include.patch @@ -0,0 +1,11 @@ +diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h +--- VTK-9.2.5/IO/Image/vtkSEPReader.h.include 2023-01-05 08:51:35.000000000 -0700 ++++ VTK-9.2.5/IO/Image/vtkSEPReader.h 2023-01-17 07:43:41.988095734 -0700 +@@ -26,6 +26,7 @@ + #include "vtkNew.h" // for ivars + + #include // for std::array ++#include // for std::uint8_t + #include // for std::string + + namespace details diff --git a/vtk.spec b/vtk.spec index 4180136..8d86dac 100644 --- a/vtk.spec +++ b/vtk.spec @@ -49,6 +49,9 @@ Source2: xorg.conf Patch0: vtk-libharu.patch # Fix issue with Mayavi Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch +# Add missing includes for gcc 13 +# https://gitlab.kitware.com/vtk/vtk/-/issues/18782 +Patch2: vtk-include.patch URL: https://vtk.org/ From 36a6ede0c93d512feac87dd0a86cfd0e89779867 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:32:02 +0000 Subject: [PATCH 04/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 8d86dac..f2b3b78 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 - Update to 9.2.5 - Use SPDX License tag From b01bce2be6ea02d8eae04d8104bb0b1a97e0c358 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 18 Feb 2023 20:29:46 -0700 Subject: [PATCH 05/62] Update to 9.2.6 --- vtk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index f2b3b78..fd9b633 100644 --- a/vtk.spec +++ b/vtk.spec @@ -39,8 +39,8 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.2.5 -Release: 2%{?dist} +Version: 9.2.6 +Release: 1%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 +- Update to 9.2.6 + * Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From b3badea619a6b92a47c7e67e03401ec086bdb724 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 18 Feb 2023 20:45:59 -0700 Subject: [PATCH 06/62] Upload sources --- .gitignore | 2 ++ sources | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 43fc717..104cc2e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ vtk-5.6.0.tar.gz /VTKData-9.1.0.tar.gz /VTK-9.2.5.tar.gz /VTKData-9.2.5.tar.gz +/VTK-9.2.6.tar.gz +/VTKData-9.2.6.tar.gz diff --git a/sources b/sources index bb8f778..03bdad8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.2.5.tar.gz) = b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf -SHA512 (VTKData-9.2.5.tar.gz) = c06264c10bf78943753e58b9cb034d56b65570995741020dc58d5703525cdd4842d680fb6e185fa8fc39b72225ea6b29d8d632c0327f4145a7e2b79f3f702ec3 +SHA512 (VTK-9.2.6.tar.gz) = f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc +SHA512 (VTKData-9.2.6.tar.gz) = 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 From dac5ec46ae0b9c554c61ac19d41dd2a1bf123cb3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 22:19:40 +0000 Subject: [PATCH 07/62] Rebuilt for Boost 1.81 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fd9b633..7c89758 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 +- Rebuilt for Boost 1.81 + * Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 - Update to 9.2.6 From 0744477aa5275fc5ba4a0071797fb3c4cacdb1f7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 25 Apr 2023 17:56:21 -0600 Subject: [PATCH 08/62] Add upstream patch for CVE-2021-42521 - vtkXMLTreeReader: possible nullptr dereference (bz#2189654) --- 9621.patch | 36 ++++++++++++++++++++++++++++++++++++ vtk.spec | 8 +++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 9621.patch diff --git a/9621.patch b/9621.patch new file mode 100644 index 0000000..b4c3835 --- /dev/null +++ b/9621.patch @@ -0,0 +1,36 @@ +From 72119ea71422d2892f2a0475fc282835310f8d9e Mon Sep 17 00:00:00 2001 +From: Cory Quammen +Date: Thu, 29 Sep 2022 13:10:00 -0400 +Subject: [PATCH] vtkXMLTreeReader: protect against possible nullptr + dereference + +Vulnerability reported at +https://nvd.nist.gov/vuln/detail/CVE-2021-42521. + +Fixes #17818 + +(cherry picked from commit 9a2fe8ef2ecbf04f811b2e02b71eae8b94aae089) +--- + IO/Infovis/vtkXMLTreeReader.cxx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/IO/Infovis/vtkXMLTreeReader.cxx b/IO/Infovis/vtkXMLTreeReader.cxx +index 64abca37e96..af64572b27f 100644 +--- a/IO/Infovis/vtkXMLTreeReader.cxx ++++ b/IO/Infovis/vtkXMLTreeReader.cxx +@@ -217,6 +217,12 @@ int vtkXMLTreeReader::RequestData( + + // Get the root element node + xmlNode* rootElement = xmlDocGetRootElement(doc); ++ if (!rootElement) ++ { ++ vtkErrorMacro(<< "Could not get root element of document."); ++ return 0; ++ } ++ + vtkXMLTreeReaderProcessElement(builder, -1, rootElement, this->ReadCharData, this->MaskArrays); + + xmlFreeDoc(doc); +-- +GitLab + diff --git a/vtk.spec b/vtk.spec index 3dab677..98fcd3a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 17%{?dist} +Release: 18%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -58,6 +58,8 @@ Patch2: vtk-netcdf.patch # Duplicate define conflict with Xutil, see: # https://gitlab.kitware.com/vtk/vtk/-/issues/18048 Patch3: vtk-AllValues.patch +# CVE-2021-42521 - vtkXMLTreeReader: possible nullptr dereference +Patch4: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9621.patch URL: https://vtk.org/ @@ -844,6 +846,10 @@ cat xorg.log %changelog +* Tue Apr 25 2023 Orion Poplawski - 9.1.0-18 +- Add upstream patch for CVE-2021-42521 - vtkXMLTreeReader: possible nullptr + dereference (bz#2189654) + * Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 - Remove all of vtkdata/Wrapping to keep vtk-data noarch From 831187c07e8ec5f78336f3f61f7ea1d102d85d0d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 10:21:33 +0200 Subject: [PATCH 09/62] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 7c89758..eece31d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Thu May 11 2023 Sandro Mani - 9.2.6-3 +- Rebuild (gdal) + * Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 - Rebuilt for Boost 1.81 From de6786f4b221b5c654dfb24a456d3393117a6d92 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:30:53 +0200 Subject: [PATCH 10/62] Rebuilt for Python 3.12 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index eece31d..fca9143 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Fri Jun 16 2023 Python Maint - 9.2.6-4 +- Rebuilt for Python 3.12 + * Thu May 11 2023 Sandro Mani - 9.2.6-3 - Rebuild (gdal) From d7c5c6ec013434db7874c3d5f464a1b1d0a648fe Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jul 2023 15:43:54 +0200 Subject: [PATCH 11/62] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fca9143..d253ae6 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 +- Rebuild (cgnslib) + * Fri Jun 16 2023 Python Maint - 9.2.6-4 - Rebuilt for Python 3.12 From 9b75c31167b945a63764a6048759400911a2e6bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:54:17 +0000 Subject: [PATCH 12/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d253ae6..99380b0 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Sandro Mani - 9.2.6-5 - Rebuild (cgnslib) From b3db91756ac2d62d813923ce15f6aef3196f1ddd Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 6 Sep 2023 10:02:21 -0400 Subject: [PATCH 13/62] Fix flatpak build We neither need nor are building mpich and openmpi subpackages. --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index 99380b0..0fbb0d8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -14,8 +14,13 @@ %else %bcond_with java %endif +%if 0%{?flatpak} +%bcond_with mpich +%bcond_with openmpi +%else %bcond_without mpich %bcond_without openmpi +%endif # s390x on EL8 does not have xorg-x11-drv-dummy %if 0%{?rhel} %ifarch s390x From 5f9a1f7ae79797dc0650d77756b0ef008c749d11 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Sep 2023 15:53:22 -0600 Subject: [PATCH 14/62] Fix -devel deps on netcdf-*-devel --- vtk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index 0fbb0d8..7f0f7ae 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -279,7 +279,7 @@ Requires: %{name}-java%{?_isa} = %{version}-%{release} %endif Requires: python%{python3_pkgversion}-%{name}%{?_isa} = %{version}-%{release} Requires: hdf5-devel%{?_isa} -Requires: netcdf-mpich-devel%{?_isa} +Requires: netcdf-cxx-devel%{?_isa} %{vtk_devel_requires} %description devel @@ -348,6 +348,7 @@ Requires: %{name}-mpich%{?_isa} = %{version}-%{release} Requires: python%{python3_pkgversion}-%{name}-mpich%{?_isa} = %{version}-%{release} Requires: mpich-devel Requires: hdf5-mpich-devel%{?_isa} +Requires: netcdf-mpich-devel%{?_isa} %{vtk_devel_requires} %description mpich-devel @@ -847,6 +848,9 @@ cat xorg.log %changelog +* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 +- Fix -devel deps on netcdf-*-devel + * Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e98440838139d26affdee4f18a5642fa4a22f629 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 17 Sep 2023 08:19:43 -0600 Subject: [PATCH 15/62] Use loops for mpi builds/intalls --- vtk.spec | 145 ++++++++++++++++++++++++------------------------------- 1 file changed, 62 insertions(+), 83 deletions(-) diff --git a/vtk.spec b/vtk.spec index 7f0f7ae..fb8f73c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -322,7 +322,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description qt Qt bindings for VTK. +%global mpi_list %{nil} + %if %{with mpich} +%global mpi_list %mpi_list mpich %package mpich Summary: The Visualization Toolkit - mpich version @@ -392,6 +395,7 @@ Qt bindings for VTK with mpich. %endif %if %{with openmpi} +%global mpi_list %mpi_list openmpi %package openmpi Summary: The Visualization Toolkit - openmpi version @@ -508,22 +512,6 @@ cp -a Examples vtk-examples find vtk-examples -type f | xargs chmod -R a-x -%build -export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" -export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" -export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H -%if %{with java} -export JAVA_HOME=/usr/lib/jvm/java -%ifarch %{arm} s390x -# getting "java.lang.OutOfMemoryError: Java heap space" during the build -export JAVA_TOOL_OPTIONS=-Xmx2048m -%endif -%ifarch %{arm} -# Likely running out of memory during build -%global _smp_ncpus_max 2 -%endif -%endif - %global vtk_cmake_options \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ -DCMAKE_INSTALL_JARDIR=share/java \\\ @@ -575,7 +563,25 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m # https://gitlab.kitware.com/cmake/cmake/issues/17223 #-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ -%global _vpath_builddir build +# $mpi will be evaluated in the loops below +%global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial} + +%build +export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" +export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" +export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H +%if %{with java} +export JAVA_HOME=/usr/lib/jvm/java +%ifarch %{arm} s390x +# getting "java.lang.OutOfMemoryError: Java heap space" during the build +export JAVA_TOOL_OPTIONS=-Xmx2048m +%endif +%ifarch %{arm} +# Likely running out of memory during build +%global _smp_ncpus_max 2 +%endif +%endif + %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ @@ -584,39 +590,24 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %cmake_build -- --output-sync %cmake_build --target DoxygenDoc -%if %{with mpich} -%global _vpath_builddir build-mpich -%_mpich_load -export CC=mpicc -export CXX=mpic++ -%cmake %{cmake_gen} \ - %{vtk_cmake_options} \ - -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ - -DVTK_USE_MPI:BOOL=ON -%cmake_build -- --output-sync -%_mpich_unload -%endif -%if %{with openmpi} -%global _vpath_builddir build-openmpi -%_openmpi_load export CC=mpicc export CXX=mpic++ -%cmake %{cmake_gen} \ - %{vtk_cmake_options} \ - -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ - -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ - -DVTK_USE_MPI:BOOL=ON -%cmake_build -- --output-sync -%_openmpi_unload -%endif +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} + #CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + %cmake %{cmake_gen} \ + %{vtk_cmake_options} \ + -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_LIBDIR:PATH=lib \ + -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ + -DCMAKE_INSTALL_QMLDIR:PATH=lib/qt5/qml \ + -DVTK_USE_MPI:BOOL=ON + %cmake_build -- --output-sync + module purge +done # Remove executable bits from sources (some of which are generated) find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ @@ -624,10 +615,9 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx -or \ %install -%global _vpath_builddir build %cmake_install -pushd build +pushd %{_vpath_builddir} # Gather list of non-java/python/qt libraries ls %{buildroot}%{_libdir}/*.so.* \ | grep -Ev '(Java|Qt|Python)' | sed -e's,^%{buildroot},,' > libs.list @@ -645,35 +635,25 @@ done # Fix up filelist paths perl -pi -e's,^,%{_bindir}/,' testing.list +# Install data +mkdir -p %{buildroot}%{_datadir}/vtkdata +cp -alL ExternalData/* %{buildroot}%{_datadir}/vtkdata/ + popd -%if %{with mpich} -%_mpich_load -%global _vpath_builddir build-mpich -%cmake_install +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} + %cmake_install -# Gather list of non-java/pythonl/qt libraries -ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \ - | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-mpich/libs.list + # Gather list of non-java/pythonl/qt libraries + ls %{buildroot}%{_libdir}/${mpi}/lib/*.so.* \ + | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > %{_vpath_builddir}/libs.list -# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) -mv %{buildroot}%{_libdir}/mpich/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-mpich -%_mpich_unload -%endif - -%if %{with openmpi} -%_openmpi_load -%global _vpath_builddir build-openmpi -%cmake_install - -# Gather list of non-java/python//qt libraries -ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \ - | grep -Ev '(Java|Python|Qt)' | sed -e's,^%{buildroot},,' > build-openmpi/libs.list - -# Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) -mv %{buildroot}%{_libdir}/openmpi/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-openmpi -%_openmpi_unload -%endif + # Move licenses since we cannot install them outside of CMAKE_INSTALL_PREFIX (MPI_HOME) + mv %{buildroot}%{_libdir}/${mpi}/share/licenses/vtk %{buildroot}%{_defaultlicensedir}/%{name}-${mpi} + module purge +done # Remove exec bit from non-scripts and %%doc for file in `find %{buildroot} -type f -perm 0755 \ @@ -687,9 +667,6 @@ find Utilities/Upgrading -type f -print0 | xargs -0 chmod -x mkdir -p _docs cp -pr --parents Wrapping/*/README* _docs/ -# Install data -mkdir -p %{buildroot}%{_datadir}/vtkdata -cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/ # Make noarch data sub-package the same on all arches # At the moment this only contains Java/Testing/Data/Baseline rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping @@ -716,7 +693,6 @@ fi $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & export DISPLAY=:99 %endif -%global _vpath_builddir build export FLEXIBLAS=netlib %ctest --verbose || : %if %{with xdummy} @@ -725,7 +701,7 @@ cat xorg.log %endif -%files -f build/libs.list +%files -f %{_vendor}-%{_target_os}-build-serial/libs.list %license %{_defaultlicensedir}/%{name}/ %doc README.md _docs/Wrapping @@ -763,7 +739,7 @@ cat xorg.log %{_libdir}/qt5/qml/* %if %{with mpich} -%files mpich -f build-mpich/libs.list +%files mpich -f %{_vendor}-%{_target_os}-build-mpich/libs.list %license %{_defaultlicensedir}/%{name}-mpich/ %doc README.md _docs/Wrapping @@ -801,7 +777,7 @@ cat xorg.log %endif %if %{with openmpi} -%files openmpi -f build-openmpi/libs.list +%files openmpi -f %{_vendor}-%{_target_os}-build-openmpi/libs.list %license %{_defaultlicensedir}/%{name}-openmpi/ %doc README.md _docs/Wrapping @@ -841,13 +817,16 @@ cat xorg.log %files data %{_datadir}/vtkdata -%files testing -f build/testing.list +%files testing -f %{_vendor}-%{_target_os}-build-serial/testing.list %files examples %doc vtk-examples/Examples %changelog +* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 +- Use loops for mpi builds/intalls + * Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 - Fix -devel deps on netcdf-*-devel From 3b88f3fa847bf8fb62b92a1ee4883ca1d6d54599 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Oct 2023 16:21:06 -0600 Subject: [PATCH 16/62] Rebuild for openslide 4.0.0 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index fb8f73c..fec52df 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -824,6 +824,9 @@ cat xorg.log %changelog +* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 +- Rebuild for openslide 4.0.0 + * Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 - Use loops for mpi builds/intalls From 6ac8d12b235b988e6dc576275227d8460f78eb69 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Nov 2023 19:44:44 -0600 Subject: [PATCH 17/62] Move API docs to separate doc sub-package (bz#2247327) --- vtk.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/vtk.spec b/vtk.spec index fec52df..6893d62 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,7 +45,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -472,6 +472,13 @@ Obsoletes: vtkdata < 6.1.0-3 %description data VTK data files for tests and examples. +%package doc +Summary: API documentation for VTK +BuildArch: noarch + +%description doc +Generated API documentation for VTK + %package testing Summary: Testing programs for VTK Requires: %{name}%{?_isa} = %{version}-%{release}, %{name}-data = %{version} @@ -716,7 +723,6 @@ cat xorg.log %{_libdir}/cmake/%{name}/ %dir %{_libdir}/%{name} %{_libdir}/%{name}/hierarchy/ -%{_docdir}/%{name}/ %files -n python%{python3_pkgversion}-vtk %{python3_sitearch}/* @@ -817,6 +823,9 @@ cat xorg.log %files data %{_datadir}/vtkdata +%files doc +%{_docdir}/%{name}/ + %files testing -f %{_vendor}-%{_target_os}-build-serial/testing.list %files examples @@ -824,6 +833,9 @@ cat xorg.log %changelog +* Thu Nov 02 2023 Philip Matura - 9.2.6-10 +- Move API docs to separate doc sub-package (bz#2247327) + * Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 - Rebuild for openslide 4.0.0 From 54bf13eec1a65103c407ccb97938350f2f5126cb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Nov 2023 19:48:44 -0600 Subject: [PATCH 18/62] No openmpi on i668 with openmpi 5 in Fedora 40+ --- vtk.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vtk.spec b/vtk.spec index 6893d62..1b1a70d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -19,8 +19,17 @@ %bcond_with openmpi %else %bcond_without mpich +# No openmpi on i668 with openmpi 5 in Fedora 40+ +%if 0%{?fedora} >= 40 +%ifarch %{ix86} +%bcond_with openmpi +%else %bcond_without openmpi %endif +%else +%bcond_without openmpi +%endif +%endif # s390x on EL8 does not have xorg-x11-drv-dummy %if 0%{?rhel} %ifarch s390x From 669f31d92649c2adbd7695111003c9a5ff3cb352 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 15:03:19 +0100 Subject: [PATCH 19/62] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 1b1a70d..ceef52c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 +- Rebuild (gdal) + * Thu Nov 02 2023 Philip Matura - 9.2.6-10 - Move API docs to separate doc sub-package (bz#2247327) From 72c3dccfc9680817ec4b78f612093dae03c1cba5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 22:45:52 +0000 Subject: [PATCH 20/62] Rebuilt for Boost 1.83 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index ceef52c..f270330 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -842,6 +842,9 @@ cat xorg.log %changelog +* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 +- Rebuilt for Boost 1.83 + * Wed Nov 15 2023 Sandro Mani - 9.2.6-11 - Rebuild (gdal) From 1a12f28665b2f24537b98fcf4b3fb3a176fa7fba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 24 Jan 2024 21:43:42 -0700 Subject: [PATCH 21/62] Drop mpi4py-mpich BR on i686 (bz#2259594) --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index f270330..cebaf62 100644 --- a/vtk.spec +++ b/vtk.spec @@ -146,7 +146,9 @@ BuildRequires: gnuplot BuildRequires: wget %if %{with mpich} BuildRequires: mpich-devel +%ifnarch %{ix86} BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich +%endif BuildRequires: netcdf-mpich-devel %endif %if %{with openmpi} @@ -842,6 +844,9 @@ cat xorg.log %changelog +* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 +- Drop mpi4py-mpich BR on i686 (bz#2259594) + * Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 - Rebuilt for Boost 1.83 From 37872b22acd365439a9a3bef050d788ac7ad48b3 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 11 Dec 2023 09:56:47 +0200 Subject: [PATCH 22/62] Reduce memory and ncpu usage The builds jobs keep restarting. We are most likely hitting OOM. Signed-off-by: David Abdurachmanov --- vtk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vtk.spec b/vtk.spec index cebaf62..ec6b1b8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -590,11 +590,11 @@ export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H %if %{with java} export JAVA_HOME=/usr/lib/jvm/java -%ifarch %{arm} s390x +%ifarch %{arm} s390x riscv64 # getting "java.lang.OutOfMemoryError: Java heap space" during the build export JAVA_TOOL_OPTIONS=-Xmx2048m %endif -%ifarch %{arm} +%ifarch %{arm} riscv64 # Likely running out of memory during build %global _smp_ncpus_max 2 %endif @@ -844,6 +844,9 @@ cat xorg.log %changelog +* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 +- Reduce memory and ncpu usage + * Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 - Drop mpi4py-mpich BR on i686 (bz#2259594) From 1a9901bfad9773c52e4f5e5761beeb59f2702b56 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 27 Feb 2024 17:13:16 -0700 Subject: [PATCH 23/62] Better changelog entry --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index ec6b1b8..688d2fe 100644 --- a/vtk.spec +++ b/vtk.spec @@ -845,7 +845,7 @@ cat xorg.log %changelog * Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 -- Reduce memory and ncpu usage +- Reduce memory and ncpu usage during riscv64 builds * Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 - Drop mpi4py-mpich BR on i686 (bz#2259594) From 3300be518ba7bb4dd6531fd059b99ae1685ea8ec Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 9 Apr 2024 21:06:59 -0600 Subject: [PATCH 24/62] Set Java source/target version to 8 (FTBFS bz#2272954) --- vtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 688d2fe..a504a97 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -559,6 +559,8 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ %if %{with java} \ -DVTK_WRAP_JAVA:BOOL=ON \\\ + -DVTK_JAVA_SOURCE_VERSION=8 \\\ + -DVTK_JAVA_TARGET_VERSION=8 \\\ -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ -DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\ -DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ @@ -844,6 +846,9 @@ cat xorg.log %changelog +* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 +- Set Java source/target version to 8 (FTBFS bz#2272954) + * Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 - Reduce memory and ncpu usage during riscv64 builds From 6e5de7889d75014601dc2c82b2993e6349cbd129 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 13 May 2024 16:35:04 +0200 Subject: [PATCH 25/62] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a504a97..9bdc581 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -846,6 +846,9 @@ cat xorg.log %changelog +* Mon May 13 2024 Sandro Mani - 9.2.6-15 +- Rebuild (gdal) + * Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 - Set Java source/target version to 8 (FTBFS bz#2272954) From e1b8d18b96f7b7cc02cfbe73af9234cc6424902e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 20 May 2024 18:07:09 -0400 Subject: [PATCH 26/62] Fix flatpak build OpenJDK is built into /app for flatpaks which need it, so provide some additional hints so that it is found during the build. --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 9bdc581..a9ea1fd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -564,6 +564,9 @@ find vtk-examples -type f | xargs chmod -R a-x -DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ -DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\ -DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ + -DJAVA_AWT_LIBRARY:PATH=$JAVA_HOME/lib/libjawt.so \\\ + -DJAVA_JNI_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\ + -DJAVA_JVM_LIBRARY:PATH=$JAVA_HOME/lib/libjava.so \\\ %else \ -DVTK_WRAP_JAVA:BOOL=OFF \\\ %endif \ @@ -591,7 +594,7 @@ export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H %if %{with java} -export JAVA_HOME=/usr/lib/jvm/java +export JAVA_HOME=%{_prefix}/lib/jvm/java %ifarch %{arm} s390x riscv64 # getting "java.lang.OutOfMemoryError: Java heap space" during the build export JAVA_TOOL_OPTIONS=-Xmx2048m From c12f2e51d4b9dd81995d6295b59f370d780b83b5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 01:40:26 +0200 Subject: [PATCH 27/62] Rebuilt for Python 3.13 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a9ea1fd..6ed13b7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -849,6 +849,9 @@ cat xorg.log %changelog +* Sat Jun 08 2024 Python Maint - 9.2.6-16 +- Rebuilt for Python 3.13 + * Mon May 13 2024 Sandro Mani - 9.2.6-15 - Rebuild (gdal) From b8259cc0a46f15974c2581b8c98a8a5ea47845e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:02:53 +0000 Subject: [PATCH 28/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 6ed13b7..dd03878 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -849,6 +849,9 @@ cat xorg.log %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 9.2.6-16 - Rebuilt for Python 3.13 From 75f31f569796fdf1f23793e97795a3ef54512f81 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 8 Oct 2024 08:00:53 -0600 Subject: [PATCH 29/62] Add upstream patch to fix segmentation fault on import with Python 3.13 (rhbz#2310520) --- vtk-python3.13.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 10 ++++- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 vtk-python3.13.patch diff --git a/vtk-python3.13.patch b/vtk-python3.13.patch new file mode 100644 index 0000000..0bea05f --- /dev/null +++ b/vtk-python3.13.patch @@ -0,0 +1,90 @@ +diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx +index 0471594..bc92c85 100644 +--- a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx ++++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx +@@ -114,7 +114,9 @@ wchar_t* vtk_Py_UTF8ToWide(const char* arg) + + return result; + } ++#endif + ++#if PY_VERSION_HEX < 0x03080000 + std::string vtk_Py_WideToUTF8(const wchar_t* arg) + { + std::string result; +@@ -859,15 +861,20 @@ void vtkPythonInterpreter::SetupVTKPythonPaths() + 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 >= 0x03000000 +- vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); ++#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 = Py_GetProgramName(); ++ vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); + #endif + } + +diff --git a/Wrapping/Python/vtkmodules/test/Testing.py b/Wrapping/Python/vtkmodules/test/Testing.py +index 59186bb..d0643c1 100644 +--- a/Wrapping/Python/vtkmodules/test/Testing.py ++++ b/Wrapping/Python/vtkmodules/test/Testing.py +@@ -513,8 +513,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. +diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx +index 927eef1..7460eb7 100644 +--- a/Wrapping/PythonCore/PyVTKNamespace.cxx ++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx +@@ -113,8 +113,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* args = PyTuple_New(1); + PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); +diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx +index e0ff31e..c89900f 100644 +--- a/Wrapping/PythonCore/PyVTKTemplate.cxx ++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx +@@ -788,8 +788,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* args = PyTuple_New(2); + PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); diff --git a/vtk.spec b/vtk.spec index dd03878..d3ce529 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 17%{?dist} +Release: 18%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -66,6 +66,10 @@ Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch # Add missing includes for gcc 13 # https://gitlab.kitware.com/vtk/vtk/-/issues/18782 Patch2: vtk-include.patch +# Fix segfault with Python 3.13 +# https://bugzilla.redhat.com/show_bug.cgi?id=2310520 +# Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 +Patch3: vtk-python3.13.patch URL: https://vtk.org/ @@ -849,6 +853,10 @@ cat xorg.log %changelog +* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 +- Add upstream patch to fix segmentation fault on import with Python 3.13 + (rhbz#2310520) + * Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3a47e405769aaef3c9d8c582480630fdfd6b1711 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:33:12 -0600 Subject: [PATCH 30/62] Rebuild for hdf5 1.14.5 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d3ce529..d0f6cff 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 18%{?dist} +Release: 19%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -853,6 +853,9 @@ cat xorg.log %changelog +* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 +- Rebuild for hdf5 1.14.5 + * Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 - Add upstream patch to fix segmentation fault on import with Python 3.13 (rhbz#2310520) From 8fa78a9f1c60ab5e6afaf68465bdafd3fb54d8cf Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 31 Oct 2024 15:18:59 -0600 Subject: [PATCH 31/62] Add missing dep to mpi-devel packages --- vtk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index d0f6cff..131ab38 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 19%{?dist} +Release: 20%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -363,6 +363,9 @@ NOTE: The version in this package has been compiled with mpich support. %package mpich-devel Summary: VTK header files for building C++ code with mpich Requires: %{name}-mpich%{?_isa} = %{version}-%{release} +%if %{with java} +Requires: %{name}-mpich-java%{?_isa} = %{version}-%{release} +%endif Requires: python%{python3_pkgversion}-%{name}-mpich%{?_isa} = %{version}-%{release} Requires: mpich-devel Requires: hdf5-mpich-devel%{?_isa} @@ -433,6 +436,9 @@ NOTE: The version in this package has been compiled with openmpi support. %package openmpi-devel Summary: VTK header files for building C++ code with openmpi Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +%if %{with java} +Requires: %{name}-openmpi-java%{?_isa} = %{version}-%{release} +%endif Requires: python%{python3_pkgversion}-%{name}-openmpi%{?_isa} = %{version}-%{release} Requires: openmpi-devel Requires: hdf5-openmpi-devel%{?_isa} @@ -853,6 +859,9 @@ cat xorg.log %changelog +* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 +- Add missing dep to mpi-devel packages + * Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 - Rebuild for hdf5 1.14.5 From cc5fea73f2c51ac0766084d1664a16732bc7b8cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 8 Nov 2024 16:10:09 +0100 Subject: [PATCH 32/62] Rebuild (gdal) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 131ab38..38939b5 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 20%{?dist} +Release: 21%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 +- Rebuild (gdal) + * Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 - Add missing dep to mpi-devel packages From 1d4c060849b5d681cc94d115595ec9b520f395c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:39:46 +0000 Subject: [PATCH 33/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 38939b5..63cc64a 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 21%{?dist} +Release: 22%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 08 2024 Sandro Mani - 9.2.6-21 - Rebuild (gdal) From 0dd36f7b889d8094789b6eea20047d364322a145 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 24 Jan 2025 11:04:59 +0100 Subject: [PATCH 34/62] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 63cc64a..6e0c5f2 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 22%{?dist} +Release: 23%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -859,6 +859,9 @@ cat xorg.log %changelog +* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 +- Rebuild (cgnslib) + * Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From eeaedd55ea0e5ff0942452fa328c494447a167cf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 26 Jan 2025 00:05:45 +0100 Subject: [PATCH 35/62] Add patch to fix FTBFS --- vtk-build.patch | 12 ++++++++++++ vtk.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 vtk-build.patch diff --git a/vtk-build.patch b/vtk-build.patch new file mode 100644 index 0000000..e1ab822 --- /dev/null +++ b/vtk-build.patch @@ -0,0 +1,12 @@ +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.spec b/vtk.spec index 6e0c5f2..56fc110 100644 --- a/vtk.spec +++ b/vtk.spec @@ -70,6 +70,8 @@ Patch2: vtk-include.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2310520 # Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 Patch3: vtk-python3.13.patch +# Fix build +Patch4: vtk-build.patch URL: https://vtk.org/ From 0d8651907257674b45b851d481aa4b407cefdbfb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 27 Jan 2025 09:15:29 +0100 Subject: [PATCH 36/62] Rebuild (cgnslib) --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 56fc110..4813c0e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 23%{?dist} +Release: 24%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 +- Rebuild (cgnslib) + * Fri Jan 24 2025 Sandro Mani - 9.2.6-23 - Rebuild (cgnslib) From 8323ad52393daacb1d1f91c8573e8ee69e302640 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Jan 2025 08:39:40 +0100 Subject: [PATCH 37/62] Rebuild for cgnslib built with scoped enums --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 4813c0e..40a1491 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 24%{?dist} +Release: 25%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 +- Rebuild for cgnslib built with scoped enums + * Mon Jan 27 2025 Sandro Mani - 9.2.6-24 - Rebuild (cgnslib) From b0f15f1891138b3022ee033bf458b3ea1db5492b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 13 Feb 2025 06:35:30 -0700 Subject: [PATCH 38/62] Rebuild with hdf5 1.14.6 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 40a1491..f6b63db 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 25%{?dist} +Release: 26%{?dist} License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,6 +861,9 @@ cat xorg.log %changelog +* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 +- Rebuild with hdf5 1.14.6 + * Tue Jan 28 2025 Sandro Mani - 9.2.6-25 - Rebuild for cgnslib built with scoped enums From e327ae003ec45b57b053161938953e217ab2e478 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 17 Feb 2025 15:33:41 -0700 Subject: [PATCH 39/62] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 757 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vtk.spec | 760 +----------------------------------------------------- 2 files changed, 759 insertions(+), 758 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cd948dd --- /dev/null +++ b/changelog @@ -0,0 +1,757 @@ +* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 +- Rebuild with hdf5 1.14.6 + +* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 +- Rebuild for cgnslib built with scoped enums + +* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 +- Rebuild (cgnslib) + +* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 +- Rebuild (cgnslib) + +* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 +- Rebuild (gdal) + +* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 +- Add missing dep to mpi-devel packages + +* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 +- Rebuild for hdf5 1.14.5 + +* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 +- Add upstream patch to fix segmentation fault on import with Python 3.13 + (rhbz#2310520) + +* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jun 08 2024 Python Maint - 9.2.6-16 +- Rebuilt for Python 3.13 + +* Mon May 13 2024 Sandro Mani - 9.2.6-15 +- Rebuild (gdal) + +* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 +- Set Java source/target version to 8 (FTBFS bz#2272954) + +* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 +- Reduce memory and ncpu usage during riscv64 builds + +* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 +- Drop mpi4py-mpich BR on i686 (bz#2259594) + +* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 +- Rebuilt for Boost 1.83 + +* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 +- Rebuild (gdal) + +* Thu Nov 02 2023 Philip Matura - 9.2.6-10 +- Move API docs to separate doc sub-package (bz#2247327) + +* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 +- Rebuild for openslide 4.0.0 + +* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 +- Use loops for mpi builds/intalls + +* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 +- Fix -devel deps on netcdf-*-devel + +* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 +- Rebuild (cgnslib) + +* Fri Jun 16 2023 Python Maint - 9.2.6-4 +- Rebuilt for Python 3.12 + +* Thu May 11 2023 Sandro Mani - 9.2.6-3 +- Rebuild (gdal) + +* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 +- Rebuilt for Boost 1.81 + +* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 +- Update to 9.2.6 + +* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 +- Update to 9.2.5 +- Use SPDX License tag + +* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 +- Rebuild (gdal) + +* Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 +- Remove all of vtkdata/Wrapping to keep vtk-data noarch + +* Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 +- Make -data subpackage arch-dependent for now due to + java removal (bz#2104109) + +* Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 +- Drop java for i686 (bz#2104109) + +* Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 +- Add patch to support netcdf 4.9.0 + +* Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 +- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) +- Link libvtkkissfft.so.1 against libm (bz#2100573) + +* Mon Jun 13 2022 Python Maint - 9.1.0-11 +- Rebuilt for Python 3.11 + +* Fri May 20 2022 Sandro Mani - 9.1.0-10 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + +* Wed May 04 2022 Thomas Rodgers - 9.1.0-9 +- Rebuilt for Boost 1.78 + +* Tue Mar 22 2022 Sandro Mani - 9.1.0-8 +- Rebuild for cgnslib-4.3.0 + +* Thu Mar 03 2022 Sandro Mani - 9.1.0-7 +- Rebuild for proj-9.0.0 + +* Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 +- Rebuild for glew 2.2 + +* Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 +- Use export CC/CXX to set MPI compiler + +* Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 +- Use %%global to define __cc/__cxx + +* Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 +- Make java-devel only be brought in by vtk-java-devel + +* Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 +- Update to 9.1.0 + +* Thu Nov 11 2021 Sandro Mani - 9.0.3-4 +- Rebuild (gdal) + +* Wed Nov 03 2021 Björn Esser - 9.0.3-3 +- Rebuild (jsoncpp) + +* Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 +- Cleanup rpath handling (bz#1902729) + +* Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 +- Update to 9.0.3 +- Add upstream patch to fix Mayavi crash (bz#1966135) + +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 +- Rebuild for hdf5 1.10.7/netcdf 4.8.0 + +* Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 +- More rpath cleanup + +* Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 +- Rebuilt for Boost 1.76 + +* Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 13 2021 Björn Esser - 9.0.2-2 +- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 + +* Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 +- Update to 9.0.2 + +* Fri Jun 04 2021 Python Maint - 9.0.1-9 +- Rebuilt for Python 3.10 + +* Fri May 21 2021 Sandro Mani - 9.0.1-8 +- Rebuild (gdal) + +* Thu May 20 2021 Richard Shaw - 9.0.1-7 +- Rebuild for gdal 3.3.0. + +* Fri May 07 2021 Sandro Mani - 9.0.1-6 +- Rebuild (gdal) + +* Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 +- Make vtk-devel package require vtk-java + +* Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 +- Add upstream patch for proj 5 support + +* Sun Mar 07 2021 Sandro Mani - 9.0.1-4 +- Rebuild (proj) + +* Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 +- Bump python3-vtk-qt obsoletes + +* Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 +- rebuild for libpq ABI fix rhbz#1908268 + +* Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 +- Update to 9.0.1 +- Disable OSMesa - conflicts with X support +- Build against Fedora gl2ps, libharu, utf8cpp +- Drop python3-vtk-qt packages +- No longer ship compiled examples +- Install jar file into /usr/share/java +- Fix JNI install location +- Drop Qt4 build option + +* Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 +- Rebuild (proj) + +* Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 +- Add patch to fix build with Qt 5.15 + +* Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + +* Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 +- Fix ExternalData in vtk-data (bz#1783622) + +* Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 +- Use new cmake macros + +* Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 Jeff Law - 8.2.0-19 +- Use __cmake_in_source_build + +* Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 +- Rebuild for hdf5 1.10.6 + +* Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 +- Drop _python_bytecompile_extra, python2 conditionals + +* Sat May 30 2020 Björn Esser - 8.2.0-15 +- Rebuild (jsoncpp) + +* Wed May 27 2020 Orion Poplawski - 8.2.0-14 +- Add patch to fix building with GCC 10 (bz#1800240) + +* Tue May 26 2020 Miro Hrončok - 8.2.0-14 +- Rebuilt for Python 3.9 + +* Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 14 2019 Björn Esser - 8.2.0-12 +- Rebuild (jsoncpp) + +* Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 +- Drop BR on sip-devel (python2) + +* Sun Sep 22 2019 Orion Poplawski - 8.2.0-10 +- Rebuild for double-conversion 3.1.5 + +* Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 +- Rebuild for proj 6.2.0 +- Add patch and flags for proj 6 support + +* Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 +- Add upstream patch to support Python 3.8 + +* Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 +- Rebuilt for Python 3.8 + +* Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 +- BR motif-devel instead of /usr/include/Xm (bugz#1731728) + +* Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 03 2019 Björn Esser - 8.2.0-4 +- Rebuild (jsoncpp) + +* Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 +- Provide starndard python 3.Y dist name (bugz#1700307) + +* Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 +- Provide standard python 3 dist name (bugz#1700307) + +* Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 +- Update to 8.2.0 +- TCL wrapping has been dropped upstream +- Build with system glew + +* Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 +- Rebuild for openmpi 3.1.3 + +* Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 +- Update to 8.1.1 (bug #1460059) +- Use Qt 5 (bug #1319504) +- Use Python 3 for Fedora 30+ (bug #1549034) + +* Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 +- rebuild against libpq (rhbz#1618698, rhbz#1623764) + +* Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Adam Williamson - 7.1.1-11 +- Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") + +* Fri Feb 09 2018 Fedora Release Engineering - 7.1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Dec 26 2017 Björn Esser - 7.1.1-9 +- Rebuilt for jsoncpp.so.20 + +* Mon Dec 18 2017 Orion Poplawski - 7.1.1-8 +- Enable mysql and postgresql support +- Use mariadb BR for F28+ (Bug #1494054) + +* Fri Sep 01 2017 Björn Esser - 7.1.1-7 +- Rebuilt for jsoncpp-1.8.3 + +* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek - 7.1.1-6 +- Python 2 binary packages renamed to python2-vtk and python2-vtk-qt + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 7.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 7.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 7.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Tue May 9 2017 Orion Poplawski - 7.1.1-2 +- Enable tests on s390x + +* Mon May 8 2017 Orion Poplawski - 7.1.1-1 +- Update to 7.1.1 + +* Sat Feb 11 2017 Fedora Release Engineering - 7.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 3 2017 Dan Horák - 7.1.0-5 +- s390x needs increased Java heap size + +* Thu Dec 29 2016 Orion Poplawski - 7.1.0-4 +- Drop setting java heap size + +* Thu Dec 8 2016 Dan Horák - 7.1.0-3 +- Enable openmpi on s390(x) +- Add missing conditions for mpich/openmpi subpackages + +* Thu Dec 8 2016 Orion Poplawski - 7.1.0-2 +- Fix MPI library install location + +* Mon Dec 5 2016 Orion Poplawski - 7.1.0-1 +- Update to 7.1.0 +- Enable OSMesa +- Build MPI versions +- Use bundled glew + +* Wed Nov 2 2016 Orion Poplawski - 6.3.0-12 +- Rebuild for R openblas changes + +* Mon Oct 03 2016 Björn Esser - 6.3.0-11 +- Rebuilt for libjsoncpp.so.11 + +* Thu Jul 28 2016 Than Ngo - 6.3.0-10 +- %%check: make non-fatal as temporary workaround for build on s390x + +* Tue Jul 19 2016 Fedora Release Engineering - 6.3.0-9 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Orion Poplawski - 6.3.0-8 +- Rebuild for hdf5 1.8.17 + +* Fri Mar 25 2016 Björn Esser - 6.3.0-7 +- Rebuilt for libjsoncpp.so.1 + +* Mon Feb 8 2016 Orion Poplawski - 6.3.0-6 +- Add patch for gcc 6 support + +* Fri Feb 05 2016 Fedora Release Engineering - 6.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Orion Poplawski - 6.3.0-4 +- Rebuild for netcdf 4.4.0 + +* Sat Jan 16 2016 Jonathan Wakely - 6.3.0-3 +- Rebuilt for Boost 1.60 + +* Wed Oct 21 2015 Orion Poplawski - 6.3.0-2 +- Note bundled libraries + +* Tue Sep 15 2015 Orion Poplawski - 6.3.0-1 +- Update to 6.3.0 + +* Thu Aug 27 2015 Jonathan Wakely - 6.2.0-10 +- Rebuilt for Boost 1.59 + +* Fri Aug 21 2015 Orion Poplawski - 6.2.0-9 +- Note bundled kwsys, remove unused kwsys files + +* Wed Jul 29 2015 Fedora Release Engineering - 6.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 6.2.0-7 +- rebuild for Boost 1.58 + +* Tue Jul 7 2015 Orion Poplawski - 6.2.0-6 +- Drop glext patch, no longer needed + +* Fri Jun 19 2015 Fedora Release Engineering - 6.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 23 2015 Orion Poplawski - 6.2.0-4 +- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) + +* Sun May 17 2015 Orion Poplawski - 6.2.0-3 +- Rebuild for hdf5 1.8.15 + +* Sat May 02 2015 Kalev Lember - 6.2.0-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Wed Mar 18 2015 Orion Poplawski - 6.2.0-1 +- Update to 6.2.0 +- Remove type, system, install, and netcdf patches applied upstream +- Integrate and replace vtkdata +- Build and run tests again +- Generate testing.list based on executable name + +* Thu Mar 05 2015 Orion Poplawski - 6.1.0-26 +- Add needed vtk-*-devel requires to vtk-devel (bug #1199310) + +* Wed Mar 04 2015 Orion Poplawski - 6.1.0-25 +- Rebuild for jsoncpp + +* Wed Feb 04 2015 Petr Machata - 6.1.0-24 +- Bump for rebuild. + +* Tue Feb 3 2015 Orion Poplawski - 6.1.0-23 +- Add patch to fix tcl library loading + +* Mon Jan 26 2015 Petr Machata - 6.1.0-22 +- Rebuild for boost 1.57.0 + +* Mon Jan 19 2015 François Cami - 6.1.0-21 +- Switch to non-explicit arch requires for now (bugs #1183210 #1183530) + +* Sat Jan 17 2015 François Cami - 6.1.0-20 +- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) + +* Thu Jan 08 2015 Orion Poplawski - 6.1.0-19 +- Rebuild for hdf5 1.8.14 +- Add patch to fix compilation error + +* Thu Nov 20 2014 Dan Horák - 6.1.0-18 +- Don't override Java memory settings on s390 (related to bug #1115920) + +* Wed Nov 19 2014 Orion Poplawski - 6.1.0-17 +- Add patch to fix compilation with mesa 10.4 (bug #1138466) + +* Fri Oct 31 2014 Orion Poplawski - 6.1.0-16 +- No longer need cmake28 on RHEL6 + +* Thu Sep 4 2014 Orion Poplawski - 6.1.0-15 +- Increase java heap space for builds (bug #1115920) + +* Mon Aug 18 2014 Fedora Release Engineering - 6.1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 10 2014 Orion Poplawski - 6.1.0-13 +- Rebuild for hdf 1.8.13 + +* Sun Jun 08 2014 Fedora Release Engineering - 6.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 5 2014 Orion Poplawski - 6.1.0-11 +- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) + +* Tue May 27 2014 Orion Poplawski - 6.1.0-10 +- Rebuild for Tcl 8.6 + +* Fri May 23 2014 Petr Machata - 6.1.0-9 +- Rebuild for boost 1.55.0 + +* Wed May 21 2014 Jaroslav Škarvada - 6.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Tue May 6 2014 Tom Callaway - 6.1.0-7 +- rebuild against R 3.1.0 (without bundled blas/lapack) + +* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 +- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) + +* Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 +- Really fix requires freetype-devel + +* Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 +- Fix requires freetype-devel + +* Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 +- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) + +* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 +- Update to 6.1.0 +- Rebase patches, drop vtkpython patch +- Disable BUILD_TESTING for now until we can provide test data + +* Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 +- Add patch to use system netcdf + +* Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 +- Add BuildRequires on blas-devel and lapack-devel + +* Sun Dec 22 2013 François Cami - 6.0.0-8 +* Rebuild for rawhide. + +* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Petr Machata - 6.0.0-6 +- Rebuild for boost 1.54.0 + +* Mon Jul 29 2013 Orion Poplawski - 6.0.0-5 +- Enable VTK_WRAP_PYTHON_SIP + +* Fri Jul 26 2013 Orion Poplawski - 6.0.0-4 +- Add patch to install vtkpython + +* Wed Jul 17 2013 Petr Pisar - 6.0.0-3 +- Perl 5.18 rebuild + +* Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 +- Install vtkMakeInstantiator files for gdcm build + +* Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 +- Add BR on R-devel + +* Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 +- Update to 6.0.0 + +* Thu May 16 2013 Orion Poplawski - 5.10.1-5 +- Rebuild for hdf5 1.8.11 + +* Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 21 2013 Adam Tkac - 5.10.1-3 +- rebuild due to "jpeg8-ABI" feature drop + +* Mon Dec 03 2012 Orion Poplawski - 5.10.1-2 +- Rebuild for hdf5 1.8.10 +- Change doc handling + +* Thu Nov 1 2012 Orion Poplawski - 5.10.1-1 +- Update to 5.10.1 + +* Sun Jul 22 2012 Fedora Release Engineering - 5.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 24 2012 Orion Poplawski - 5.10.0-2 +- Add patch to add soname to libvtkNetCDF_cxx + +* Tue May 15 2012 Orion Poplawski - 5.10.0-1 +- Update to 5.10.0 + +* Tue May 15 2012 Jonathan G. Underwood - 5.8.0-6 +- Add cmake28 usage when building for EL6 +- Disable -java build on PPC64 as it fails to build + +* Tue Feb 28 2012 Fedora Release Engineering - 5.8.0-5 +- Rebuilt for c++ ABI breakage + +* Sun Jan 8 2012 Orion Poplawski - 5.8.0-4 +- Rebuild with gcc 4.7 + +* Fri Nov 18 2011 Orion Poplawski - 5.8.0-3 +- Rebuild for hdf5 1.8.8, add explicit requires + +* Tue Nov 1 2011 Orion Poplawski - 5.8.0-2 +- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d + +* Fri Oct 7 2011 Orion Poplawski - 5.8.0-1 +- Update to 5.8.0 +- Drop version from directory names +- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir +- Drop several patches fixed upstream +- Remove rpaths from all hand installed binaries (Bug 744437) +- Don't link against OSMesa (Bug 744434) + +* Thu Jun 23 2011 Orion Poplawski - 5.6.1-10 +- Add BR qtwebkit-devel, fixes FTBS bug 715770 + +* Thu May 19 2011 Orion Poplawski - 5.6.1-9 +- Update soversion patch to add soversion to libvtkNetCDF.so + +* Mon Mar 28 2011 Orion Poplawski - 5.6.1-8 +- Rebuild for new mysql + +* Thu Mar 17 2011 Orion Poplawski - 5.6.1-7 +- Add needed requires to vtk-devel + +* Wed Mar 16 2011 Orion Poplawski - 5.6.1-6 +- Turn on boost, mysql, postgres, ogg theora, and text analysis support, + bug 688275. + +* Wed Mar 16 2011 Marek Kasik - 5.6.1-5 +- Add backslashes to VTK_INSTALL_LIB_DIR and +- VTK_INSTALL_INCLUDE_DIR (#687895) + +* Tue Mar 15 2011 Orion Poplawski - 5.6.1-4 +- Set VTK_INSTALL_LIB_DIR, fix bug 687895 + +* Fri Feb 18 2011 Orion Poplawski - 5.6.1-3 +- Add patch to support gcc 4.6 +- Add patch to make using system libraries easier +- Update pythondestdir patch to use --prefix and --root +- Use system gl2ps and libxml2 +- Use standard cmake build macro, out of tree builds +- Add patch from upstream to add sonames to libCosmo and libVPIC (bug #622840) + +* Mon Feb 07 2011 Fedora Release Engineering - 5.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Dec 7 2010 Orion Poplawski - 5.6.1-1 +- Update to 5.6.1 +- Enable qt4 support, drop qt3 support + +* Wed Oct 20 2010 Adam Jackson 5.6.0-37 +- Rebuild for new libOSMesa soname + +* Sat Jul 31 2010 David Malcolm - 5.6.0-36 +- add python 2.7 compat patch + +* Thu Jul 22 2010 David Malcolm - 5.6.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jul 5 2010 Axel Thimm - 5.6.0-34 +- Update to 5.6.0. + +* Sat Jun 6 2009 Axel Thimm - 5.4.2-30 +- Update to 5.4.2. + +* Thu Mar 12 2009 Orion Poplawski - 5.2.1-29 +- Update to 5.2.1 + +* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 +- Remove chmod on examples .so files, none are built. This needs + more attention. + +* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 +- Update to 5.2.0. + +* Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 +- Fix patch fuzz + +* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 +- Change java build dependencies from java-devel to gcj. + +* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 +- %%check || : does not work anymore. +- enable java by default. + +* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 +- fix license tag + +* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 +- Fixes for gcc 4.3 by Orion Poplawski. + +* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 +- Change BR to qt-devel to qt3-devel. + +* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 +- Update to 5.0.4. + +* Mon May 28 2007 Axel Thimm - 5.0.3-18 +- Move headers to %%{_includedir}/vtk. +- Remove executable bit from sources. + +* Mon Apr 16 2007 Axel Thimm - 5.0.3-17 +- Make java build conditional. +- Add ldconfig %%post/%%postun for java/qt subpackages. + +* Sun Apr 15 2007 Axel Thimm - 5.0.3-16 +- Remove %%ghosting pyc/pyo. + +* Wed Apr 04 2007 Paulo Roma - 5.0.3-15 +- Update to 5.0.4. +- Added support for qt4 plugin. + +* Wed Feb 7 2007 Orion Poplawski - 5.0.2-14 +- Enable Java, Qt, GL2PS, OSMESA + +* Mon Sep 11 2006 Axel Thimm - 5.0.2-13 +- Update to 5.0.2. + +* Sun Aug 6 2006 Axel Thimm - 5.0.1-12 +- cmake needs to be >= 2.0.4. + +* Fri Aug 4 2006 Axel Thimm - 5.0.1-11 +- Fix some python issues including pyo management. + +* Sun Jul 23 2006 Axel Thimm - 5.0.1-10 +- Embed feedback from bug 199405 comment 5. +- Fix some Group entries. +- Remove redundant dependencies. +- Use system libs. +- Comment specfile more. +- Change buildroot handling with CMAKE_INSTALL_PREFIX. +- Enable qt designer plugin. + +* Wed Jul 19 2006 Axel Thimm - 5.0.1-7 +- Fix some permissions for rpmlint and debuginfo. + +* Sun Jul 16 2006 Axel Thimm - 5.0.1-7 +- Remove rpath and some further rpmlint warnings. + +* Thu Jul 13 2006 Axel Thimm - 5.0.1-6 +- Update to 5.0.1. + +* Wed May 31 2006 Axel Thimm +- Update to 5.0. + +* Mon Apr 05 2004 Intrinsic Spin 2.mr +- built on a machine with a stock libGL.so + +* Sun Apr 04 2004 Intrinsic Spin +- little cleanups +- Built for FC1 + +* Sun Jan 11 2004 Intrinsic Spin +- Built against a reasonably good (according to dashboard) CVS version so-as + to get GL2PS support. +- Rearranged. Cleaned up. Added some comments. + +* Sat Jan 10 2004 Intrinsic Spin +- Blatently stole this spec file for my own nefarious purposes. +- Removed Java (for now). Merged the Python and Tcl stuff into + the main rpm. + +* Fri Dec 05 2003 Fabrice Bellet +- (See Fabrice's RPMs for any more comments --Spin) diff --git a/vtk.spec b/vtk.spec index f6b63db..8e0638e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -54,7 +54,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.2.6 -Release: 26%{?dist} +Release: %autorelease License: BSD-3-Clause Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz @@ -861,760 +861,4 @@ cat xorg.log %changelog -* Thu Feb 13 2025 Orion Poplawski - 9.2.6-26 -- Rebuild with hdf5 1.14.6 - -* Tue Jan 28 2025 Sandro Mani - 9.2.6-25 -- Rebuild for cgnslib built with scoped enums - -* Mon Jan 27 2025 Sandro Mani - 9.2.6-24 -- Rebuild (cgnslib) - -* Fri Jan 24 2025 Sandro Mani - 9.2.6-23 -- Rebuild (cgnslib) - -* Sun Jan 19 2025 Fedora Release Engineering - 9.2.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Nov 08 2024 Sandro Mani - 9.2.6-21 -- Rebuild (gdal) - -* Thu Oct 31 2024 Christoph Junghans - 9.2.6-20 -- Add missing dep to mpi-devel packages - -* Fri Oct 25 2024 Orion Poplawski - 9.2.6-19 -- Rebuild for hdf5 1.14.5 - -* Tue Oct 08 2024 Orion Poplawski - 9.2.6-18 -- Add upstream patch to fix segmentation fault on import with Python 3.13 - (rhbz#2310520) - -* Sat Jul 20 2024 Fedora Release Engineering - 9.2.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 9.2.6-16 -- Rebuilt for Python 3.13 - -* Mon May 13 2024 Sandro Mani - 9.2.6-15 -- Rebuild (gdal) - -* Wed Apr 10 2024 Orion Poplawski - 9.2.6-14 -- Set Java source/target version to 8 (FTBFS bz#2272954) - -* Sat Feb 24 2024 David Abdurachmanov - 9.2.6-13 -- Reduce memory and ncpu usage during riscv64 builds - -* Wed Jan 24 2024 Orion Poplawski - 9.2.6-12 -- Drop mpi4py-mpich BR on i686 (bz#2259594) - -* Wed Jan 17 2024 Jonathan Wakely - 9.2.6-12 -- Rebuilt for Boost 1.83 - -* Wed Nov 15 2023 Sandro Mani - 9.2.6-11 -- Rebuild (gdal) - -* Thu Nov 02 2023 Philip Matura - 9.2.6-10 -- Move API docs to separate doc sub-package (bz#2247327) - -* Wed Oct 11 2023 Orion Poplawski - 9.2.6-9 -- Rebuild for openslide 4.0.0 - -* Sun Sep 17 2023 Orion Poplawski - 9.2.6-8 -- Use loops for mpi builds/intalls - -* Sun Sep 10 2023 Orion Poplawski - 9.2.6-7 -- Fix -devel deps on netcdf-*-devel - -* Sat Jul 22 2023 Fedora Release Engineering - 9.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 06 2023 Sandro Mani - 9.2.6-5 -- Rebuild (cgnslib) - -* Fri Jun 16 2023 Python Maint - 9.2.6-4 -- Rebuilt for Python 3.12 - -* Thu May 11 2023 Sandro Mani - 9.2.6-3 -- Rebuild (gdal) - -* Mon Feb 20 2023 Jonathan Wakely - 9.2.6-2 -- Rebuilt for Boost 1.81 - -* Sun Feb 19 2023 Orion Poplawski - 9.2.6-1 -- Update to 9.2.6 - -* Sat Jan 21 2023 Fedora Release Engineering - 9.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 09 2023 Orion Poplawski - 9.2.5-1 -- Update to 9.2.5 -- Use SPDX License tag - -* Sat Nov 12 2022 Sandro Mani - 9.1.0-18 -- Rebuild (gdal) - -* Thu Jul 28 2022 Orion Poplawski - 9.1.0-17 -- Remove all of vtkdata/Wrapping to keep vtk-data noarch - -* Thu Jul 28 2022 Mamoru TASAKA - 9.1.0-16 -- Make -data subpackage arch-dependent for now due to - java removal (bz#2104109) - -* Sat Jul 23 2022 Fedora Release Engineering - 9.1.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jul 10 2022 Orion Poplawski - 9.1.0-14 -- Drop java for i686 (bz#2104109) - -* Tue Jun 28 2022 Orion Poplawski - 9.1.0-13 -- Add patch to support netcdf 4.9.0 - -* Fri Jun 24 2022 Orion Poplawski - 9.1.0-12 -- Set VTK_PYTHON_OPTIONAL_LINK=OFF (bz#1979611) -- Link libvtkkissfft.so.1 against libm (bz#2100573) - -* Mon Jun 13 2022 Python Maint - 9.1.0-11 -- Rebuilt for Python 3.11 - -* Fri May 20 2022 Sandro Mani - 9.1.0-10 -- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 - -* Wed May 04 2022 Thomas Rodgers - 9.1.0-9 -- Rebuilt for Boost 1.78 - -* Tue Mar 22 2022 Sandro Mani - 9.1.0-8 -- Rebuild for cgnslib-4.3.0 - -* Thu Mar 03 2022 Sandro Mani - 9.1.0-7 -- Rebuild for proj-9.0.0 - -* Thu Feb 10 2022 Orion Poplawski - 9.1.0-6 -- Rebuild for glew 2.2 - -* Sat Feb 05 2022 Jiri Vanek - 9.1.0-5 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 29 2022 Orion Poplawski - 9.1.0-4 -- Use export CC/CXX to set MPI compiler - -* Sat Jan 22 2022 Fedora Release Engineering - 9.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jan 20 2022 Orion Poplawski - 9.1.0-3 -- Use %%global to define __cc/__cxx - -* Fri Jan 07 2022 Orion Poplawski - 9.1.0-2 -- Make java-devel only be brought in by vtk-java-devel - -* Sun Nov 21 2021 Orion Poplawski - 9.1.0-1 -- Update to 9.1.0 - -* Thu Nov 11 2021 Sandro Mani - 9.0.3-4 -- Rebuild (gdal) - -* Wed Nov 03 2021 Björn Esser - 9.0.3-3 -- Rebuild (jsoncpp) - -* Sun Sep 26 2021 Orion Poplawski - 9.0.3-2 -- Cleanup rpath handling (bz#1902729) - -* Wed Sep 15 2021 Orion Poplawski - 9.0.3-1 -- Update to 9.0.3 -- Add upstream patch to fix Mayavi crash (bz#1966135) - -* Tue Aug 10 2021 Orion Poplawski - 9.0.2-6 -- Rebuild for hdf5 1.10.7/netcdf 4.8.0 - -* Tue Aug 10 2021 Orion Poplawski - 9.0.2-5 -- More rpath cleanup - -* Sat Aug 07 2021 Jonathan Wakely - 9.0.2-4 -- Rebuilt for Boost 1.76 - -* Fri Jul 23 2021 Fedora Release Engineering - 9.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 13 2021 Björn Esser - 9.0.2-2 -- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 - -* Thu Jul 01 2021 Orion Poplawski - 9.0.2-1 -- Update to 9.0.2 - -* Fri Jun 04 2021 Python Maint - 9.0.1-9 -- Rebuilt for Python 3.10 - -* Fri May 21 2021 Sandro Mani - 9.0.1-8 -- Rebuild (gdal) - -* Thu May 20 2021 Richard Shaw - 9.0.1-7 -- Rebuild for gdal 3.3.0. - -* Fri May 07 2021 Sandro Mani - 9.0.1-6 -- Rebuild (gdal) - -* Fri Apr 02 2021 Orion Poplawski - 9.0.1-5 -- Make vtk-devel package require vtk-java - -* Sat Mar 13 2021 Orion Poplawski - 9.0.1-4 -- Add upstream patch for proj 5 support - -* Sun Mar 07 2021 Sandro Mani - 9.0.1-4 -- Rebuild (proj) - -* Mon Feb 15 2021 Orion Poplawski - 9.0.1-3 -- Bump python3-vtk-qt obsoletes - -* Mon Feb 08 2021 Pavel Raiskup - 9.0.1-2 -- rebuild for libpq ABI fix rhbz#1908268 - -* Sat Jan 30 2021 Orion Poplawski - 9.0.1-1 -- Update to 9.0.1 -- Disable OSMesa - conflicts with X support -- Build against Fedora gl2ps, libharu, utf8cpp -- Drop python3-vtk-qt packages -- No longer ship compiled examples -- Install jar file into /usr/share/java -- Fix JNI install location -- Drop Qt4 build option - -* Wed Jan 27 2021 Fedora Release Engineering - 8.2.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 20:45:48 CET 2020 Sandro Mani - 8.2.0-25 -- Rebuild (proj) - -* Thu Sep 17 2020 Orion Poplawski - 8.2.0-24 -- Add patch to fix build with Qt 5.15 - -* Thu Aug 27 2020 Iñaki Úcar - 8.2.0-23 -- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager - -* Sun Aug 9 2020 Orion Poplawski - 8.2.0-22 -- Fix ExternalData in vtk-data (bz#1783622) - -* Tue Aug 4 2020 Orion Poplawski - 8.2.0-21 -- Use new cmake macros - -* Wed Jul 29 2020 Fedora Release Engineering - 8.2.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 24 2020 Jeff Law - 8.2.0-19 -- Use __cmake_in_source_build - -* Sat Jul 11 2020 Jiri Vanek - 8.2.0-18 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jun 25 2020 Orion Poplawski - 8.2.0-17 -- Rebuild for hdf5 1.10.6 - -* Sat Jun 20 2020 Orion Poplawski - 8.2.0-16 -- Drop _python_bytecompile_extra, python2 conditionals - -* Sat May 30 2020 Björn Esser - 8.2.0-15 -- Rebuild (jsoncpp) - -* Wed May 27 2020 Orion Poplawski - 8.2.0-14 -- Add patch to fix building with GCC 10 (bz#1800240) - -* Tue May 26 2020 Miro Hrončok - 8.2.0-14 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 8.2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 14 2019 Björn Esser - 8.2.0-12 -- Rebuild (jsoncpp) - -* Sat Nov 9 2019 Orion Poplawski - 8.2.0-11 -- Drop BR on sip-devel (python2) - -* Sun Sep 22 2019 Orion Poplawski - 8.2.0-10 -- Rebuild for double-conversion 3.1.5 - -* Mon Sep 09 2019 Orion Poplawski - 8.2.0-9 -- Rebuild for proj 6.2.0 -- Add patch and flags for proj 6 support - -* Tue Aug 20 2019 Orion Poplawski - 8.2.0-8 -- Add upstream patch to support Python 3.8 - -* Mon Aug 19 2019 Miro Hrončok - 8.2.0-7 -- Rebuilt for Python 3.8 - -* Wed Jul 31 2019 Orion Poplawski - 8.2.0-6 -- BR motif-devel instead of /usr/include/Xm (bugz#1731728) - -* Sat Jul 27 2019 Fedora Release Engineering - 8.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 03 2019 Björn Esser - 8.2.0-4 -- Rebuild (jsoncpp) - -* Thu Apr 18 2019 Orion Poplawski - 8.2.0-3 -- Provide starndard python 3.Y dist name (bugz#1700307) - -* Tue Apr 16 2019 Orion Poplawski - 8.2.0-2 -- Provide standard python 3 dist name (bugz#1700307) - -* Sat Mar 16 2019 Orion Poplawski - 8.2.0-1 -- Update to 8.2.0 -- TCL wrapping has been dropped upstream -- Build with system glew - -* Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 -- Rebuild for openmpi 3.1.3 - -* Sun Feb 03 2019 Fedora Release Engineering - 8.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 26 2018 Orion Poplawski - 8.1.1-1 -- Update to 8.1.1 (bug #1460059) -- Use Qt 5 (bug #1319504) -- Use Python 3 for Fedora 30+ (bug #1549034) - -* Thu Sep 06 2018 Pavel Raiskup - 7.1.1-13 -- rebuild against libpq (rhbz#1618698, rhbz#1623764) - -* Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Adam Williamson - 7.1.1-11 -- Rebuild to fix GCC 8 mis-compilation - See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") - -* Fri Feb 09 2018 Fedora Release Engineering - 7.1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Dec 26 2017 Björn Esser - 7.1.1-9 -- Rebuilt for jsoncpp.so.20 - -* Mon Dec 18 2017 Orion Poplawski - 7.1.1-8 -- Enable mysql and postgresql support -- Use mariadb BR for F28+ (Bug #1494054) - -* Fri Sep 01 2017 Björn Esser - 7.1.1-7 -- Rebuilt for jsoncpp-1.8.3 - -* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek - 7.1.1-6 -- Python 2 binary packages renamed to python2-vtk and python2-vtk-qt - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 7.1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 7.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 7.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Tue May 9 2017 Orion Poplawski - 7.1.1-2 -- Enable tests on s390x - -* Mon May 8 2017 Orion Poplawski - 7.1.1-1 -- Update to 7.1.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 7.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 3 2017 Dan Horák - 7.1.0-5 -- s390x needs increased Java heap size - -* Thu Dec 29 2016 Orion Poplawski - 7.1.0-4 -- Drop setting java heap size - -* Thu Dec 8 2016 Dan Horák - 7.1.0-3 -- Enable openmpi on s390(x) -- Add missing conditions for mpich/openmpi subpackages - -* Thu Dec 8 2016 Orion Poplawski - 7.1.0-2 -- Fix MPI library install location - -* Mon Dec 5 2016 Orion Poplawski - 7.1.0-1 -- Update to 7.1.0 -- Enable OSMesa -- Build MPI versions -- Use bundled glew - -* Wed Nov 2 2016 Orion Poplawski - 6.3.0-12 -- Rebuild for R openblas changes - -* Mon Oct 03 2016 Björn Esser - 6.3.0-11 -- Rebuilt for libjsoncpp.so.11 - -* Thu Jul 28 2016 Than Ngo - 6.3.0-10 -- %%check: make non-fatal as temporary workaround for build on s390x - -* Tue Jul 19 2016 Fedora Release Engineering - 6.3.0-9 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 29 2016 Orion Poplawski - 6.3.0-8 -- Rebuild for hdf5 1.8.17 - -* Fri Mar 25 2016 Björn Esser - 6.3.0-7 -- Rebuilt for libjsoncpp.so.1 - -* Mon Feb 8 2016 Orion Poplawski - 6.3.0-6 -- Add patch for gcc 6 support - -* Fri Feb 05 2016 Fedora Release Engineering - 6.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 22 2016 Orion Poplawski - 6.3.0-4 -- Rebuild for netcdf 4.4.0 - -* Sat Jan 16 2016 Jonathan Wakely - 6.3.0-3 -- Rebuilt for Boost 1.60 - -* Wed Oct 21 2015 Orion Poplawski - 6.3.0-2 -- Note bundled libraries - -* Tue Sep 15 2015 Orion Poplawski - 6.3.0-1 -- Update to 6.3.0 - -* Thu Aug 27 2015 Jonathan Wakely - 6.2.0-10 -- Rebuilt for Boost 1.59 - -* Fri Aug 21 2015 Orion Poplawski - 6.2.0-9 -- Note bundled kwsys, remove unused kwsys files - -* Wed Jul 29 2015 Fedora Release Engineering - 6.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 6.2.0-7 -- rebuild for Boost 1.58 - -* Tue Jul 7 2015 Orion Poplawski - 6.2.0-6 -- Drop glext patch, no longer needed - -* Fri Jun 19 2015 Fedora Release Engineering - 6.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 23 2015 Orion Poplawski - 6.2.0-4 -- Add requires netcdf-cxx-devel to vtk-devel (bug #1224512) - -* Sun May 17 2015 Orion Poplawski - 6.2.0-3 -- Rebuild for hdf5 1.8.15 - -* Sat May 02 2015 Kalev Lember - 6.2.0-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Wed Mar 18 2015 Orion Poplawski - 6.2.0-1 -- Update to 6.2.0 -- Remove type, system, install, and netcdf patches applied upstream -- Integrate and replace vtkdata -- Build and run tests again -- Generate testing.list based on executable name - -* Thu Mar 05 2015 Orion Poplawski - 6.1.0-26 -- Add needed vtk-*-devel requires to vtk-devel (bug #1199310) - -* Wed Mar 04 2015 Orion Poplawski - 6.1.0-25 -- Rebuild for jsoncpp - -* Wed Feb 04 2015 Petr Machata - 6.1.0-24 -- Bump for rebuild. - -* Tue Feb 3 2015 Orion Poplawski - 6.1.0-23 -- Add patch to fix tcl library loading - -* Mon Jan 26 2015 Petr Machata - 6.1.0-22 -- Rebuild for boost 1.57.0 - -* Mon Jan 19 2015 François Cami - 6.1.0-21 -- Switch to non-explicit arch requires for now (bugs #1183210 #1183530) - -* Sat Jan 17 2015 François Cami - 6.1.0-20 -- Add jsoncpp-devel and python2-devel to vtk-devel Requires (bug #1183210) - -* Thu Jan 08 2015 Orion Poplawski - 6.1.0-19 -- Rebuild for hdf5 1.8.14 -- Add patch to fix compilation error - -* Thu Nov 20 2014 Dan Horák - 6.1.0-18 -- Don't override Java memory settings on s390 (related to bug #1115920) - -* Wed Nov 19 2014 Orion Poplawski - 6.1.0-17 -- Add patch to fix compilation with mesa 10.4 (bug #1138466) - -* Fri Oct 31 2014 Orion Poplawski - 6.1.0-16 -- No longer need cmake28 on RHEL6 - -* Thu Sep 4 2014 Orion Poplawski - 6.1.0-15 -- Increase java heap space for builds (bug #1115920) - -* Mon Aug 18 2014 Fedora Release Engineering - 6.1.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jun 10 2014 Orion Poplawski - 6.1.0-13 -- Rebuild for hdf 1.8.13 - -* Sun Jun 08 2014 Fedora Release Engineering - 6.1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Orion Poplawski - 6.1.0-11 -- Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - -* Tue May 27 2014 Orion Poplawski - 6.1.0-10 -- Rebuild for Tcl 8.6 - -* Fri May 23 2014 Petr Machata - 6.1.0-9 -- Rebuild for boost 1.55.0 - -* Wed May 21 2014 Jaroslav Škarvada - 6.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Tue May 6 2014 Tom Callaway - 6.1.0-7 -- rebuild against R 3.1.0 (without bundled blas/lapack) - -* Wed Mar 26 2014 Orion Poplawski - 6.1.0-5 -- Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781) - -* Tue Jan 28 2014 Orion Poplawski - 6.1.0-4 -- Really fix requires freetype-devel - -* Mon Jan 27 2014 Orion Poplawski - 6.1.0-3 -- Fix requires freetype-devel - -* Sun Jan 26 2014 Orion Poplawski - 6.1.0-2 -- Add Requires: libfreetype-devel; libxml2-devel to vtk-devel (bug #1057924) - -* Thu Jan 23 2014 Orion Poplawski - 6.1.0-1 -- Update to 6.1.0 -- Rebase patches, drop vtkpython patch -- Disable BUILD_TESTING for now until we can provide test data - -* Fri Dec 27 2013 Orion Poplawski - 6.0.0-10 -- Add patch to use system netcdf - -* Sun Dec 22 2013 Kevin Fenzi 6.0.0-9 -- Add BuildRequires on blas-devel and lapack-devel - -* Sun Dec 22 2013 François Cami - 6.0.0-8 -* Rebuild for rawhide. - -* Sun Aug 04 2013 Fedora Release Engineering - 6.0.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 30 2013 Petr Machata - 6.0.0-6 -- Rebuild for boost 1.54.0 - -* Mon Jul 29 2013 Orion Poplawski - 6.0.0-5 -- Enable VTK_WRAP_PYTHON_SIP - -* Fri Jul 26 2013 Orion Poplawski - 6.0.0-4 -- Add patch to install vtkpython - -* Wed Jul 17 2013 Petr Pisar - 6.0.0-3 -- Perl 5.18 rebuild - -* Mon Jul 15 2013 Orion Poplawski - 6.0.0-2 -- Install vtkMakeInstantiator files for gdcm build - -* Fri Jul 12 2013 Orion Poplawski - 6.0.0-1 -- Add BR on R-devel - -* Thu Jun 27 2013 Orion Poplawski - 6.0.0-1 -- Update to 6.0.0 - -* Thu May 16 2013 Orion Poplawski - 5.10.1-5 -- Rebuild for hdf5 1.8.11 - -* Fri Feb 15 2013 Fedora Release Engineering - 5.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 5.10.1-3 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Dec 03 2012 Orion Poplawski - 5.10.1-2 -- Rebuild for hdf5 1.8.10 -- Change doc handling - -* Thu Nov 1 2012 Orion Poplawski - 5.10.1-1 -- Update to 5.10.1 - -* Sun Jul 22 2012 Fedora Release Engineering - 5.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Orion Poplawski - 5.10.0-2 -- Add patch to add soname to libvtkNetCDF_cxx - -* Tue May 15 2012 Orion Poplawski - 5.10.0-1 -- Update to 5.10.0 - -* Tue May 15 2012 Jonathan G. Underwood - 5.8.0-6 -- Add cmake28 usage when building for EL6 -- Disable -java build on PPC64 as it fails to build - -* Tue Feb 28 2012 Fedora Release Engineering - 5.8.0-5 -- Rebuilt for c++ ABI breakage - -* Sun Jan 8 2012 Orion Poplawski - 5.8.0-4 -- Rebuild with gcc 4.7 - -* Fri Nov 18 2011 Orion Poplawski - 5.8.0-3 -- Rebuild for hdf5 1.8.8, add explicit requires - -* Tue Nov 1 2011 Orion Poplawski - 5.8.0-2 -- Keep libraries in %%{_libdir}/vtk, use ld.so.conf.d - -* Fri Oct 7 2011 Orion Poplawski - 5.8.0-1 -- Update to 5.8.0 -- Drop version from directory names -- Use VTK_PYTHON_SETUP_ARGS instead of patch to set python install dir -- Drop several patches fixed upstream -- Remove rpaths from all hand installed binaries (Bug 744437) -- Don't link against OSMesa (Bug 744434) - -* Thu Jun 23 2011 Orion Poplawski - 5.6.1-10 -- Add BR qtwebkit-devel, fixes FTBS bug 715770 - -* Thu May 19 2011 Orion Poplawski - 5.6.1-9 -- Update soversion patch to add soversion to libvtkNetCDF.so - -* Mon Mar 28 2011 Orion Poplawski - 5.6.1-8 -- Rebuild for new mysql - -* Thu Mar 17 2011 Orion Poplawski - 5.6.1-7 -- Add needed requires to vtk-devel - -* Wed Mar 16 2011 Orion Poplawski - 5.6.1-6 -- Turn on boost, mysql, postgres, ogg theora, and text analysis support, - bug 688275. - -* Wed Mar 16 2011 Marek Kasik - 5.6.1-5 -- Add backslashes to VTK_INSTALL_LIB_DIR and -- VTK_INSTALL_INCLUDE_DIR (#687895) - -* Tue Mar 15 2011 Orion Poplawski - 5.6.1-4 -- Set VTK_INSTALL_LIB_DIR, fix bug 687895 - -* Fri Feb 18 2011 Orion Poplawski - 5.6.1-3 -- Add patch to support gcc 4.6 -- Add patch to make using system libraries easier -- Update pythondestdir patch to use --prefix and --root -- Use system gl2ps and libxml2 -- Use standard cmake build macro, out of tree builds -- Add patch from upstream to add sonames to libCosmo and libVPIC (bug #622840) - -* Mon Feb 07 2011 Fedora Release Engineering - 5.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Dec 7 2010 Orion Poplawski - 5.6.1-1 -- Update to 5.6.1 -- Enable qt4 support, drop qt3 support - -* Wed Oct 20 2010 Adam Jackson 5.6.0-37 -- Rebuild for new libOSMesa soname - -* Sat Jul 31 2010 David Malcolm - 5.6.0-36 -- add python 2.7 compat patch - -* Thu Jul 22 2010 David Malcolm - 5.6.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon Jul 5 2010 Axel Thimm - 5.6.0-34 -- Update to 5.6.0. - -* Sat Jun 6 2009 Axel Thimm - 5.4.2-30 -- Update to 5.4.2. - -* Thu Mar 12 2009 Orion Poplawski - 5.2.1-29 -- Update to 5.2.1 - -* Fri Mar 06 2009 Jesse Keating - 5.2.0-28 -- Remove chmod on examples .so files, none are built. This needs - more attention. - -* Sun Oct 5 2008 Axel Thimm - 5.2.0-26 -- Update to 5.2.0. - -* Wed Oct 1 2008 Orion Poplawski - 5.0.2-25 -- Fix patch fuzz - -* Mon Aug 25 2008 Axel Thimm - 5.0.4-24 -- Change java build dependencies from java-devel to gcj. - -* Sun Aug 24 2008 Axel Thimm - 5.0.4-23 -- %%check || : does not work anymore. -- enable java by default. - -* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-22 -- fix license tag - -* Sat Apr 12 2008 Axel Thimm - 5.0.4-21 -- Fixes for gcc 4.3 by Orion Poplawski. - -* Sat Apr 5 2008 Axel Thimm - 5.0.4-20 -- Change BR to qt-devel to qt3-devel. - -* Sat Feb 23 2008 Axel Thimm - 5.0.4-19 -- Update to 5.0.4. - -* Mon May 28 2007 Axel Thimm - 5.0.3-18 -- Move headers to %%{_includedir}/vtk. -- Remove executable bit from sources. - -* Mon Apr 16 2007 Axel Thimm - 5.0.3-17 -- Make java build conditional. -- Add ldconfig %%post/%%postun for java/qt subpackages. - -* Sun Apr 15 2007 Axel Thimm - 5.0.3-16 -- Remove %%ghosting pyc/pyo. - -* Wed Apr 04 2007 Paulo Roma - 5.0.3-15 -- Update to 5.0.4. -- Added support for qt4 plugin. - -* Wed Feb 7 2007 Orion Poplawski - 5.0.2-14 -- Enable Java, Qt, GL2PS, OSMESA - -* Mon Sep 11 2006 Axel Thimm - 5.0.2-13 -- Update to 5.0.2. - -* Sun Aug 6 2006 Axel Thimm - 5.0.1-12 -- cmake needs to be >= 2.0.4. - -* Fri Aug 4 2006 Axel Thimm - 5.0.1-11 -- Fix some python issues including pyo management. - -* Sun Jul 23 2006 Axel Thimm - 5.0.1-10 -- Embed feedback from bug 199405 comment 5. -- Fix some Group entries. -- Remove redundant dependencies. -- Use system libs. -- Comment specfile more. -- Change buildroot handling with CMAKE_INSTALL_PREFIX. -- Enable qt designer plugin. - -* Wed Jul 19 2006 Axel Thimm - 5.0.1-7 -- Fix some permissions for rpmlint and debuginfo. - -* Sun Jul 16 2006 Axel Thimm - 5.0.1-7 -- Remove rpath and some further rpmlint warnings. - -* Thu Jul 13 2006 Axel Thimm - 5.0.1-6 -- Update to 5.0.1. - -* Wed May 31 2006 Axel Thimm -- Update to 5.0. - -* Mon Apr 05 2004 Intrinsic Spin 2.mr -- built on a machine with a stock libGL.so - -* Sun Apr 04 2004 Intrinsic Spin -- little cleanups -- Built for FC1 - -* Sun Jan 11 2004 Intrinsic Spin -- Built against a reasonably good (according to dashboard) CVS version so-as - to get GL2PS support. -- Rearranged. Cleaned up. Added some comments. - -* Sat Jan 10 2004 Intrinsic Spin -- Blatently stole this spec file for my own nefarious purposes. -- Removed Java (for now). Merged the Python and Tcl stuff into - the main rpm. - -* Fri Dec 05 2003 Fabrice Bellet -- (See Fabrice's RPMs for any more comments --Spin) +%autochangelog From 7e5784cef9564a2521042fb9e612fb642729d0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 10:50:21 +0100 Subject: [PATCH 40/62] Rebuild (jsoncpp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser From 391628582755e24003fc7ba84f17b77499500008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 16:04:33 +0100 Subject: [PATCH 41/62] Explicitly set CMAKE_POLICY_VERSION_MINIMUM=3.5 --- vtk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vtk.spec b/vtk.spec index 8e0638e..0be0fe7 100644 --- a/vtk.spec +++ b/vtk.spec @@ -543,6 +543,7 @@ find vtk-examples -type f | xargs chmod -R a-x %global vtk_cmake_options \\\ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ -DCMAKE_INSTALL_JARDIR=share/java \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ From 00e3473c3deb552f10a0f660852897760004bf9f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sat, 1 Mar 2025 09:54:51 -0700 Subject: [PATCH 42/62] Remove obsolete FindHDF5.cmake --- vtk.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vtk.spec b/vtk.spec index 0be0fe7..bf1457f 100644 --- a/vtk.spec +++ b/vtk.spec @@ -707,6 +707,15 @@ cp -pr --parents Wrapping/*/README* _docs/ # At the moment this only contains Java/Testing/Data/Baseline rm -rf %{buildroot}%{_datadir}/vtkdata/Wrapping +# The fixed FindHDF5.cmake is patch of CMake now +rm -v %{buildroot}/%{_libdir}/cmake/%{name}/patches/99/FindHDF5.cmake +%if %{with mpich} +rm -v %{buildroot}/%{_libdir}/mpich/lib/cmake/%{name}/patches/99/FindHDF5.cmake +%endif +%if %{with openmpi} +rm -v %{buildroot}/%{_libdir}/openmpi/lib/cmake/%{name}/patches/99/FindHDF5.cmake +%endif + # https://bugzilla.redhat.com/show_bug.cgi?id=1902729 # contains the $ORIGIN runpath specifier at the wrong position in [/usr/lib64/mpich/lib:$ORIGIN:$ORIGIN/../] # 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other From aadcf0d04bc73e89fd0fed74d1c19d519912849a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:52:56 +0200 Subject: [PATCH 43/62] Rebuilt for Python 3.14 From c83770a71caded74535e6c0749236eceeba7a96d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Jun 2025 09:28:27 -0600 Subject: [PATCH 44/62] Rebuild for proj 9 --- vtk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 98fcd3a..eba6428 100644 --- a/vtk.spec +++ b/vtk.spec @@ -40,7 +40,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 9.1.0 -Release: 18%{?dist} +Release: 19%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -846,6 +846,9 @@ cat xorg.log %changelog +* Tue Jun 24 2025 Orion Poplawski - 9.1.0-19 +- Rebuild for proj 9 + * Tue Apr 25 2023 Orion Poplawski - 9.1.0-18 - Add upstream patch for CVE-2021-42521 - vtkXMLTreeReader: possible nullptr dereference (bz#2189654) From 4f9df1a1b243b9f44fdf1151e8e1d21c1431a378 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:14:52 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 95952d15da2430ef3cbd903720c6661d129774b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Jul 2025 23:24:57 +0200 Subject: [PATCH 46/62] Rebuild (gdal) From c2cd10a5d159fc1f5fa8c62a81d6c56f9175759f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 9 Aug 2025 17:10:25 -0600 Subject: [PATCH 47/62] Rebuild for libharu 2.4.5 From 62512374c5e9c636b0da132d8c43a308d4c9bdbf Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:32 +0200 Subject: [PATCH 48/62] Rebuilt for Python 3.14.0rc2 bytecode From 58a50cc16354e9abc905f82fd254e6229b0d4115 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 10 Sep 2023 15:49:50 -0600 Subject: [PATCH 49/62] Update to 9.5.0 Use %conf Enable more modules with added dependencies Builds with Qt6 Drop mpich on i686 as well Re-enable PDAL Add BR alembic-devel Drop BR motif-devel Add patch for Tk 9 support Add bootstrap conditional to build without opencascade if needed Drop CMAKE_INSTALL_QMLDIR --- .gitignore | 10 + 9616.patch | 79 ----- sources | 4 +- vtk-build.patch | 12 - vtk-chobo-cstdint.patch | 22 ++ vtk-include.patch | 11 - vtk-ppc64-no-always-inline.patch | 13 + vtk-python3.13.patch | 90 ------ vtk-tk9.patch | 489 +++++++++++++++++++++++++++++++ vtk.spec | 200 ++++++++++--- 10 files changed, 690 insertions(+), 240 deletions(-) delete mode 100644 9616.patch delete mode 100644 vtk-build.patch create mode 100644 vtk-chobo-cstdint.patch delete mode 100644 vtk-include.patch create mode 100644 vtk-ppc64-no-always-inline.patch delete mode 100644 vtk-python3.13.patch create mode 100644 vtk-tk9.patch diff --git a/.gitignore b/.gitignore index 104cc2e..2843b96 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,13 @@ vtk-5.6.0.tar.gz /VTKData-9.2.5.tar.gz /VTK-9.2.6.tar.gz /VTKData-9.2.6.tar.gz +/VTK-9.3.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 +/VTK-9.4.2.tar.gz +/VTKData-9.4.2.tar.gz +/VTK-9.5.0.tar.gz +/VTKData-9.5.0.tar.gz diff --git a/9616.patch b/9616.patch deleted file mode 100644 index 4dfd591..0000000 --- a/9616.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a2ca9a079ecc8926f6ddf7a72803340a4944e7cf Mon Sep 17 00:00:00 2001 -From: Eric Larson -Date: Tue, 11 Oct 2022 12:12:38 -0400 -Subject: [PATCH] BUG: Fix bug with vtkPlotBar.GetLookupTable() - -Also remove old nullptr assignments as they are unnecessary -when using vtkSmartPointer. ---- - .../Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx | 2 ++ - Charts/Core/vtkPlotBar.cxx | 10 +++++++--- - .../release/dev/fix-vtkPlotBar-GetLookupTable.md | 4 ++++ - 3 files changed, 13 insertions(+), 3 deletions(-) - create mode 100644 Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md - -diff --git a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -index 2d0ed46b128..919319a6b4d 100644 ---- a/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -+++ b/Charts/Core/Testing/Cxx/TestPlotBarRangeHandlesItem.cxx -@@ -88,6 +88,8 @@ int TestPlotBarRangeHandlesItem(int, char*[]) - - // Add bar plot and handles - vtkPlotBar* barPlot = vtkPlotBar::SafeDownCast(chart->AddPlot(vtkChart::BAR)); -+ // smoke test for https://gitlab.kitware.com/vtk/vtk/-/issues/18682#note_1258974 -+ barPlot->GetLookupTable(); - barPlot->SetInputData(table, "Months", "Books"); - chart->SetBarWidthFraction(1.0); - -diff --git a/Charts/Core/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx -index a68a26c0ecd..220e8199d02 100644 ---- a/Charts/Core/vtkPlotBar.cxx -+++ b/Charts/Core/vtkPlotBar.cxx -@@ -535,12 +535,11 @@ vtkStandardNewMacro(vtkPlotBar); - vtkPlotBar::vtkPlotBar() - { - this->Private = new vtkPlotBarPrivate(this); -+ // Points is not a vtkSmartPointer, so set it explicitly to nullptr - this->Points = nullptr; -- this->AutoLabels = nullptr; - this->Width = 1.0; - this->Pen->SetWidth(1.0); - this->Offset = 1.0; -- this->ColorSeries = nullptr; - this->Orientation = vtkPlotBar::VERTICAL; - this->ScalarVisibility = false; - this->EnableOpacityMapping = true; -@@ -612,6 +611,10 @@ void vtkPlotBar::GetBounds(double bounds[4], bool unscaled) - - // Get the x and y arrays (index 0 and 1 respectively) - vtkTable* table = this->Data->GetInput(); -+ if (!table) -+ { -+ return; -+ } - vtkDataArray* x = - this->UseIndexForXSeries ? nullptr : this->Data->GetInputArrayToProcess(0, table); - vtkDataArray* y = this->Data->GetInputArrayToProcess(1, table); -@@ -945,7 +948,8 @@ void vtkPlotBar::CreateDefaultLookupTable() - // rainbow - blue to red - lut->SetHueRange(0.6667, 0.0); - lut->Build(); -- double bounds[4]; -+ // set reasonable defaults in case no data has been set -+ double bounds[4] = { 0.0, 1.0, 0.0, 1.0 }; - this->GetBounds(bounds); - lut->SetRange(bounds[0], bounds[1]); - this->LookupTable = lut; -diff --git a/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md -new file mode 100644 -index 00000000000..ba6a96753ac ---- /dev/null -+++ b/Documentation/release/dev/fix-vtkPlotBar-GetLookupTable.md -@@ -0,0 +1,4 @@ -+## Fixes for vtkPlotBar.GetLookupTable -+ -+Fixes a bug where calling vtkPlotBar.GetLookupTable caused a segmentation -+fault in the case where no data had been plotted yet. --- -GitLab - diff --git a/sources b/sources index 03bdad8..942f059 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.2.6.tar.gz) = f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc -SHA512 (VTKData-9.2.6.tar.gz) = 5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 +SHA512 (VTK-9.5.0.tar.gz) = bdb110a15d99311c88d3576c4ec40ce7d0d0625f8183665aa4250cd722aba54de2e3b2e8831d767582ee2ca6526eb8c23a09536c74b7dd2992c773dbe753f063 +SHA512 (VTKData-9.5.0.tar.gz) = a6d51f4d1da644d40a7afa858f98f70f51744a092b97fb67d1f2736b3532d92aa5eb917f23461d690137119e1791a8cb8c70630af9921ba405dd375c0a6577a2 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-chobo-cstdint.patch b/vtk-chobo-cstdint.patch new file mode 100644 index 0000000..162259e --- /dev/null +++ b/vtk-chobo-cstdint.patch @@ -0,0 +1,22 @@ +diff -up VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp +--- VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600 ++++ VTK-9.3.1/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/chobo/small_vector.hpp 2025-02-17 17:08:44.231541639 -0700 +@@ -138,6 +138,7 @@ + + #include + #include ++#include + #include + + #define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0 +diff -up VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp +--- VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp.cstdint 2024-06-28 10:00:10.000000000 -0600 ++++ VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp 2025-02-17 17:08:27.992495226 -0700 +@@ -138,6 +138,7 @@ + + #include + #include ++#include + #include + + #define CHOBO_SMALL_VECTOR_ERROR_HANDLING_NONE 0 diff --git a/vtk-include.patch b/vtk-include.patch deleted file mode 100644 index 85d6e2f..0000000 --- a/vtk-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h ---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include 2023-01-05 08:51:35.000000000 -0700 -+++ VTK-9.2.5/IO/Image/vtkSEPReader.h 2023-01-17 07:43:41.988095734 -0700 -@@ -26,6 +26,7 @@ - #include "vtkNew.h" // for ivars - - #include // for std::array -+#include // for std::uint8_t - #include // for std::string - - namespace details diff --git a/vtk-ppc64-no-always-inline.patch b/vtk-ppc64-no-always-inline.patch new file mode 100644 index 0000000..9705931 --- /dev/null +++ b/vtk-ppc64-no-always-inline.patch @@ -0,0 +1,13 @@ +diff --git a/Common/Core/vtkDataArrayMeta.h b/Common/Core/vtkDataArrayMeta.h +index 602305d3ed..8c37a96891 100644 +--- a/Common/Core/vtkDataArrayMeta.h ++++ b/Common/Core/vtkDataArrayMeta.h +@@ -32,7 +32,7 @@ + #endif + + #if (defined(VTK_ALWAYS_OPTIMIZE_ARRAY_ITERATORS) || !defined(VTK_DEBUG_RANGE_ITERATORS)) && \ +- !defined(VTK_COMPILER_MSVC) ++ !defined(VTK_COMPILER_MSVC) && !defined(__PPC64__) + #define VTK_ITER_INLINE VTK_ALWAYS_INLINE + #define VTK_ITER_ASSUME VTK_ASSUME_NO_ASSERT + #define VTK_ITER_OPTIMIZE_START VTK_ALWAYS_OPTIMIZE_START diff --git a/vtk-python3.13.patch b/vtk-python3.13.patch deleted file mode 100644 index 0bea05f..0000000 --- a/vtk-python3.13.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -index 0471594..bc92c85 100644 ---- a/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -+++ b/Utilities/PythonInterpreter/vtkPythonInterpreter.cxx -@@ -114,7 +114,9 @@ wchar_t* vtk_Py_UTF8ToWide(const char* arg) - - return result; - } -+#endif - -+#if PY_VERSION_HEX < 0x03080000 - std::string vtk_Py_WideToUTF8(const wchar_t* arg) - { - std::string result; -@@ -859,15 +861,20 @@ void vtkPythonInterpreter::SetupVTKPythonPaths() - 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 >= 0x03000000 -- vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); -+#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 = Py_GetProgramName(); -+ vtklib = vtk_Py_WideToUTF8(Py_GetProgramName()); - #endif - } - -diff --git a/Wrapping/Python/vtkmodules/test/Testing.py b/Wrapping/Python/vtkmodules/test/Testing.py -index 59186bb..d0643c1 100644 ---- a/Wrapping/Python/vtkmodules/test/Testing.py -+++ b/Wrapping/Python/vtkmodules/test/Testing.py -@@ -513,8 +513,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. -diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx -index 927eef1..7460eb7 100644 ---- a/Wrapping/PythonCore/PyVTKNamespace.cxx -+++ b/Wrapping/PythonCore/PyVTKNamespace.cxx -@@ -113,8 +113,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* args = PyTuple_New(1); - PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); -diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx -index e0ff31e..c89900f 100644 ---- a/Wrapping/PythonCore/PyVTKTemplate.cxx -+++ b/Wrapping/PythonCore/PyVTKTemplate.cxx -@@ -788,8 +788,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* args = PyTuple_New(2); - PyTuple_SET_ITEM(args, 0, PyString_FromString(name)); diff --git a/vtk-tk9.patch b/vtk-tk9.patch new file mode 100644 index 0000000..895669f --- /dev/null +++ b/vtk-tk9.patch @@ -0,0 +1,489 @@ +commit b7c22497712be6751fbefe155533ae34d5e381f5 +Author: Spiros Tsalikis +Date: Thu May 22 12:30:19 2025 -0400 + + Tcl/Tk: Support version 9.0.0 + +diff --git a/Rendering/Tk/vtkTkImageViewerWidget.cxx b/Rendering/Tk/vtkTkImageViewerWidget.cxx +index 43c7a48a13..9d2c4210de 100644 +--- a/Rendering/Tk/vtkTkImageViewerWidget.cxx ++++ b/Rendering/Tk/vtkTkImageViewerWidget.cxx +@@ -23,6 +23,17 @@ + #include + #include + ++#if (TCL_MAJOR_VERSION >= 9) ++#define VTK_TCL_CONST const ++#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) ++#define VTK_TCL_CONST CONST84 ++#else ++#define VTK_TCL_CONST ++#endif ++#ifndef offsetof ++#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field)) ++#endif ++ + #define VTK_ALL_EVENTS_MASK \ + KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | \ + LeaveWindowMask | PointerMotionMask | ExposureMask | VisibilityChangeMask | FocusChangeMask | \ +@@ -32,14 +43,14 @@ + // or with the command configure. The only new one is "-rw" which allows + // the uses to set their own ImageViewer window. + static Tk_ConfigSpec vtkTkImageViewerWidgetConfigSpecs[] = { +- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400", +- Tk_Offset(struct vtkTkImageViewerWidget, Height), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400", ++ offsetof(struct vtkTkImageViewerWidget, Height), 0, nullptr }, + +- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400", +- Tk_Offset(struct vtkTkImageViewerWidget, Width), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400", ++ offsetof(struct vtkTkImageViewerWidget, Width), 0, nullptr }, + +- { TK_CONFIG_STRING, (char*)"-iv", (char*)"iv", (char*)"IV", (char*)"", +- Tk_Offset(struct vtkTkImageViewerWidget, IV), 0, nullptr }, ++ { TK_CONFIG_STRING, "-iv", "iv", "IV", "", offsetof(struct vtkTkImageViewerWidget, IV), 0, ++ nullptr }, + + { TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } + }; +@@ -56,17 +67,22 @@ extern int vtkImageViewerCommand(ClientData cd, Tcl_Interp* interp, int argc, ch + //------------------------------------------------------------------------------ + // It's possible to change with this function or in a script some + // options like width, height or the ImageViewer widget. +-int vtkTkImageViewerWidget_Configure( +- Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, int argc, char* argv[], int flags) ++#if (TCL_MAJOR_VERSION >= 9) ++int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, ++ Tcl_Size objc, Tcl_Obj* const* objv, int flags) ++#else ++int vtkTkImageViewerWidget_Configure(Tcl_Interp* interp, struct vtkTkImageViewerWidget* self, ++ int argc, VTK_TCL_CONST char* argv[], int flags) ++#endif + { + // Let Tk handle generic configure options. +- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv), ++#if (TCL_MAJOR_VERSION >= 9) ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, objc, objv, ++ (void*)self, flags) == TCL_ERROR) + #else +- argv, +-#endif ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkImageViewerWidgetConfigSpecs, argc, argv, + (char*)self, flags) == TCL_ERROR) ++#endif + { + return (TCL_ERROR); + } +@@ -89,11 +105,8 @@ int vtkTkImageViewerWidget_Configure( + // to choose the appropriate method to invoke. + extern "C" + { +- int vtkTkImageViewerWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* argv[]) ++ int vtkTkImageViewerWidget_Widget( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[]) + { + struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)clientData; + int result = TCL_OK; +@@ -106,7 +119,11 @@ extern "C" + } + + // Make sure the widget is not deleted during this function ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Preserve((ClientData)self); ++#else + Tk_Preserve((ClientData)self); ++#endif + + // Handle render call to the widget + if (strncmp(argv[1], "render", std::max(1, strlen(argv[1]))) == 0 || +@@ -137,13 +154,27 @@ extern "C" + else + { + /* Execute a configuration change */ +- result = vtkTkImageViewerWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_config[i]); ++ } ++ result = vtkTkImageViewerWidget_Configure( ++ interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY); ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_config[i]); ++ } ++ ckfree((char*)objv_config); + #else +- argv + 2, ++ result = ++ vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY); + #endif +- TK_CONFIG_ARGV_ONLY); + } + } + else if (!strcmp(argv[1], "GetImageViewer")) +@@ -165,7 +196,11 @@ extern "C" + } + + // Unlock the object so it can be deleted. ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Release((ClientData)self); ++#else + Tk_Release((ClientData)self); ++#endif + return result; + } + } +@@ -181,16 +216,10 @@ extern "C" + // * Configures this vtkTkImageViewerWidget for the given arguments + extern "C" + { +- int vtkTkImageViewerWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkTkImageViewerWidget_Cmd( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* name; ++ VTK_TCL_CONST char* name; + Tk_Window main = (Tk_Window)clientData; + Tk_Window tkwin; + struct vtkTkImageViewerWidget* self; +@@ -233,13 +262,37 @@ extern "C" + vtkTkImageViewerWidget_EventProc, (ClientData)self); + + // Configure vtkTkImageViewerWidget widget +- if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_init[i]); ++ } ++ ++ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR) ++ { ++ // Clean up before error return ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); ++ ++ Tk_DestroyWindow(tkwin); ++ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); ++ return TCL_ERROR; ++ } ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); + #else +- argv + 2, +-#endif +- 0) == TCL_ERROR) ++ if (vtkTkImageViewerWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR) + { + Tk_DestroyWindow(tkwin); + Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); +@@ -247,6 +300,7 @@ extern "C" + // free(self); + return TCL_ERROR; + } ++#endif + + Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr); + return TCL_OK; +@@ -255,7 +309,11 @@ extern "C" + + extern "C" + { ++#if (TCL_MAJOR_VERSION >= 9) ++ void vtkTkImageViewerWidget_Destroy(void* memPtr) ++#else + void vtkTkImageViewerWidget_Destroy(char* memPtr) ++#endif + { + struct vtkTkImageViewerWidget* self = (struct vtkTkImageViewerWidget*)memPtr; + +diff --git a/Rendering/Tk/vtkTkRenderWidget.cxx b/Rendering/Tk/vtkTkRenderWidget.cxx +index 6ddaa5816a..84c940b484 100644 +--- a/Rendering/Tk/vtkTkRenderWidget.cxx ++++ b/Rendering/Tk/vtkTkRenderWidget.cxx +@@ -29,6 +29,17 @@ + #include + #include + ++#if (TCL_MAJOR_VERSION >= 9) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 6)) ++#define VTK_TCL_CONST const ++#elif ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) ++#define VTK_TCL_CONST CONST84 ++#else ++#define VTK_TCL_CONST ++#endif ++#ifndef offsetof ++#define offsetof(type, field) ((size_t)((char*)&((type*)0)->field)) ++#endif ++ + // Silence warning like + // "dereferencing type-punned pointer will break strict-aliasing rules" + // it happens because this kind of expression: (long *)&ptr +@@ -45,14 +56,13 @@ + // or with the command configure. The only new one is "-rw" which allows + // the uses to set their own render window. + static Tk_ConfigSpec vtkTkRenderWidgetConfigSpecs[] = { +- { TK_CONFIG_PIXELS, (char*)"-height", (char*)"height", (char*)"Height", (char*)"400", +- Tk_Offset(struct vtkTkRenderWidget, Height), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-height", "height", "Height", "400", ++ offsetof(struct vtkTkRenderWidget, Height), 0, nullptr }, + +- { TK_CONFIG_PIXELS, (char*)"-width", (char*)"width", (char*)"Width", (char*)"400", +- Tk_Offset(struct vtkTkRenderWidget, Width), 0, nullptr }, ++ { TK_CONFIG_PIXELS, "-width", "width", "Width", "400", offsetof(struct vtkTkRenderWidget, Width), ++ 0, nullptr }, + +- { TK_CONFIG_STRING, (char*)"-rw", (char*)"rw", (char*)"RW", (char*)"", +- Tk_Offset(struct vtkTkRenderWidget, RW), 0, nullptr }, ++ { TK_CONFIG_STRING, "-rw", "rw", "RW", "", offsetof(struct vtkTkRenderWidget, RW), 0, nullptr }, + + { TK_CONFIG_END, nullptr, nullptr, nullptr, nullptr, 0, 0, nullptr } + }; +@@ -113,11 +123,8 @@ extern "C" + #define VTKIMAGEDATATOTKPHOTO_CORONAL 0 + #define VTKIMAGEDATATOTKPHOTO_SAGITTAL 1 + #define VTKIMAGEDATATOTKPHOTO_TRANSVERSE 2 +- int vtkImageDataToTkPhoto_Cmd(ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkImageDataToTkPhoto_Cmd( ++ ClientData vtkNotUsed(clientData), Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { + int status = 0; + vtkImageData* image; +@@ -330,8 +337,14 @@ extern "C" + block.offset[3] = 3; + break; + } ++#if (TCL_MAJOR_VERSION >= 9) ++ Tk_PhotoSetSize(interp, photo, block.width, block.height); ++ Tk_PhotoPutBlock( ++ interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET); ++#else + Tk_PhotoSetSize(photo, block.width, block.height); + Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height); ++#endif + return TCL_OK; + } + } +@@ -339,17 +352,22 @@ extern "C" + //------------------------------------------------------------------------------ + // It's possible to change with this function or in a script some + // options like width, height or the render widget. +-int vtkTkRenderWidget_Configure( +- Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc, char* argv[], int flags) ++#if (TCL_MAJOR_VERSION >= 9) ++int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, Tcl_Size objc, ++ Tcl_Obj* const* objv, int flags) ++#else ++int vtkTkRenderWidget_Configure(Tcl_Interp* interp, struct vtkTkRenderWidget* self, int argc, ++ VTK_TCL_CONST char* argv[], int flags) ++#endif + { + // Let Tk handle generic configure options. +- if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv), ++#if (TCL_MAJOR_VERSION >= 9) ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, objc, objv, (void*)self, ++ flags) == TCL_ERROR) + #else +- argv, ++ if (Tk_ConfigureWidget(interp, self->TkWin, vtkTkRenderWidgetConfigSpecs, argc, argv, (char*)self, ++ flags) == TCL_ERROR) + #endif +- (char*)self, flags) == TCL_ERROR) + { + return (TCL_ERROR); + } +@@ -372,11 +390,8 @@ int vtkTkRenderWidget_Configure( + // to choose the appropriate method to invoke. + extern "C" + { +- int vtkTkRenderWidget_Widget(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* argv[]) ++ int vtkTkRenderWidget_Widget( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char* argv[]) + { + struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)clientData; + int result = TCL_OK; +@@ -389,7 +404,11 @@ extern "C" + } + + // Make sure the widget is not deleted during this function ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Preserve((ClientData)self); ++#else + Tk_Preserve((ClientData)self); ++#endif + + // Handle render call to the widget + if (strncmp(argv[1], "render", std::max(1, strlen(argv[1]))) == 0 || +@@ -420,13 +439,26 @@ extern "C" + else + { + /* Execute a configuration change */ +- result = vtkTkRenderWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_config = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_config[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_config[i]); ++ } ++ result = ++ vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_config, TK_CONFIG_ARGV_ONLY); ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_config[i]); ++ } ++ ckfree((char*)objv_config); + #else +- argv + 2, ++ result = vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, TK_CONFIG_ARGV_ONLY); + #endif +- TK_CONFIG_ARGV_ONLY); + } + } + else if (!strcmp(argv[1], "GetRenderWindow")) +@@ -448,7 +480,11 @@ extern "C" + } + + // Unlock the object so it can be deleted. ++#if (TCL_MAJOR_VERSION >= 9) ++ Tcl_Release((ClientData)self); ++#else + Tk_Release((ClientData)self); ++#endif + return result; + } + } +@@ -464,16 +500,10 @@ extern "C" + // * Configures this vtkTkRenderWidget for the given arguments + extern "C" + { +- int vtkTkRenderWidget_Cmd(ClientData clientData, Tcl_Interp* interp, int argc, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char** argv) ++ int vtkTkRenderWidget_Cmd( ++ ClientData clientData, Tcl_Interp* interp, int argc, VTK_TCL_CONST char** argv) + { +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- CONST84 +-#endif +- char* name; ++ VTK_TCL_CONST char* name; + Tk_Window main = (Tk_Window)clientData; + Tk_Window tkwin; + struct vtkTkRenderWidget* self; +@@ -515,13 +545,37 @@ extern "C" + tkwin, ExposureMask | StructureNotifyMask, vtkTkRenderWidget_EventProc, (ClientData)self); + + // Configure vtkTkRenderWidget widget +- if (vtkTkRenderWidget_Configure(interp, self, argc - 2, +-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) +- const_cast(argv + 2), ++#if (TCL_MAJOR_VERSION >= 9) ++ // Convert string arguments to Tcl_Obj for TCL 9.0 ++ Tcl_Obj** objv_init = (Tcl_Obj**)ckalloc((argc - 2) * sizeof(Tcl_Obj*)); ++ for (int i = 0; i < argc - 2; i++) ++ { ++ objv_init[i] = Tcl_NewStringObj(argv[i + 2], -1); ++ Tcl_IncrRefCount(objv_init[i]); ++ } ++ ++ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, objv_init, 0) == TCL_ERROR) ++ { ++ // Clean up before error return ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); ++ ++ Tk_DestroyWindow(tkwin); ++ Tcl_DeleteCommand(interp, (char*)"vtkTkImageViewerWidget"); ++ return TCL_ERROR; ++ } ++ ++ // Clean up the Tcl_Obj array ++ for (int i = 0; i < argc - 2; i++) ++ { ++ Tcl_DecrRefCount(objv_init[i]); ++ } ++ ckfree((char*)objv_init); + #else +- argv + 2, +-#endif +- 0) == TCL_ERROR) ++ if (vtkTkRenderWidget_Configure(interp, self, argc - 2, argv + 2, 0) == TCL_ERROR) + { + Tk_DestroyWindow(tkwin); + Tcl_DeleteCommand(interp, "vtkTkRenderWidget"); +@@ -529,6 +583,7 @@ extern "C" + // free(self); + return TCL_ERROR; + } ++#endif + + Tcl_AppendResult(interp, Tk_PathName(tkwin), nullptr); + return TCL_OK; +@@ -555,7 +610,11 @@ extern "C" + + extern "C" + { ++#if (TCL_MAJOR_VERSION >= 9) ++ void vtkTkRenderWidget_Destroy(void* memPtr) ++#else + void vtkTkRenderWidget_Destroy(char* memPtr) ++#endif + { + struct vtkTkRenderWidget* self = (struct vtkTkRenderWidget*)memPtr; + diff --git a/vtk.spec b/vtk.spec index bf1457f..75cf6bd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -5,6 +5,9 @@ # '_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits@@LLVM_11' %global _lto_cflags %{nil} +# There is a circular dep with opencascade +%bcond bootstrap 0 + # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired %bcond_with OSMesa @@ -18,15 +21,18 @@ %bcond_with mpich %bcond_with openmpi %else -%bcond_without mpich # No openmpi on i668 with openmpi 5 in Fedora 40+ +# No mpi4py on i686 %if 0%{?fedora} >= 40 %ifarch %{ix86} +%bcond_with mpich %bcond_with openmpi %else +%bcond_without mpich %bcond_without openmpi %endif %else +%bcond_without mpich %bcond_without openmpi %endif %endif @@ -45,33 +51,35 @@ %bcond_without flexiblas %endif +# Try disabling LTO on ppc64le +%ifarch ppc64le +%global _lto_cflags %{nil} +%endif + # VTK currently is carrying local modifications to gl2ps %bcond_with gl2ps -# VTK currently requires unreleased fmt 8.1.0 -%bcond_with fmt +%bcond_without fmt + +#global rc rc2 Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.2.6 +Version: 9.5.0%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause -Source0: https://www.vtk.org/files/release/9.2/VTK-%{version}.tar.gz -Source1: https://www.vtk.org/files/release/9.2/VTKData-%{version}.tar.gz +%global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} +Source0: https://www.vtk.org/files/release/9.5/VTK-%{srcver}.tar.gz +Source1: https://www.vtk.org/files/release/9.5/VTKData-%{srcver}.tar.gz Source2: xorg.conf # Patch required libharu version (Fedora 33+ contains the needed VTK patches) -Patch0: vtk-libharu.patch -# Fix issue with Mayavi -Patch1: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9616.patch -# Add missing includes for gcc 13 -# https://gitlab.kitware.com/vtk/vtk/-/issues/18782 -Patch2: vtk-include.patch -# Fix segfault with Python 3.13 -# https://bugzilla.redhat.com/show_bug.cgi?id=2310520 -# Backport of https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11486 -Patch3: vtk-python3.13.patch -# Fix build -Patch4: vtk-build.patch +Patch: vtk-libharu.patch +# Tk 9.0 - based on b7c22497712be6751fbefe155533ae34d5e381f5 +Patch: vtk-tk9.patch +# always_inline fails on ppc64le +# https://gitlab.kitware.com/vtk/vtk/-/issues/19622 +# https://bugzilla.redhat.com/show_bug.cgi?id=2386242 +Patch: vtk-ppc64-no-always-inline.patch URL: https://vtk.org/ @@ -86,6 +94,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 @@ -98,15 +107,17 @@ BuildRequires: cli11-devel BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: expat-devel +BuildRequires: fast_float-devel +BuildRequires: ffmpeg-free-devel %if %{with fmt} BuildRequires: fmt-devel >= 8.1.0 %endif +BuildRequires: freeglut-devel BuildRequires: freetype-devel BuildRequires: gdal-devel %if %{with gl2ps} BuildRequires: gl2ps-devel %endif -BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: json-devel BuildRequires: jsoncpp-devel @@ -115,10 +126,12 @@ BuildRequires: libGL-devel BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libICE-devel BuildRequires: libjpeg-devel +BuildRequires: liblas-devel BuildRequires: libpng-devel BuildRequires: libpq-devel BuildRequires: libtheora-devel BuildRequires: libtiff-devel +BuildRequires: libxkbcommon-devel BuildRequires: libxml2-devel BuildRequires: libX11-devel BuildRequires: libXcursor-devel @@ -127,23 +140,29 @@ BuildRequires: libXt-devel BuildRequires: lz4-devel BuildRequires: mariadb-connector-c-devel %{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel} -BuildRequires: motif-devel BuildRequires: netcdf-cxx-devel +%if %{without bootstrap} +BuildRequires: opencascade-devel +%endif BuildRequires: openslide-devel +# Currently does not provide OpenVDBConfig.cmake +#BuildRequires: openvdb-devel +BuildRequires: openvr-devel +BuildRequires: openxr-devel +BuildRequires: PDAL-devel BuildRequires: PEGTL-devel BuildRequires: proj-devel BuildRequires: pugixml-devel BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-qt5 -BuildRequires: cmake(Qt5) -BuildRequires: cmake(Qt5UiPlugin) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: qt5-qtwebkit-devel +BuildRequires: cmake(Qt6UiPlugin) +BuildRequires: cmake(Qt6Quick) BuildRequires: R-devel BuildRequires: sqlite-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: unixODBC-devel BuildRequires: utf8cpp-devel +BuildRequires: zfp-devel BuildRequires: zlib-devel BuildRequires: chrpath BuildRequires: doxygen @@ -187,15 +206,18 @@ Requires: double-conversion-devel%{?_isa} \ # eigen3 is noarch and header-only \ Requires: eigen3-static \ Requires: expat-devel%{?_isa} \ +# fast_float is noarch and header-only \ +Requires: fast_float-devel \ +Requires: ffmpeg-free-devel%{?_isa} \ %if %{with fmt} \ Requires: fmt-devel%{?_isa} \ %endif \ +Requires: freeglut-devel%{?_isa} \ Requires: freetype-devel%{?_isa} \ 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} \ @@ -203,11 +225,13 @@ Requires: libarchive-devel%{?_isa} \ Requires: libGL-devel%{?_isa} \ Requires: libharu-devel%{?_isa} >= 2.3.0-9 \ Requires: libjpeg-devel%{?_isa} \ +Requires: liblas-devel%{?_isa} \ Requires: libogg-devel%{?_isa} \ Requires: libpng-devel%{?_isa} \ Requires: libpq-devel%{?_isa} \ Requires: libtheora-devel%{?_isa} \ Requires: libtiff-devel%{?_isa} \ +Requires: libxkbcommon-devel%{?_isa} \ Requires: libxml2-devel%{?_isa} \ Requires: libX11-devel%{?_isa} \ Requires: libXcursor-devel%{?_isa} \ @@ -219,18 +243,27 @@ Requires: mariadb-connector-c-devel%{?_isa} \ Requires: mesa-libOSMesa-devel%{?_isa} \ %endif \ Requires: netcdf-cxx-devel%{?_isa} \ +%if %{without bootstrap} \ +Requires: opencascade-devel%{?_isa} \ +%endif \ Requires: openslide-devel%{?_isa} \ +#Requires: openvdb-devel%{?_isa} \ +Requires: openvr-devel%{?_isa} \ +Requires: openxr-devel%{?_isa} \ +Requires: PDAL-devel%{?_isa} \ Requires: PEGTL-devel%{?_isa} \ Requires: proj-devel%{?_isa} \ Requires: pugixml-devel%{?_isa} \ # bz #1183210 + #1183530 \ Requires: python%{python3_pkgversion}-devel \ Requires: sqlite-devel%{?_isa} \ -Requires: cmake(Qt5) \ -Requires: cmake(Qt5UiPlugin) \ -Requires: cmake(Qt5X11Extras) \ -Requires: qt5-qtwebkit-devel%{?_isa} \ +Requires: cmake(Qt6) \ +Requires: cmake(Qt6Core5Compat) \ +Requires: cmake(Qt6Quick) \ +Requires: cmake(Qt6UiPlugin) \ +Requires: unixODBC-devel%{?_isa} \ Requires: utf8cpp-devel \ +Requires: zfp-devel%{?_isa} \ Requires: zlib-devel%{?_isa} \ # Bundled KWSys @@ -255,6 +288,7 @@ Provides: bundled(kwsys-systemtools) Provides: bundled(diy2) Provides: bundled(exodusII) = 2.0.0 Provides: bundled(exprtk) = 2.71 +Provides: bundled(fides) %if !%{with fmt} Provides: bundled(fmt) = 8.1.0 %endif @@ -262,10 +296,17 @@ Provides: bundled(ftgl) = 1.32 %if !%{with gl2ps} Provides: bundled(gl2ps) = 1.4.0 %endif -Provides: bundled(ioss) = 20210512 +Provides: bundled(h5part) = 1.6.6 +Provides: bundled(ioss) = 20221014 +Provides: bundled(itlib-small-vector) = 1.0.4 Provides: bundled(kissfft) +Provides: bundled(loguru) = 2.1 Provides: bundled(metaio) +Provides: bundled(scn) = 4.0.0 +# kitware library https://gitlab.kitware.com/utils/token +Provides: bundled(token) = 23.09 Provides: bundled(verdict) = 1.4.0 +Provides: bundled(viskores) = 1.0.0 Provides: bundled(vpic) Provides: bundled(xdmf2) = 2.1 Provides: bundled(xdmf3) @@ -520,18 +561,36 @@ programming languages. %prep -%autosetup -p1 -b 1 -n VTK-%{version} +%autosetup -p1 -b 1 -n VTK-%{srcver} # Remove included thirdparty sources just to be sure +# ls VTK-*/ThirdParty/*/vtk* -dl | grep ^d # TODO - diy2 - not yet packaged # TODO - exodusII - not yet packaged +# TODO - exprtk - not yet packaged +# TODO - fides - not yet packaged +# TODO - h5part - not yet packaged +# TODO - ioss - not yet packaged +# TODO - kissfft - not yet packaged +# TODO - loguru - not yet packaged +# TODO - scn - not yet packaged # TODO - verdict - not yet packaged +# TODO - viskores - not yet packaged # TODO - VPIC - not yet packaged # TODO - xdmf2 - not yet packaged # TODO - xdmf3 - not yet packaged -for x in vtk{cli11,doubleconversion,eigen,expat,%{?with_fmt:fmt,}freetype,%{?with_gl2ps:gl2ps,}glew,hdf5,jpeg,jsoncpp,libharu,libproj,libxml2,lz4,lzma,mpi4py,netcdf,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,zlib} do rm -r ThirdParty/*/${x} done +%ifarch %{ix86} +rm -r ThirdParty/xdmf3 +%endif + +# 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 @@ -541,7 +600,11 @@ mkdir vtk-examples cp -a Examples vtk-examples find vtk-examples -type f | xargs chmod -R a-x - +# Requires OpenTURNS which is not packaged +# -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS:STRING=YES +# fides and ADIOS2 require ADIOS2 which is not packaged +# ZSpace is Windows only, but is getting enabled anyway +# Xdmf3 fails on i686 - https://gitlab.kitware.com/vtk/vtk/-/issues/19402 %global vtk_cmake_options \\\ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ -DCMAKE_INSTALL_DOCDIR=share/doc/%{name} \\\ @@ -549,7 +612,6 @@ find vtk-examples -type f | xargs chmod -R a-x -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_JNILIBDIR:PATH=%{_lib}/%{name} \\\ -DCMAKE_INSTALL_LICENSEDIR:PATH=share/licenses/%{name} \\\ - -DCMAKE_INSTALL_QMLDIR:PATH=%{_lib}/qt5/qml \\\ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\ -DVTK_VERSIONED_INSTALL:BOOL=OFF \\\ -DVTK_GROUP_ENABLE_Imaging:STRING=YES \\\ @@ -558,15 +620,34 @@ find vtk-examples -type f | xargs chmod -R a-x -DVTK_GROUP_ENABLE_StandAlone:STRING=YES \\\ -DVTK_GROUP_ENABLE_Views:STRING=YES \\\ -DVTK_GROUP_ENABLE_Web:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_GeovisGDAL:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelVerdict:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_InfovisBoost:STRING=YES \\\ -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms:STRING=YES \\\ +%if %{with bootstrap} \ + -DVTK_MODULE_ENABLE_VTK_IOOCCT:STRING=NO \\\ +%endif \ + -DVTK_MODULE_ENABLE_VTK_IOFDS:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOH5part:STRING=YES \\\ + -DVTK_MODULE_ENABLE_VTK_IOH5Rage:STRING=YES \\\ -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_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 \\\ - -DVTK_PYTHON_VERSION=3 \\\ %if %{with OSMesa} \ -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ %endif \ @@ -585,6 +666,12 @@ find vtk-examples -type f | xargs chmod -R a-x %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ -DVTK_USE_EXTERNAL=ON \\\ + -DVTK_BUILD_ALL_MODULES=ON \\\ + -DVTK_ENABLE_OSPRAY:BOOL=OFF \\\ + -DVTK_MODULE_ENABLE_VTK_fides:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_IOADIOS2:STRING=NO \\\ + -DVTK_MODULE_ENABLE_VTK_IOOpenVDB:STRING=NO \\\ %if !%{with fmt} \ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF \\\ %endif \ @@ -593,16 +680,18 @@ 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_scn:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_vtkviskores:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} -# https://gitlab.kitware.com/cmake/cmake/issues/17223 -#-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL:STRING=YES \\\ # $mpi will be evaluated in the loops below %global _vpath_builddir %{_vendor}-%{_target_os}-build-${mpi:-serial} -%build + +%conf export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T" export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @@ -618,29 +707,41 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif %endif + %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DVTK_BUILD_DOCUMENTATION:BOOL=ON \ -DVTK_BUILD_EXAMPLES:BOOL=ON \ -DVTK_BUILD_TESTING:BOOL=ON -%cmake_build -- --output-sync -%cmake_build --target DoxygenDoc + #-DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics:STRING=YES \ + export CC=mpicc export CXX=mpic++ for mpi in %{mpi_list} do module load mpi/$mpi-%{_arch} - #CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + # CMAKE_INSTALL_LIBDIR -> ARCHIVE_DESTINATION must not be an absolute path + # VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics need MPI modules at the moment %cmake %{cmake_gen} \ %{vtk_cmake_options} \ -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -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 + + +%build +%cmake_build -- --output-sync +%cmake_build --target DoxygenDoc +for mpi in %{mpi_list} +do + module load mpi/$mpi-%{_arch} %cmake_build -- --output-sync module purge done @@ -749,6 +850,8 @@ cat xorg.log %files -f %{_vendor}-%{_target_os}-build-serial/libs.list %license %{_defaultlicensedir}/%{name}/ %doc README.md _docs/Wrapping +%{_datadir}/vr_actions/ +%{_datadir}/xr_actions/ %files devel %doc Utilities/Upgrading @@ -756,6 +859,8 @@ cat xorg.log %{_bindir}/vtkProbeOpenGLVersion %{_bindir}/vtkWrapHierarchy %{_bindir}/vtkWrapJava +%{_bindir}/vtkWrapSerDes + %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/cmake/%{name}/ @@ -780,18 +885,20 @@ cat xorg.log %files qt %{_libdir}/lib*Qt*.so.* %exclude %{_libdir}/*Python*.so.* -%{_libdir}/qt5/qml/* %if %{with mpich} %files mpich -f %{_vendor}-%{_target_os}-build-mpich/libs.list %license %{_defaultlicensedir}/%{name}-mpich/ %doc README.md _docs/Wrapping +%{_libdir}/mpich/share/vr_actions/ +%{_libdir}/mpich/share/xr_actions/ %files mpich-devel %{_libdir}/mpich/bin/vtkParseJava %{_libdir}/mpich/bin/vtkProbeOpenGLVersion %{_libdir}/mpich/bin/vtkWrapHierarchy %{_libdir}/mpich/bin/vtkWrapJava +%{_libdir}/mpich/bin/vtkWrapSerDes %{_libdir}/mpich/include/ %{_libdir}/mpich/lib/*.so %{_libdir}/mpich/lib/cmake/ @@ -817,19 +924,21 @@ cat xorg.log %files mpich-qt %{_libdir}/mpich/lib/lib*Qt*.so.* %exclude %{_libdir}/mpich/lib/*Python*.so.* -%{_libdir}/mpich/lib/qt5/ %endif %if %{with openmpi} %files openmpi -f %{_vendor}-%{_target_os}-build-openmpi/libs.list %license %{_defaultlicensedir}/%{name}-openmpi/ %doc README.md _docs/Wrapping +%{_libdir}/openmpi/share/vr_actions/ +%{_libdir}/openmpi/share/xr_actions/ %files openmpi-devel %{_libdir}/openmpi/bin/vtkParseJava %{_libdir}/openmpi/bin/vtkProbeOpenGLVersion %{_libdir}/openmpi/bin/vtkWrapHierarchy %{_libdir}/openmpi/bin/vtkWrapJava +%{_libdir}/openmpi/bin/vtkWrapSerDes %{_libdir}/openmpi/include/ %{_libdir}/openmpi/lib/*.so %{_libdir}/openmpi/lib/cmake/ @@ -855,7 +964,6 @@ cat xorg.log %files openmpi-qt %{_libdir}/openmpi/lib/lib*Qt*.so.* %exclude %{_libdir}/openmpi/lib/*Python*.so.* -%{_libdir}/openmpi/lib/qt5/ %endif %files data From 1352cd40076afc27720028fbc0dad6ef11e5220f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 07:48:02 -0600 Subject: [PATCH 50/62] Bootstrap build for netcdf 4.9.3 soname bump --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 75cf6bd..36e00b4 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 065c5ad5e83050113ad2e5403d525efd286e522b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 21:41:37 -0600 Subject: [PATCH 51/62] Disable bootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 36e00b4..75cf6bd 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From b806dc837ab56b9e696cebda61ea5631bc898ce5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Aug 2025 21:58:04 -0600 Subject: [PATCH 52/62] Skip tests on s390x - timeouts take too long --- vtk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vtk.spec b/vtk.spec index 75cf6bd..2f2c216 100644 --- a/vtk.spec +++ b/vtk.spec @@ -828,6 +828,8 @@ rm -v %{buildroot}/%{_libdir}/openmpi/lib/cmake/%{name}/patches/99/FindHDF5.cmak export QA_RPATHS=18 +# Test take a very long time on s390x because many tests hit the default 25 minute timeout +%ifnarch s390x %check cp %SOURCE2 . %if %{with xdummy} @@ -845,6 +847,7 @@ export FLEXIBLAS=netlib kill %1 || : cat xorg.log %endif +%endif %files -f %{_vendor}-%{_target_os}-build-serial/libs.list From 6f18ecf3bf1034e5c08b6895064135822715c41c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 28 Aug 2025 22:07:11 -0600 Subject: [PATCH 53/62] Update to 9.5.1 --- .gitignore | 2 ++ sources | 4 ++-- vtk.spec | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2843b96..c0c6d78 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ vtk-5.6.0.tar.gz /VTKData-9.4.2.tar.gz /VTK-9.5.0.tar.gz /VTKData-9.5.0.tar.gz +/VTK-9.5.1.tar.gz +/VTKData-9.5.1.tar.gz diff --git a/sources b/sources index 942f059..f369061 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.5.0.tar.gz) = bdb110a15d99311c88d3576c4ec40ce7d0d0625f8183665aa4250cd722aba54de2e3b2e8831d767582ee2ca6526eb8c23a09536c74b7dd2992c773dbe753f063 -SHA512 (VTKData-9.5.0.tar.gz) = a6d51f4d1da644d40a7afa858f98f70f51744a092b97fb67d1f2736b3532d92aa5eb917f23461d690137119e1791a8cb8c70630af9921ba405dd375c0a6577a2 +SHA512 (VTK-9.5.1.tar.gz) = 18493d507b3bb543bffce5483229fd86e82413036d68d054b59cbbb952637cd2b575dfb21de755706671919ec41334b01c70bc66bc788772dae5facfb49d22a2 +SHA512 (VTKData-9.5.1.tar.gz) = 5244a6ce380e10d5ec872206a8cd928e66a1db30954cc415983c5456643a0c4fca463d4a3d2e8531c3673301576d711071fa68c0684124306afdf6776264d7dd diff --git a/vtk.spec b/vtk.spec index 2f2c216..0aa7cfb 100644 --- a/vtk.spec +++ b/vtk.spec @@ -23,7 +23,7 @@ %else # No openmpi on i668 with openmpi 5 in Fedora 40+ # No mpi4py on i686 -%if 0%{?fedora} >= 40 +%if 0%{?fedora} %ifarch %{ix86} %bcond_with mpich %bcond_with openmpi @@ -47,7 +47,7 @@ %bcond_without xdummy %endif -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 %bcond_without flexiblas %endif @@ -65,7 +65,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.5.0%{?rc:~%{rc}} +Version: 9.5.1%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause %global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} From a08f5c88cdd5a16a58449d9bacdfb6523241bde3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:57 +0200 Subject: [PATCH 54/62] Rebuilt for Python 3.14.0rc3 bytecode From 2a3761907bceb35ff08bbc34a7a74be75846f6cc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 Sep 2025 08:15:11 -0600 Subject: [PATCH 55/62] Update to 9.5.2 --- .gitignore | 2 ++ sources | 4 ++-- vtk.spec | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c0c6d78..1e9afc3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ vtk-5.6.0.tar.gz /VTKData-9.5.0.tar.gz /VTK-9.5.1.tar.gz /VTKData-9.5.1.tar.gz +/VTK-9.5.2.tar.gz +/VTKData-9.5.2.tar.gz diff --git a/sources b/sources index f369061..be5d56c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VTK-9.5.1.tar.gz) = 18493d507b3bb543bffce5483229fd86e82413036d68d054b59cbbb952637cd2b575dfb21de755706671919ec41334b01c70bc66bc788772dae5facfb49d22a2 -SHA512 (VTKData-9.5.1.tar.gz) = 5244a6ce380e10d5ec872206a8cd928e66a1db30954cc415983c5456643a0c4fca463d4a3d2e8531c3673301576d711071fa68c0684124306afdf6776264d7dd +SHA512 (VTK-9.5.2.tar.gz) = fc8157a89fa603a7f7fce356e2f638ae69e0ea629a507458bdbb173daf511c61e39a1f0d7201b196a5b3a7ffa7e3e821398b62521faadf85edb1119a1e8b8e8e +SHA512 (VTKData-9.5.2.tar.gz) = 1be895bed613ed0f0ace0ba5e138afacc3d61b57e437299b3aecf6beff702ad1a2d02036fd147853bbbcb6a1f9d20a51831c0263fdc5b8e62ece9a6f8f7d410e diff --git a/vtk.spec b/vtk.spec index 0aa7cfb..a7a763d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -65,7 +65,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk -Version: 9.5.1%{?rc:~%{rc}} +Version: 9.5.2%{?rc:~%{rc}} Release: %autorelease License: BSD-3-Clause %global srcver %{lua:local ver = rpm.expand('%version');ver = ver:gsub('~','.');print(ver)} @@ -162,7 +162,6 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: unixODBC-devel BuildRequires: utf8cpp-devel -BuildRequires: zfp-devel BuildRequires: zlib-devel BuildRequires: chrpath BuildRequires: doxygen @@ -263,7 +262,6 @@ Requires: cmake(Qt6Quick) \ Requires: cmake(Qt6UiPlugin) \ Requires: unixODBC-devel%{?_isa} \ Requires: utf8cpp-devel \ -Requires: zfp-devel%{?_isa} \ Requires: zlib-devel%{?_isa} \ # Bundled KWSys From f3a0fa474fd88572a99c9d946addbc1236f3eaef Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 3 Sep 2025 08:28:00 -0600 Subject: [PATCH 56/62] Enable options for paraview --- vtk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index a7a763d..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -728,7 +728,16 @@ do -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ -DCMAKE_INSTALL_JNILIBDIR:PATH=lib/%{name} \ - -DVTK_MODULE_ENABLE_VTK_IOPIO:STRING=YES \ + -DVTK_MODULE_ENABLE_VTK_ParallelMPI=WANT \ + -DVTK_MODULE_ENABLE_VTK_mpi=WANT \ + -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC=WANT \ + -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelFlowPaths=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=WANT \ + -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOMPIImage=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF=WANT \ + -DVTK_MODULE_ENABLE_VTK_IOPIO=WANT \ -DVTK_USE_MPI:BOOL=ON module purge done From 28c34b1d95c1e36092f54bd83811518ebdbfd5a9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 30 Sep 2025 22:12:09 +0200 Subject: [PATCH 57/62] rebuild for FFmpeg 8 Needs bootstrapping for circular vtk->opencascade->vtk dependency. --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 17b813e..93cf531 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From a2d520c1c02cdaca1211524a2d08530ef8b1c5f6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 6 Nov 2025 14:19:45 +0100 Subject: [PATCH 58/62] unbootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 93cf531..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 530dd529f34e8cffdf31e86619fd47c0b32c786d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 17:13:43 +0100 Subject: [PATCH 59/62] Rebuild (gdal) From 9d536d0a1479a504b7706af70f5d4c2d3f602331 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 24 Nov 2025 09:03:19 +0100 Subject: [PATCH 60/62] Rebuild (gdal) - bootstrap --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 17b813e..93cf531 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 0 +%bcond bootstrap 1 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 454cb762623484c428f528c6dc92488a7355499d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 25 Nov 2025 08:06:52 +0100 Subject: [PATCH 61/62] Rebuild (gdal) - full build --- vtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 93cf531..17b813e 100644 --- a/vtk.spec +++ b/vtk.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} # There is a circular dep with opencascade -%bcond bootstrap 1 +%bcond bootstrap 0 # OSMesa and X support are mutually exclusive. # TODO - buid separate OSMesa version if desired From 643c0ef73cf383c3a76ddb3e26427427c5dc2240 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 13 Jan 2026 12:51:36 +0000 Subject: [PATCH 62/62] Rebuilt for Boost 1.90