vtk: update to 9.4.0

mingw-w64-vtk/.gitignore

@@ -0,0 +1,3 @@
+100-fix-build-vtkm-with-clang-19.patch
+101-fix-build-vtkm-with-clang-19_2.patch
+102-fix-build-vtkm-with-clang-19_3.patch

mingw-w64-vtk/003-fix-build-with-fmt-11.patch

@@ -1,40 +1,20 @@
---- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
+--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
 @@ -12,6 +12,7 @@
- #include <cstddef> // for nullptr
+ #include <cstdint>
  #include "vtk_fmt.h"
  #include VTK_FMT(fmt/ostream.h)
 +#include VTK_FMT(fmt/ranges.h)
- #include <map>     // for _Rb_tree_iterator, etc
- #include <ostream> // for basic_ostream, etc
- #include <set>
---- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
-@@ -15,6 +15,7 @@
- #include <Ioss_StructuredBlock.h>
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
-
- #include <cstddef> // for size_t
- #include <numeric>
---- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
-@@ -21,6 +21,7 @@
- #include VTK_FMT(fmt/chrono.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+--- a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
  #include VTK_FMT(fmt/format.h)
  #include VTK_FMT(fmt/ostream.h)
 +#include VTK_FMT(fmt/ranges.h)
- #include <fstream>
+ #include <map>
  #include <sstream>
  #include <string>
---- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
-@@ -9,6 +9,7 @@
- #include <cstddef> // for size_t
- #include "vtk_fmt.h"
- #include VTK_FMT(fmt/ostream.h)
-+#include VTK_FMT(fmt/ranges.h)
- #include <string> // for string
- #include <vector> // for vector
-

mingw-w64-vtk/007-dll-export-some-functions.patch

@@ -1,6 +1,6 @@
 --- a/Common/Core/vtkAOSDataArrayTemplate.h
 +++ b/Common/Core/vtkAOSDataArrayTemplate.h
-@@ -63,7 +63,7 @@
+@@ -75,7 +75,7 @@
    /**
     * Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
     */
