libraries/VTK: Updated for version 9.2.6

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 6 insertions, 216 deletions

diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index 7b0674e035..d1ca10671a 100644
--- a/libraries/VTK/VTK.SlackBuild
+++ b/libraries/VTK/VTK.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2013,2014 Youjie Zhou <jmpopush@gmail.com>
 # All rights reserved.
-# Copyright 2016-2022 Christoph Willing,  Brisbane Australia
+# Copyright 2016-2023 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,8 +28,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=VTK
-VERSION=${VERSION:-9.0.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-9.2.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -95,8 +95,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/vtk-includes.patch
-patch -p1 < $CWD/vtk-AllValues.patch
 patch -p1 < $CWD/include_limits.patch
 chown -R root:root .
 find -L . \
diff --git a/libraries/VTK/VTK.info b/libraries/VTK/VTK.info
index 6695bccb41..76cb18894a 100644
--- a/libraries/VTK/VTK.info
+++ b/libraries/VTK/VTK.info
@@ -1,8 +1,8 @@
 PRGNAM="VTK"
-VERSION="9.0.3"
+VERSION="9.2.6"
 HOMEPAGE="https://www.vtk.org"
-DOWNLOAD="https://www.vtk.org/files/release/9.0/VTK-9.0.3.tar.gz"
-MD5SUM="1abe6e2d7988193cf7d64c4d84287956"
+DOWNLOAD="https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz"
+MD5SUM="d855cbabdf423f2839e1419ecc5f6700"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/VTK/vtk-AllValues.patch b/libraries/VTK/vtk-AllValues.patch
deleted file mode 100644
index d032d92485..0000000000
--- a/libraries/VTK/vtk-AllValues.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkDataArray.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArray.cxx
-+++ VTK-9.0.1/Common/Core/vtkDataArray.cxx
-@@ -1627,7 +1627,7 @@ struct ScalarRangeDispatchWrapper
-   void operator()(ArrayT* array)
-   {
-     this->Success = vtkDataArrayPrivate::DoComputeScalarRange(
--      array, this->Range, vtkDataArrayPrivate::AllValues());
-+      array, this->Range, vtkDataArrayPrivate::vtkAllValues());
-   }
- };
- 
-@@ -1646,7 +1646,7 @@ struct VectorRangeDispatchWrapper
-   void operator()(ArrayT* array)
-   {
-     this->Success = vtkDataArrayPrivate::DoComputeVectorRange(
--      array, this->Range, vtkDataArrayPrivate::AllValues());
-+      array, this->Range, vtkDataArrayPrivate::vtkAllValues());
-   }
- };
- 
-Index: VTK-9.0.1/Common/Core/vtkDataArray.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArray.h
-+++ VTK-9.0.1/Common/Core/vtkDataArray.h
-@@ -599,7 +599,7 @@ vtkArrayDownCast_FastCastMacro(vtkDataAr
- // vtkGenericDataArray.h as well.
- namespace vtkDataArrayPrivate
- {
--struct AllValues
-+struct vtkAllValues
- {
- };
- struct FiniteValues
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.txx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.txx
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.txx
-@@ -1192,7 +1192,7 @@ bool vtkGenericDataArray<DerivedT, Value
-   using namespace vtk_GDA_detail;
-   using Supported = IsSupported<DerivedT, ValueTypeT>;
-   return ComputeScalarValueRangeImpl(
--    static_cast<DerivedT*>(this), ranges, vtkDataArrayPrivate::AllValues{}, Supported{});
-+    static_cast<DerivedT*>(this), ranges, vtkDataArrayPrivate::vtkAllValues{}, Supported{});
- }
- 
- //-----------------------------------------------------------------------------
-@@ -1202,7 +1202,7 @@ bool vtkGenericDataArray<DerivedT, Value
-   using namespace vtk_GDA_detail;
-   using Supported = IsSupported<DerivedT, ValueTypeT>;
-   return ComputeVectorValueRangeImpl(
--    static_cast<DerivedT*>(this), range, vtkDataArrayPrivate::AllValues{}, Supported{});
-+    static_cast<DerivedT*>(this), range, vtkDataArrayPrivate::vtkAllValues{}, Supported{});
- }
- 
- //-----------------------------------------------------------------------------
-Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkDataArrayPrivate.txx
-+++ VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx
-@@ -301,7 +301,7 @@ template <int NumComps>
- struct ComputeScalarRange
- {
-   template <class ArrayT, typename RangeValueType>
--  bool operator()(ArrayT* array, RangeValueType* ranges, AllValues)
-+  bool operator()(ArrayT* array, RangeValueType* ranges, vtkAllValues)
-   {
-     AllValuesMinAndMax<NumComps, ArrayT> minmax(array);
-     vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax);
-@@ -435,7 +435,7 @@ public:
- };
- 
- template <class ArrayT, typename RangeValueType>
--bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, AllValues)
-+bool GenericComputeScalarRange(ArrayT* array, RangeValueType* ranges, vtkAllValues)
- {
-   AllValuesGenericMinAndMax<ArrayT> minmax(array);
-   vtkSMPTools::For(0, array->GetNumberOfTuples(), minmax);
-@@ -518,7 +518,7 @@ bool DoComputeScalarRange(ArrayT* array,
- //----------------------------------------------------------------------------
- // generic implementation that operates on ValueType.
- template <typename ArrayT, typename RangeValueType>
--bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], AllValues)
-+bool DoComputeVectorRange(ArrayT* array, RangeValueType range[2], vtkAllValues)
- {
-   range[0] = vtkTypeTraits<RangeValueType>::Max();
-   range[1] = vtkTypeTraits<RangeValueType>::Min();
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArray.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArray.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArray.h
-@@ -414,7 +414,7 @@ namespace vtkDataArrayPrivate
- template <typename A, typename R, typename T>
- bool DoComputeScalarRange(A*, R*, T);
- template <typename A, typename R>
--bool DoComputeVectorRange(A*, R[2], AllValues);
-+bool DoComputeVectorRange(A*, R[2], vtkAllValues);
- template <typename A, typename R>
- bool DoComputeVectorRange(A*, R[2], FiniteValues);
- } // namespace vtkDataArrayPrivate
-@@ -466,11 +466,11 @@ class vtkScaledSOADataArrayTemplate;
- 
- #define VTK_INSTANTIATE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType)                                 \
-   template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange(                                         \
--    ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues);                                       \
-+    ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues);                                       \
-   template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange(                                         \
-     ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues);                                    \
-   template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange(                                         \
--    ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues);                                     \
-+    ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues);                                     \
-   template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange(                                         \
-     ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues);
- 
-@@ -516,18 +516,18 @@ namespace vtkDataArrayPrivate
- template <typename A, typename R, typename T>
- bool DoComputeScalarRange(A*, R*, T);
- template <typename A, typename R>
--bool DoComputeVectorRange(A*, R[2], AllValues);
-+bool DoComputeVectorRange(A*, R[2], vtkAllValues);
- template <typename A, typename R>
- bool DoComputeVectorRange(A*, R[2], FiniteValues);
- } // namespace vtkDataArrayPrivate
- 
- #define VTK_DECLARE_VALUERANGE_ARRAYTYPE(ArrayType, ValueType)                                     \
-   extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange(                                  \
--    ArrayType*, ValueType*, vtkDataArrayPrivate::AllValues);                                       \
-+    ArrayType*, ValueType*, vtkDataArrayPrivate::vtkAllValues);                                       \
-   extern template VTKCOMMONCORE_EXPORT bool DoComputeScalarRange(                                  \
-     ArrayType*, ValueType*, vtkDataArrayPrivate::FiniteValues);                                    \
-   extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange(                                  \
--    ArrayType*, ValueType[2], vtkDataArrayPrivate::AllValues);                                     \
-+    ArrayType*, ValueType[2], vtkDataArrayPrivate::vtkAllValues);                                     \
-   extern template VTKCOMMONCORE_EXPORT bool DoComputeVectorRange(                                  \
-     ArrayType*, ValueType[2], vtkDataArrayPrivate::FiniteValues);
- 
diff --git a/libraries/VTK/vtk-includes.patch b/libraries/VTK/vtk-includes.patch
deleted file mode 100644
index f906200c29..0000000000
--- a/libraries/VTK/vtk-includes.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
---- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.includes	2020-06-26 07:24:40.000000000 -0600
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx	2021-01-27 06:51:11.776958150 -0700
-@@ -61,10 +61,23 @@ typedef ptrdiff_t GLsizeiptr;
- 
- #include <sstream>
- 
-+#include <X11/Xatom.h>
-+#include <X11/cursorfont.h>
-+#if VTK_HAVE_XCURSOR
-+#include <X11/Xcursor/Xcursor.h>
-+#endif
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
--#include <X11/cursorfont.h>
- 
-+/*
-+ * Work-around to get forward declarations of C typedef of anonymous
-+ * structs working. We do not want to include XUtil.h in the header as
-+ * it populates the global namespace.
-+ */
-+struct vtkXVisualInfo : public XVisualInfo
-+{
-+};
-+ 
- #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
- #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
- typedef GLXContext (*glXCreateContextAttribsARBProc)(
-@@ -224,7 +237,7 @@ int XEventTypeEquals(Display*, XEvent* e
-   return event->type == EventType;
- }
- 
--XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
-+vtkXVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
- {
-   XVisualInfo* v = nullptr;
- 
-@@ -258,7 +271,7 @@ XVisualInfo* vtkXOpenGLRenderWindow::Get
-       vtkErrorMacro(<< "Could not find a decent visual\n");
-     }
-   }
--  return (v);
-+  return reinterpret_cast<vtkXVisualInfo*>(v);
- }
- 
- vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
-diff -up VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
---- VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.includes	2020-06-26 07:24:40.000000000 -0600
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkXOpenGLRenderWindow.h	2021-01-27 06:49:09.420323338 -0700
-@@ -28,11 +28,11 @@
- #include "vtkOpenGLRenderWindow.h"
- #include "vtkRenderingOpenGL2Module.h" // For export macro
- #include <X11/Xlib.h>                  // Needed for X types used in the public interface
--#include <X11/Xutil.h>                 // Needed for X types used in the public interface
- #include <stack>                       // for ivar
- 
- class vtkIdList;
- class vtkXOpenGLRenderWindowInternal;
-+struct vtkXVisualInfo;
- 
- class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow
- {
-@@ -112,7 +112,7 @@ public:
-    */
-   virtual Colormap GetDesiredColormap();
-   virtual Visual* GetDesiredVisual();
--  virtual XVisualInfo* GetDesiredVisualInfo();
-+  virtual vtkXVisualInfo* GetDesiredVisualInfo();
-   virtual int GetDesiredDepth();
-   //@}
-