Browse Source

update vtk (#5041)

* update vtk

* add patch
Inari0 1 year ago
parent
commit
6e7df71890
2 changed files with 56 additions and 2 deletions
  1. 52 0
      packages/v/vtk/patches/9.3.1/msvc.patch
  2. 4 2
      packages/v/vtk/xmake.lua

+ 52 - 0
packages/v/vtk/patches/9.3.1/msvc.patch

@@ -0,0 +1,52 @@
+diff --git a/Common/Core/SMP/Common/vtkSMPToolsImpl.h b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
+index f336f1fe2d2..8ed35c982d5 100644
+--- a/Common/Core/SMP/Common/vtkSMPToolsImpl.h
++++ b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
+@@ -62,7 +62,7 @@ public:
+   bool GetNestedParallelism() { return this->NestedActivated; }
+ 
+   //--------------------------------------------------------------------------------
+-  bool IsParallelScope() { return this->IsParallel; }
++  bool IsParallelScope();
+ 
+   //--------------------------------------------------------------------------------
+   bool GetSingleThread();
+@@ -118,6 +118,12 @@ private:
+   std::atomic<bool> IsParallel{ false };
+ };
+ 
++template <BackendType Backend>
++bool vtkSMPToolsImpl<Backend>::IsParallelScope()
++{
++  return this->IsParallel;
++}
++
+ using ExecuteFunctorPtrType = void (*)(void*, vtkIdType, vtkIdType, vtkIdType);
+ 
+ VTK_ABI_NAMESPACE_END
+diff --git a/Common/Core/SMP/Common/vtkSMPToolsImpl.h b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
+index 8ed35c982d5..d2a4a377adc 100644
+--- a/Common/Core/SMP/Common/vtkSMPToolsImpl.h
++++ b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
+@@ -43,7 +43,7 @@ const BackendType DefaultBackend = BackendType::OpenMP;
+ #endif
+ 
+ template <BackendType Backend>
+-class VTKCOMMONCORE_EXPORT vtkSMPToolsImpl
++class vtkSMPToolsImpl
+ {
+ public:
+   //--------------------------------------------------------------------------------
+diff --git a/Utilities/octree/octree/octree_node.txx b/Utilities/octree/octree/octree_node.txx
+index 6971c7c1199..5f12bb7de76 100644
+--- a/Utilities/octree/octree/octree_node.txx
++++ b/Utilities/octree/octree/octree_node.txx
+@@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co
+   {
+     throw std::domain_error("Attempt to access children of an octree leaf node.");
+   }
+-  return this->_M_chilren[child];
++  return this->m_children[child];
+ }
+ 
+ /**\brief Return a reference to a child node.

+ 4 - 2
packages/v/vtk/xmake.lua

@@ -12,9 +12,11 @@ package("vtk")
     add_versions("9.1.0", "8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96")
     add_versions("9.2.2", "1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075")
     add_versions("9.2.6", "06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12")
+    add_versions("9.3.1", "8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8")
 
-    add_patches("9.0.3", path.join(os.scriptdir(), "patches", "9.0.3", "limits.patch"), "3bebcd1cac52462b0cf84c8232c3426202c75c944784252b215b4416cbe111db")
-    add_patches("9.2.6", path.join(os.scriptdir(), "patches", "9.2.6", "gcc13.patch"), "71bcb65197442e053ae2a69079bd2b3b8708a0bedf9f4f9a955e72b15720857c")
+    add_patches("9.0.3", "patches/9.0.3/limits.patch", "3bebcd1cac52462b0cf84c8232c3426202c75c944784252b215b4416cbe111db")
+    add_patches("9.2.6", "patches/9.2.6/gcc13.patch", "71bcb65197442e053ae2a69079bd2b3b8708a0bedf9f4f9a955e72b15720857c")
+    add_patches("9.3.1", "patches/9.3.1/msvc.patch", "619ed4145f3b7c727aee168aac04271e6414d314bf49db470de688acc9f49cb8")
 
     add_configs("cuda", {description = "Enable CUDA support.", default = false, type = "boolean"})