@@ -9,7 +9,7 @@
      VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
    {
      return this->Buffer->GetBuffer()[valueIdx];
-@@ -72,7 +72,7 @@
+@@ -84,7 +84,7 @@
    /**
     * Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
     */
@@ -18,7 +18,7 @@
      VTK_EXPECTS(0 <= valueIdx && valueIdx < GetNumberOfValues())
    {
      this->Buffer->GetBuffer()[valueIdx] = value;
-@@ -82,7 +82,7 @@
+@@ -94,7 +94,7 @@
    /**
     * Copy the tuple at @a tupleIdx into @a tuple.
     */
@@ -27,7 +27,7 @@
      VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
    {
      const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
-@@ -95,7 +95,7 @@
+@@ -107,7 +107,7 @@
    /**
     * Set this array's tuple at @a tupleIdx to the values in @a tuple.
     */
@@ -36,25 +36,25 @@
      VTK_EXPECTS(0 <= tupleIdx && tupleIdx < GetNumberOfTuples())
    {
      const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents;
-@@ -106,7 +106,7 @@
+@@ -158,7 +158,7 @@
    /**
     * Get component @a comp of the tuple at @a tupleIdx.
     */
--  ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
-+  VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const VTK_EXPECTS(0 <= tupleIdx &&
-     tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
+-  ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
++  VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
+     VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
+       VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
    {
-     return this->Buffer->GetBuffer()[this->NumberOfComponents * tupleIdx + comp];
-@@ -116,7 +116,7 @@
+@@ -169,7 +169,7 @@
    /**
     * Set component @a comp of the tuple at @a tupleIdx to @a value.
     */
--  void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
-+  VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value) VTK_EXPECTS(0 <= tupleIdx &&
-     tupleIdx < GetNumberOfTuples()) VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
+-  void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
++  VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
+     VTK_EXPECTS(0 <= tupleIdx && GetNumberOfComponents() * tupleIdx + comp < GetNumberOfValues())
+       VTK_EXPECTS(0 <= comp && comp < GetNumberOfComponents())
    {
-     const vtkIdType valueIdx = tupleIdx * this->NumberOfComponents + comp;
-@@ -260,11 +260,11 @@
+@@ -314,11 +314,11 @@
      vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
    // MSVC doesn't like 'using' here (error C2487). Just forward instead:
    // using Superclass::InsertTuples;
@@ -70,7 +70,7 @@
      this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);
 --- a/Common/Core/vtkSetGet.h
 +++ b/Common/Core/vtkSetGet.h
-@@ -827,7 +827,7 @@
+@@ -1076,7 +1076,7 @@
                                                                                                     \
  public:                                                                                            \
    typedef superclass Superclass;                                                                   \
@@ -79,16 +79,16 @@
    {                                                                                                \
      if (!strcmp(thisClassName, type))                                                              \
      {                                                                                              \
-@@ -836,7 +836,7 @@
-     return superclass::IsTypeOf(type);                                                             \
+@@ -1088,7 +1088,7 @@
+   {                                                                                                \
+     return this->thisClass::IsTypeOf(type);                                                        \
    }                                                                                                \
-   vtkTypeBool IsA(const char* type) override { return this->thisClass::IsTypeOf(type); }           \
 -  static thisClass* SafeDownCast(vtkObjectBase* o)                                                 \
 +  static VTKCOMMONCORE_EXPORT thisClass* SafeDownCast(vtkObjectBase* o)                            \
    {                                                                                                \
      if (o && o->IsA(thisClassName))                                                                \
      {                                                                                              \
-@@ -848,7 +848,7 @@
+@@ -1100,7 +1100,7 @@
    {                                                                                                \
      return instanceType::SafeDownCast(this->NewInstanceInternal());                                \
    }                                                                                                \
@@ -99,7 +99,7 @@
      {                                                                                              \
 --- a/Common/Core/vtkSOADataArrayTemplate.h
 +++ b/Common/Core/vtkSOADataArrayTemplate.h
-@@ -60,7 +60,7 @@
+@@ -52,7 +52,7 @@
    /**
     * Get the value at @a valueIdx. @a valueIdx assumes AOS ordering.
     */
@@ -108,7 +108,7 @@
    {
      vtkIdType tupleIdx;
      int comp;
-@@ -73,7 +73,7 @@
+@@ -65,7 +65,7 @@
    /**
     * Set the value at @a valueIdx to @a value. @a valueIdx assumes AOS ordering.
     */
@@ -117,43 +117,43 @@
    {
      vtkIdType tupleIdx;
      int comp;
-@@ -85,7 +85,7 @@
+@@ -77,7 +77,7 @@
    /**
     * Copy the tuple at @a tupleIdx into @a tuple.
     */
 -  inline void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
 +  inline VTKCOMMONCORE_EXPORT void GetTypedTuple(vtkIdType tupleIdx, ValueType* tuple) const
    {
-     for (size_t cc = 0; cc < this->Data.size(); cc++)
+     if (this->StorageType == StorageTypeEnum::SOA)
      {
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
    /**
     * Set this array's tuple at @a tupleIdx to the values in @a tuple.
     */
 -  inline void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
 +  inline VTKCOMMONCORE_EXPORT void SetTypedTuple(vtkIdType tupleIdx, const ValueType* tuple)
    {
-     for (size_t cc = 0; cc < this->Data.size(); ++cc)
+     if (this->StorageType == StorageTypeEnum::SOA)
      {
-@@ -107,7 +107,7 @@
+@@ -117,7 +117,7 @@
    /**
     * Get component @a comp of the tuple at @a tupleIdx.
     */
 -  inline ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
 +  inline VTKCOMMONCORE_EXPORT ValueType GetTypedComponent(vtkIdType tupleIdx, int comp) const
    {
-     return this->Data[comp]->GetBuffer()[tupleIdx];
-   }
-@@ -115,7 +115,7 @@
+     if (this->StorageType == StorageTypeEnum::SOA)
+     {
+@@ -129,7 +129,7 @@
    /**
     * Set component @a comp of the tuple at @a tupleIdx to @a value.
     */
 -  inline void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
 +  inline VTKCOMMONCORE_EXPORT void SetTypedComponent(vtkIdType tupleIdx, int comp, ValueType value)
    {
-     this->Data[comp]->GetBuffer()[tupleIdx] = value;
-   }
-@@ -198,11 +198,11 @@
+     if (this->StorageType == StorageTypeEnum::SOA)
+     {
+@@ -219,11 +219,11 @@
      vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override;
    // MSVC doesn't like 'using' here (error C2487). Just forward instead:
    // using Superclass::InsertTuples;
@@ -167,4 +167,3 @@
      vtkIdType dstStart, vtkIdList* srcIds, vtkAbstractArray* source) override
    {
      this->Superclass::InsertTuplesStartingAt(dstStart, srcIds, source);
-