dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump

Browse Source
This commit is contained in:
Mario Fetka
2025-06-06 03:35:14 +02:00
parent b56141d74d
commit 0dba7be35f
91 changed files with 5377 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sci-libs/vtk/files/vtk-9.4.2-ThirdParty-gcc15.patch Normal file
View File

@@ -0,0 +1,46 @@
From d00b98bd8ef02f854f1068e8ab8fd2fb28244c3b Mon Sep 17 00:00:00 2001
From: Ted Rodgers <ted.d.rodgers@gmail.com>
Date: Sat, 10 Aug 2024 16:13:09 -0400
Subject: [PATCH] include cstdint + correct case/words
--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
@@ -11402,7 +11402,7 @@ public:
VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const
{
- return this->CellFacePortal.Get(pointIndex);
+ return this->CellEdgesPortal.Get(pointIndex);
}
private:
--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
auto whichIterationPortal = this->WhichIteration.ReadPortal();
- auto whichRoundPortal = this->whichRound.ReadPortal();
+ auto whichRoundPortal = this->WhichRound.ReadPortal();
auto superarcsPortal = this->Superarcs.ReadPortal();
auto superparentsPortal = this->Superparents.ReadPortal();
for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha
if (contourtree_augmented::NoSuchElement(superarcTo))
{ // no superarc
// if it occurred on the final round, it's the global root and is shown as the NULL node
- if (whichRoundPortal.Get(superarcFrom) == this->NRounds)
+ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
{ // root node
outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
<< " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";
--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp
+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/itlib/small_vector.hpp
@@ -140,6 +140,7 @@
#include <type_traits>
#include <cstddef>
+#include <cstdint>
#include <memory>
#define ITLIB_SMALL_VECTOR_ERROR_HANDLING_NONE 0

26
sci-libs/vtk/files/vtk-9.4.2-find-hdf5-in-global-scope.patch Normal file
View File

@@ -0,0 +1,26 @@
From b16f4381d0cdc147e4aff0b6f1fdbac3bbf1de7d Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx@gmail.com>
Date: Fri, 25 Apr 2025 00:32:48 +0200
Subject: [PATCH] find hdf5 in global scope
Signed-off-by: Paul Zander <negril.nx@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96bb1d4..c5d8e09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,6 +419,11 @@ if (VTK_FORBID_DOWNLOADS AND VTK_BUILD_TESTING)
"copy of the testing data.")
endif ()
+if(VTK_MODULE_ENABLE_VTK_hdf5 STREQUAL "WANT" OR
+ VTK_MODULE_ENABLE_VTK_hdf5 STREQUAL "YES")
+ find_package(HDF5 REQUIRED NO_MODULE COMPONENTS HL)
+endif()
+
include(vtkModule)
include(vtkModuleDebugging)
set(vtk_source_directories
--
2.49.0

34
sci-libs/vtk/files/vtk-9.4.2-fix-fmt-11.patch Normal file
View File

@@ -0,0 +1,34 @@
From 4eaf66f11bb80c0f805fd3361cdd9b412aabe796 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 14 Jan 2025 14:00:01 +0100
Subject: [PATCH] fix fmt-11
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/ThirdParty/ioss/vtkioss/Ioss_Field.C b/ThirdParty/ioss/vtkioss/Ioss_Field.C
index fbb2100..8909eef 100644
--- a/ThirdParty/ioss/vtkioss/Ioss_Field.C
+++ b/ThirdParty/ioss/vtkioss/Ioss_Field.C
@@ -12,6 +12,7 @@
#include <cstdint>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
+#include VTK_FMT(fmt/ranges.h)
#include <iostream>
#include <string>
#include <vector>
diff --git a/ThirdParty/ioss/vtkioss/Ioss_VariableType.C b/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
index b081dc3..4f1a841 100644
--- 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 <map>
#include <sstream>
#include <string>
--
2.48.0

12
sci-libs/vtk/files/vtk-9.4.2-opencascade-components.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/IO/OCCT/CMakeLists.txt b/IO/OCCT/CMakeLists.txt
index 836d545..2cf67a8 100644
--- a/IO/OCCT/CMakeLists.txt
+++ b/IO/OCCT/CMakeLists.txt
@@ -2,6 +2,7 @@ vtk_module_find_package(
PACKAGE OpenCASCADE
FORWARD_VERSION_REQ EXACT
VERSION_VAR "@OpenCASCADE_MAJOR_VERSION@.@OpenCASCADE_MINOR_VERSION@.@OpenCASCADE_MAINTENANCE_VERSION@"
+ COMPONENTS FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
)
set(opencascade_req_targets

40
sci-libs/vtk/files/vtk-9.4.2-pegtl-3.x.patch Normal file
View File

@@ -0,0 +1,40 @@
From 8bdf05fd255e0d07fdc61c2b04a5333c9e8dc729 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Tue, 14 Jan 2025 12:41:12 +0100
Subject: [PATCH] fix pegtl-3.x
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/Common/DataModel/vtkCellAttribute.cxx b/Common/DataModel/vtkCellAttribute.cxx
index 3c022ef..1ed1f66 100644
--- a/Common/DataModel/vtkCellAttribute.cxx
+++ b/Common/DataModel/vtkCellAttribute.cxx
@@ -595,10 +595,10 @@ bool vtkCellAttribute::DecodeSpace(
{
if (!quiet)
{
- const auto p = err.positions.front();
+ const auto p = err.positions().front();
vtkGenericWarningMacro("Attribute Space: " << err.what() << "\n"
- << in.line_at(p) << "\n"
- << std::string(p.byte_in_line, ' ') << "^\n");
+ << std::string(in.line_at(p)) << "\n"
+ << std::string(p.column, ' ') << "^\n");
}
return false;
}
diff --git a/ThirdParty/pegtl/Testing/Cxx/TestIncludePEGTL.cxx b/ThirdParty/pegtl/Testing/Cxx/TestIncludePEGTL.cxx
index 866b313..b324d26 100644
--- a/ThirdParty/pegtl/Testing/Cxx/TestIncludePEGTL.cxx
+++ b/ThirdParty/pegtl/Testing/Cxx/TestIncludePEGTL.cxx
@@ -1,6 +1,6 @@
#include "vtk_pegtl.h"
// clang-format off
-#include VTK_PEGTL(pegtl/contrib/tracer.hpp)
+#include VTK_PEGTL(pegtl/contrib/trace.hpp)
// clang-format on
#include <cstdlib>
--
2.48.0

13
sci-libs/vtk/files/vtk-9.4.2-vtk-m-jobpool-size.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmWrappers.cmake b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmWrappers.cmake
index 10ba21e..e88299e 100644
--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmWrappers.cmake
+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmWrappers.cmake
@@ -175,7 +175,7 @@ function(vtkm_setup_job_pool)
# will require 3GB of memory. To allow for other NON VTK-m jobs we leave at
# least 3GB of memory as 'slop'.
cmake_host_system_information(RESULT vtkm_mem_ QUERY TOTAL_PHYSICAL_MEMORY)
- math(EXPR vtkm_pool_size "(${vtkm_mem_}/3072)-1")
+ math(EXPR vtkm_pool_size "(${vtkm_mem_}/10240 - 3072)-1")
if (vtkm_pool_size LESS 1)
set(vtkm_pool_size 1)