* [PR PATCH] vtk: update to 9.2.2
@ 2022-11-09 23:56 ar-jan
2022-11-09 23:59 ` [PR PATCH] [Updated] " ar-jan
` (33 more replies)
0 siblings, 34 replies; 35+ messages in thread
From: ar-jan @ 2022-11-09 23:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]
There is a new pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson` configure arg did not have any effect (which makes the build fail), so the only way I could get it to build was with `DVTK_USE_EXTERNAL=OFF`. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 30104 bytes --]
From 7cbfcfb4675ae5fc6e978ef263c913fb1b62a900 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../patches/vtkeigen-build-type-check.patch | 20 +
srcpkgs/vtk/template | 20 +-
5 files changed, 142 insertions(+), 527 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..d48b1eb8d712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
new file mode 100644
index 000000000000..8c687cae53c9
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
@@ -0,0 +1,20 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..9051ddd8 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,7 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
++
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..fa9f6e096b17 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,7 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
nocross="hdf5 is nocross"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -46,7 +50,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -64,8 +68,8 @@ vtk-python3_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/bin/vtkpython
- vmove "${py3_sitelib}"
- vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "${py3_sitelib}"
+ vmove "usr/lib/lib*Python*.so.*"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From 7bbc546d30f63d189dd93017c7a440301b77f8e0 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From ffd67c14c8189148214f33b77d06eb092e59db5d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
@ 2022-11-09 23:59 ` ar-jan
2022-11-10 22:32 ` kruceter
` (32 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-09 23:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson` configure arg did not have any effect (which makes the build fail), so the only way I could get it to build was with `DVTK_USE_EXTERNAL=OFF`. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 29957 bytes --]
From d89365750dab3f491fcffb7a347da5edc021b76d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../patches/vtkeigen-build-type-check.patch | 20 +
srcpkgs/vtk/template | 16 +-
5 files changed, 140 insertions(+), 525 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..d48b1eb8d712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
new file mode 100644
index 000000000000..8c687cae53c9
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-build-type-check.patch
@@ -0,0 +1,20 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..9051ddd8 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,7 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
++
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..824ba4c91a85 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,7 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
nocross="hdf5 is nocross"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -46,7 +50,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +70,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From dcf2672d24cecbd4de5ffce3f4c8e854e21b58ee Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From 1b5d6e3cca90b6d3718f768eaa32f1e210d76de3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
2022-11-09 23:59 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-10 22:32 ` kruceter
2022-11-10 22:32 ` kruceter
` (31 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-10 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1310986041
Comment:
Failing build for x86_64-musl (possibly?) can be fixed with this patch:
```diff
diff --color -u -r VTK-9.2.2-src/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C VTK-9.2.2/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
--- VTK-9.2.2-src/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C 2022-11-10 19:57:10.104509831 +0300
+++ VTK-9.2.2/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C 2022-11-10 21:30:44.327591097 +0300
@@ -26,7 +26,11 @@
#define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
#endif
#else
+#ifdef __GLIBC__
#include <sys/unistd.h>
+#else
+#include <unistd.h>
+#endif
#endif
#ifdef SEACAS_HAVE_MPI
@@ -35,9 +39,6 @@
#include <cstdio>
#include <sys/stat.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
namespace {
bool internal_access(const std::string &name, int mode);
```
I see that the patch fixing build with GCC 12 has been removed, meaning that vtk has to be tested against GCC 12 once again.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
2022-11-09 23:59 ` [PR PATCH] [Updated] " ar-jan
2022-11-10 22:32 ` kruceter
@ 2022-11-10 22:32 ` kruceter
2022-11-11 9:22 ` [PR PATCH] [Updated] " ar-jan
` (30 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-10 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1310986041
Comment:
Failing build for x86_64-musl (possibly?) can be fixed with this patch:
```diff
--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
@@ -26,7 +26,11 @@
#define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
#endif
#else
+#ifdef __GLIBC__
#include <sys/unistd.h>
+#else
+#include <unistd.h>
+#endif
#endif
#ifdef SEACAS_HAVE_MPI
@@ -35,9 +39,6 @@
#include <cstdio>
#include <sys/stat.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
namespace {
bool internal_access(const std::string &name, int mode);
```
I see that the patch fixing build with GCC 12 has been removed, meaning that vtk has to be tested against GCC 12 once again.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (2 preceding siblings ...)
2022-11-10 22:32 ` kruceter
@ 2022-11-11 9:22 ` ar-jan
2022-11-11 9:24 ` ar-jan
` (29 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-11 9:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson` configure arg did not have any effect (which makes the build fail), so the only way I could get it to build was with `DVTK_USE_EXTERNAL=OFF`. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 30916 bytes --]
From 499faaa67cf957eaeed69d01c70221416269a582 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../vtkeigen-disable-build-type-check.patch | 19 +
srcpkgs/vtk/patches/vtkioss.patch | 26 ++
srcpkgs/vtk/template | 16 +-
6 files changed, 165 insertions(+), 525 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..d48b1eb8d712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
new file mode 100644
index 000000000000..a89ee8ffd21c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
@@ -0,0 +1,19 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..10173ad4 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/patches/vtkioss.patch b/srcpkgs/vtk/patches/vtkioss.patch
new file mode 100644
index 000000000000..039bed46179c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss.patch
@@ -0,0 +1,26 @@
+/builddir/vtk-9.2.2/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C:29:10: fatal error: sys/unistd.h: No such file or directory
+
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,11 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
++#ifdef __GLIBC__
+ #include <sys/unistd.h>
++#else
++#include <unistd.h>
++#endif
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +39,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..824ba4c91a85 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,7 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
nocross="hdf5 is nocross"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -46,7 +50,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +70,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From 83605f579a1d9aae45063c15bd01460718d95d24 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From 7e5262a04ac6639739160e567d52fd8a1cab9248 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (3 preceding siblings ...)
2022-11-11 9:22 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-11 9:24 ` ar-jan
2022-11-11 9:44 ` paper42
` (28 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-11 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1311443952
Comment:
Thanks for the x86_64-musl patch! The gcc12 patch is [no longer needed](https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f).
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (4 preceding siblings ...)
2022-11-11 9:24 ` ar-jan
@ 2022-11-11 9:44 ` paper42
2022-11-12 15:08 ` ar-jan
` (27 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-11 9:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1311466535
Comment:
`/usr/include/sys/unistd.h` just contains `#include <unistd.h>` on glibc, so I think there is no need to put that behind an ifdef, we can just include it everywhere. @kruceter could you send that patch upstream if they don't have it yet?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (5 preceding siblings ...)
2022-11-11 9:44 ` paper42
@ 2022-11-12 15:08 ` ar-jan
2022-11-12 20:55 ` paper42
` (26 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1312502148
Comment:
Tested a few [VTK Python examples](https://kitware.github.io/vtk-examples/site/Python/) and confirmed that freecad works as well. I don't otherwise use VTK but all seems OK. Anything more needed here?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (6 preceding siblings ...)
2022-11-12 15:08 ` ar-jan
@ 2022-11-12 20:55 ` paper42
2022-11-12 21:24 ` [PR PATCH] [Updated] " ar-jan
` (25 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-12 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1312570152
Comment:
> `/usr/include/sys/unistd.h` just contains `#include <unistd.h>` on glibc, so I think there is no need to put that behind an ifdef, we can just include it everywhere. @kruceter could you send that patch upstream if they don't have it yet?
Could you use <https://github.com/sandialabs/seacas/pull/348.patch>?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (7 preceding siblings ...)
2022-11-12 20:55 ` paper42
@ 2022-11-12 21:24 ` ar-jan
2022-11-12 21:41 ` paper42
` (24 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 30966 bytes --]
From c6a36baadcb606d0848888758df8415b86869db5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../vtkeigen-disable-build-type-check.patch | 19 +
srcpkgs/vtk/patches/vtkioss-unistd.patch | 25 ++
srcpkgs/vtk/template | 16 +-
6 files changed, 164 insertions(+), 525 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..d48b1eb8d712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
new file mode 100644
index 000000000000..a89ee8ffd21c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
@@ -0,0 +1,19 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..10173ad4 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..24820d76c17b
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,25 @@
+Build fails on musl-based Linux distributions.
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..824ba4c91a85 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,7 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
nocross="hdf5 is nocross"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -46,7 +50,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +70,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From d60ef17e20a8bb9d1051a4f3c5d98c2a4dbe60b8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From e620c9fbd9a908846e213d2fd9bfb5672b7ad14b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (8 preceding siblings ...)
2022-11-12 21:24 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-12 21:41 ` paper42
2022-11-12 21:42 ` paper42
` (23 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-12 21:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1312578563
Comment:
> > `/usr/include/sys/unistd.h` just contains `#include <unistd.h>` on glibc, so I think there is no need to put that behind an ifdef, we can just include it everywhere. @kruceter could you send that patch upstream if they don't have it yet?
>
> Could you use [sandialabs/seacas@`348`.patch](https://github.com/sandialabs/seacas/pull/348.patch)?
I meant including the header, download the patch from that link and put it to the right directory.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (9 preceding siblings ...)
2022-11-12 21:41 ` paper42
@ 2022-11-12 21:42 ` paper42
2022-11-12 21:45 ` [PR REVIEW] " paper42
` (22 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-12 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1312578563
Comment:
> > `/usr/include/sys/unistd.h` just contains `#include <unistd.h>` on glibc, so I think there is no need to put that behind an ifdef, we can just include it everywhere. @kruceter could you send that patch upstream if they don't have it yet?
>
> Could you use [sandialabs/seacas@`348`.patch](https://github.com/sandialabs/seacas/pull/348.patch)?
I meant including the header, download the patch from that link, don't modify it and put it to the right directory.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (10 preceding siblings ...)
2022-11-12 21:42 ` paper42
@ 2022-11-12 21:45 ` paper42
2022-11-12 22:43 ` ar-jan
` (21 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-12 21:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020809808
Comment:
I think that if a dependency is nocross, the package should just not build if xbps-src can not build that dependency, so this should not be necessary.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (11 preceding siblings ...)
2022-11-12 21:45 ` [PR REVIEW] " paper42
@ 2022-11-12 22:43 ` ar-jan
2022-11-12 22:51 ` [PR REVIEW] " ar-jan
` (20 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1312588314
Comment:
Upstream patch does not apply to the version vendored with vtk-9.2.2.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (12 preceding siblings ...)
2022-11-12 22:43 ` ar-jan
@ 2022-11-12 22:51 ` ar-jan
2022-11-12 22:52 ` ar-jan
` (19 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020815457
Comment:
If I try building locally with `./xbps-src pkg -a 86_64-musl vtk` I get `ERROR: XBPS_CROSS_TRIPLET is not defined!`. Does that mean we should leave it as is?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (13 preceding siblings ...)
2022-11-12 22:51 ` [PR REVIEW] " ar-jan
@ 2022-11-12 22:52 ` ar-jan
2022-11-12 22:53 ` paper42
` (18 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 22:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020815457
Comment:
If I remove nocross and try building locally with `./xbps-src pkg -a 86_64-musl vtk` I get `ERROR: XBPS_CROSS_TRIPLET is not defined!`. Does that mean we should leave it as is?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (14 preceding siblings ...)
2022-11-12 22:52 ` ar-jan
@ 2022-11-12 22:53 ` paper42
2022-11-12 23:08 ` ar-jan
` (17 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-12 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020815657
Comment:
That's a wrong arch, you missed an x.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (15 preceding siblings ...)
2022-11-12 22:53 ` paper42
@ 2022-11-12 23:08 ` ar-jan
2022-11-12 23:10 ` ar-jan
` (16 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 23:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020816772
Comment:
lol oops it's getting late :)
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (16 preceding siblings ...)
2022-11-12 23:08 ` ar-jan
@ 2022-11-12 23:10 ` ar-jan
2022-11-14 15:55 ` kruceter
` (15 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-12 23:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1020816934
Comment:
Now for realz: `CMake Error at CMake/vtkCrossCompiling.cmake:7 (find_package): By not providing "FindVTKCompileTools.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "VTKCompileTools", but CMake did not find one.`
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (17 preceding siblings ...)
2022-11-12 23:10 ` ar-jan
@ 2022-11-14 15:55 ` kruceter
2022-11-14 15:59 ` kruceter
` (14 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-14 15:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021725492
Comment:
I have removed `nocross` on my side and it definitely cannot crossbuild due to hdf5's templated containing `nocross` as well.
Just like @paper42 said, if a dependency is nocross, the package should not build at all.
It is safe to remove the line with `nocross` here.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (18 preceding siblings ...)
2022-11-14 15:55 ` kruceter
@ 2022-11-14 15:59 ` kruceter
2022-11-14 16:40 ` [PR PATCH] [Updated] " ar-jan
` (13 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-14 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021732889
Comment:
```suggestion
libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
libvtkWrappingTools-9.2.so.1 vtk-9.2.2_1
libvtkloguru-9.2.so.1 vtk-9.2.2_1
libvtkpugixml-9.2.so.1 vtk-9.2.2_1
libvtkfmt-9.2.so.1 vtk-9.2.2_1
libvtkdoubleconversion-9.2.so.1 vtk-9.2.2_1
libvtklz4-9.2.so.1 vtk-9.2.2_1
libvtklzma-9.2.so.1 vtk-9.2.2_1
libvtkzlib-9.2.so.1 vtk-9.2.2_1
libvtkexpat-9.2.so.1 vtk-9.2.2_1
libvtkParallelDIY-9.2.so.1 vtk-9.2.2_1
libvtkfreetype-9.2.so.1 vtk-9.2.2_1
libvtkDICOMParser-9.2.so.1 vtk-9.2.2_1
libvtkjpeg-9.2.so.1 vtk-9.2.2_1
libvtkmetaio-9.2.so.1 vtk-9.2.2_1
libvtkpng-9.2.so.1 vtk-9.2.2_1
libvtktiff-9.2.so.1 vtk-9.2.2_1
libvtkglew-9.2.so.1 vtk-9.2.2_1
libvtkhdf5-9.2.so.1 vtk-9.2.2_1
libvtkhdf5_hl-9.2.so.1 vtk-9.2.2_1
libvtkogg-9.2.so.1 vtk-9.2.2_1
libvtktheora-9.2.so.1 vtk-9.2.2_1
libvtknetcdf-9.2.so.1 vtk-9.2.2_1
libvtksqlite-9.2.so.1 vtk-9.2.2_1
libvtklibproj-9.2.so.1 vtk-9.2.2_1
libvtkjsoncpp-9.2.so.1 vtk-9.2.2_1
libvtklibxml2-9.2.so.1 vtk-9.2.2_1
libvtkcgns-9.2.so.1 vtk-9.2.2_1
libvtkexodusII-9.2.so.1 vtk-9.2.2_1
libvtkioss-9.2.so.1 vtk-9.2.2_1
libvtklibharu-9.2.so.1 vtk-9.2.2_1
libvtkgl2ps-9.2.so.1 vtk-9.2.2_1
libvtkverdict-9.2.so.1 vtk-9.2.2_1
```
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (19 preceding siblings ...)
2022-11-14 15:59 ` kruceter
@ 2022-11-14 16:40 ` ar-jan
2022-11-14 16:48 ` [PR REVIEW] " paper42
` (12 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-14 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 32131 bytes --]
From 51ea82604efb7d6f02cfe3b37148c485adedc445 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 246 ++++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../vtkeigen-disable-build-type-check.patch | 19 +
srcpkgs/vtk/patches/vtkioss-unistd.patch | 25 ++
srcpkgs/vtk/template | 17 +-
6 files changed, 196 insertions(+), 526 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..663a18a84578 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,148 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkcgns-9.2.so.1 vtk-9.2.2_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDICOMParser-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkdoubleconversion-9.2.so.1 vtk-9.2.2_1
+libvtkexodusII-9.2.so.1 vtk-9.2.2_1
+libvtkexpat-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkfmt-9.2.so.1 vtk-9.2.2_1
+libvtkfreetype-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkgl2ps-9.2.so.1 vtk-9.2.2_1
+libvtkglew-9.2.so.1 vtk-9.2.2_1
+libvtkhdf5_hl-9.2.so.1 vtk-9.2.2_1
+libvtkhdf5-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkioss-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkjpeg-9.2.so.1 vtk-9.2.2_1
+libvtkjsoncpp-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtklibharu-9.2.so.1 vtk-9.2.2_1
+libvtklibproj-9.2.so.1 vtk-9.2.2_1
+libvtklibxml2-9.2.so.1 vtk-9.2.2_1
+libvtkloguru-9.2.so.1 vtk-9.2.2_1
+libvtklz4-9.2.so.1 vtk-9.2.2_1
+libvtklzma-9.2.so.1 vtk-9.2.2_1
+libvtkmetaio-9.2.so.1 vtk-9.2.2_1
+libvtknetcdf-9.2.so.1 vtk-9.2.2_1
+libvtkogg-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkParallelDIY-9.2.so.1 vtk-9.2.2_1
+libvtkpng-9.2.so.1 vtk-9.2.2_1
+libvtkpugixml-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksqlite-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtktheora-9.2.so.1 vtk-9.2.2_1
+libvtktiff-9.2.so.1 vtk-9.2.2_1
+libvtkverdict-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkWrappingTools-9.2.so.1 vtk-9.2.2_1
+libvtkzlib-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
new file mode 100644
index 000000000000..a89ee8ffd21c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
@@ -0,0 +1,19 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..10173ad4 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..24820d76c17b
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,25 @@
+Build fails on musl-based Linux distributions.
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..dfabbb649a81 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,8 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-nocross="hdf5 is nocross"
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
@@ -46,7 +49,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +69,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From 43592a0f426b8f1776b469afd0e3a3ef9e7079dd Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From 2e79409824d36a335f216532a68bf6ec18f2468a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (20 preceding siblings ...)
2022-11-14 16:40 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-14 16:48 ` paper42
2022-11-14 16:57 ` ar-jan
` (11 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-14 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021813168
Comment:
Is this required by some package? If not, we should not include it in shlibs and keep this as small as possible.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (21 preceding siblings ...)
2022-11-14 16:48 ` [PR REVIEW] " paper42
@ 2022-11-14 16:57 ` ar-jan
2022-11-14 16:58 ` paper42
` (10 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-14 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021824287
Comment:
No. I had included only the ones that xbps-src requires at first, added these based on https://github.com/void-linux/void-packages/pull/40423#discussion_r1021732889.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (22 preceding siblings ...)
2022-11-14 16:57 ` ar-jan
@ 2022-11-14 16:58 ` paper42
2022-11-14 17:02 ` [PR PATCH] [Updated] " ar-jan
` (9 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-14 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021825414
Comment:
ok, that's wrong, please revert it
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (23 preceding siblings ...)
2022-11-14 16:58 ` paper42
@ 2022-11-14 17:02 ` ar-jan
2022-11-14 17:02 ` [PR REVIEW] " ar-jan
` (8 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-14 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 31002 bytes --]
From 02419d86de0aaea384de4cbc2c80bacc600caff7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
.../vtkeigen-disable-build-type-check.patch | 19 +
srcpkgs/vtk/patches/vtkioss-unistd.patch | 25 ++
srcpkgs/vtk/template | 17 +-
6 files changed, 164 insertions(+), 526 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..056289c69291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
new file mode 100644
index 000000000000..a89ee8ffd21c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
@@ -0,0 +1,19 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..10173ad4 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..24820d76c17b
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,25 @@
+Build fails on musl-based Linux distributions.
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..dfabbb649a81 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,8 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-nocross="hdf5 is nocross"
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
@@ -46,7 +49,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +69,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From 58c62abd89ec8b7c7faf87b7b2836f9fc073f073 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From c63a8362f515b8ea5d69bf49a568a7a4d7a97f21 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (24 preceding siblings ...)
2022-11-14 17:02 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-14 17:02 ` ar-jan
2022-11-15 18:05 ` kruceter
` (7 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-14 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021829660
Comment:
done
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (25 preceding siblings ...)
2022-11-14 17:02 ` [PR REVIEW] " ar-jan
@ 2022-11-15 18:05 ` kruceter
2022-11-17 12:26 ` paper42
` (6 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-15 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#discussion_r1021725492
Comment:
I have removed `nocross` on my side and it definitely cannot crossbuild due to hdf5's template containing `nocross` as well.
Just like @paper42 said, if a dependency is nocross, the package should not build at all.
It is safe to remove the line with `nocross` here.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (26 preceding siblings ...)
2022-11-15 18:05 ` kruceter
@ 2022-11-17 12:26 ` paper42
2022-11-20 2:12 ` kruceter
` (5 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: paper42 @ 2022-11-17 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1318563511
Comment:
> The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
We definitely want to use system dependencies, can we fix it by adding json-c++ to makedepends?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (27 preceding siblings ...)
2022-11-17 12:26 ` paper42
@ 2022-11-20 2:12 ` kruceter
2022-11-20 16:01 ` [PR PATCH] [Updated] " ar-jan
` (4 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: kruceter @ 2022-11-20 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2072 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1321014818
Comment:
> We definitely want to use system dependencies, can we fix it by adding json-c++ to makedepends?
Certainly.
Also fmt-devel and eigen are already present in the repository, so they are used in my case, too.
[vtk.txt](https://github.com/void-linux/void-packages/files/10048296/vtk.txt)
[vtk-query.txt](https://github.com/void-linux/void-packages/files/10048300/vtk-query.txt)
```diff
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index dfabbb649a..147718c690 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -6,21 +6,21 @@ build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=OFF
+ -DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
- -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
- -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
- -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel"
+ gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
```
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (28 preceding siblings ...)
2022-11-20 2:12 ` kruceter
@ 2022-11-20 16:01 ` ar-jan
2022-11-20 16:03 ` ar-jan
` (3 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-20 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 29998 bytes --]
From 7251a85b8528ebec59ae1786cf38203644aa5b23 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 ++
srcpkgs/vtk/template | 17 +-
5 files changed, 146 insertions(+), 526 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..056289c69291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..df43a1fe5bba
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,26 @@
+Build fails on musl-based Linux distributions
+https://github.com/sandialabs/seacas/pull/348
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..659328293f70 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -10,20 +10,23 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel"
+ gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-nocross="hdf5 is nocross"
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
@@ -46,7 +49,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +69,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From c50df19697d2cfa4eece017bca94e90ab0fa4ffd Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From c281640c51886546b9639471d2f41823f92a5a53 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (29 preceding siblings ...)
2022-11-20 16:01 ` [PR PATCH] [Updated] " ar-jan
@ 2022-11-20 16:03 ` ar-jan
2022-12-02 12:28 ` ar-jan
` (2 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-11-20 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 29998 bytes --]
From 3f25d9e64b455ff1c9ab4f6b834a7a24a7e326b9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 ++
srcpkgs/vtk/template | 17 +-
5 files changed, 146 insertions(+), 526 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 3b103f479d5a..cb5b133e11c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..df43a1fe5bba
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,26 @@
+Build fails on musl-based Linux distributions
+https://github.com/sandialabs/seacas/pull/348
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..659328293f70 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -10,20 +10,23 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel"
+ gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-nocross="hdf5 is nocross"
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
@@ -46,7 +49,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +69,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
}
}
From b13952fb9de4067962b5494edf82cb2d394c5117 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From 17e74507b41b6aa05b69cf4095e4f1eb0519fdaf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (30 preceding siblings ...)
2022-11-20 16:03 ` ar-jan
@ 2022-12-02 12:28 ` ar-jan
2022-12-02 16:52 ` ar-jan
2022-12-03 20:38 ` [PR PATCH] [Merged]: " Piraty
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-12-02 12:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423
vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 30019 bytes --]
From 421990c12b523b65779035ead876b5841a9638ec Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2
---
common/shlibs | 214 +++++-----
srcpkgs/vtk/patches/include.patch | 396 ------------------
...etype-2.10.3-provide-FT_CALLBACK_DEF.patch | 19 -
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 ++
srcpkgs/vtk/template | 17 +-
5 files changed, 146 insertions(+), 526 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/include.patch
delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..5c932d652514 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3260,110 +3260,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
libvolume_key.so.1 volume_key-0.3.9_1
librand48_r.so.0 rand48_r-0.1_1
libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
-
- #include <cmath>
-+#include <limits>
-
- #include "vtkTestErrorObserver.h"
-
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
-
-+#include <limits>
- #include <vector>
-
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
-
-+#include <limits>
- #include <map>
-
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <cstdio>
-+#include <limits>
- #include <sstream>
-
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE. See the above copyright notice
- #include "vtkVector.h"
-
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
-
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE. See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
-
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
-
- #include <cstring>
-+#include <limits>
-
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
-
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
-
- #include <algorithm>
-+#include <limits>
-
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
-
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
-
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
-
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkGaussianKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
-
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
-
- vtkStandardNewMacro(vtkShepardKernel);
-
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
-
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
-
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
-
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
-
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
-
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
-
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
-
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
-
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
-
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
-
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
-
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
-
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+# ifdef __cplusplus
-+# define FT_CALLBACK_DEF( x ) extern "C" x
-+# else
-+# define FT_CALLBACK_DEF( x ) static x
-+# endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..df43a1fe5bba
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,26 @@
+Build fails on musl-based Linux distributions
+https://github.com/sandialabs/seacas/pull/348
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+
+ namespace {
+ bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 4de7a9021cb6..6870bdcf0857 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -10,20 +10,23 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel openmpi-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel"
+ gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
-nocross="hdf5 is nocross"
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
@@ -46,7 +49,7 @@ post_install() {
# Mangle CPython extension names in CMake like xbps-src will do
vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
- -i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+ -i "${DESTDIR}/usr/lib/cmake/vtk-${version:0:3}/VTKPython-targets-none.cmake"
}
vtk-devel_package() {
@@ -66,6 +69,6 @@ vtk-python3_package() {
vmove usr/bin/vtkpython
vmove "${py3_sitelib}"
vmove "usr/lib/lib*Python*.so.*"
- vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+ vmove "usr/lib/vtk-${version:0:3}/hierarchy/VTK/vtk*Python*.txt"
}
}
From d4c83afd5ffd4eae25b389208e91a5b2455bae50 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=5
+revision=6
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
From cb281f17f40f34a959182551a213f1b13f5c4889 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (31 preceding siblings ...)
2022-12-02 12:28 ` ar-jan
@ 2022-12-02 16:52 ` ar-jan
2022-12-03 20:38 ` [PR PATCH] [Merged]: " Piraty
33 siblings, 0 replies; 35+ messages in thread
From: ar-jan @ 2022-12-02 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/40423#issuecomment-1335527633
Comment:
Bump. I just changed the hardcoded references to the vtk version, otherwise this is the same as before, and I think it's ready.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Merged]: vtk: update to 9.2.2
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
` (32 preceding siblings ...)
2022-12-02 16:52 ` ar-jan
@ 2022-12-03 20:38 ` Piraty
33 siblings, 0 replies; 35+ messages in thread
From: Piraty @ 2022-12-03 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
vtk: update to 9.2.2
https://github.com/void-linux/void-packages/pull/40423
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 35+ messages in thread
end of thread, other threads:[~2022-12-03 20:38 UTC | newest]
Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-09 23:56 [PR PATCH] vtk: update to 9.2.2 ar-jan
2022-11-09 23:59 ` [PR PATCH] [Updated] " ar-jan
2022-11-10 22:32 ` kruceter
2022-11-10 22:32 ` kruceter
2022-11-11 9:22 ` [PR PATCH] [Updated] " ar-jan
2022-11-11 9:24 ` ar-jan
2022-11-11 9:44 ` paper42
2022-11-12 15:08 ` ar-jan
2022-11-12 20:55 ` paper42
2022-11-12 21:24 ` [PR PATCH] [Updated] " ar-jan
2022-11-12 21:41 ` paper42
2022-11-12 21:42 ` paper42
2022-11-12 21:45 ` [PR REVIEW] " paper42
2022-11-12 22:43 ` ar-jan
2022-11-12 22:51 ` [PR REVIEW] " ar-jan
2022-11-12 22:52 ` ar-jan
2022-11-12 22:53 ` paper42
2022-11-12 23:08 ` ar-jan
2022-11-12 23:10 ` ar-jan
2022-11-14 15:55 ` kruceter
2022-11-14 15:59 ` kruceter
2022-11-14 16:40 ` [PR PATCH] [Updated] " ar-jan
2022-11-14 16:48 ` [PR REVIEW] " paper42
2022-11-14 16:57 ` ar-jan
2022-11-14 16:58 ` paper42
2022-11-14 17:02 ` [PR PATCH] [Updated] " ar-jan
2022-11-14 17:02 ` [PR REVIEW] " ar-jan
2022-11-15 18:05 ` kruceter
2022-11-17 12:26 ` paper42
2022-11-20 2:12 ` kruceter
2022-11-20 16:01 ` [PR PATCH] [Updated] " ar-jan
2022-11-20 16:03 ` ar-jan
2022-12-02 12:28 ` ar-jan
2022-12-02 16:52 ` ar-jan
2022-12-03 20:38 ` [PR PATCH] [Merged]: " Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).