Bump

2025-06-06 03:35:14 +02:00
parent b56141d74d
commit 0dba7be35f
91 changed files with 5377 additions and 809 deletions
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -7,11 +7,18 @@ AUX vtk-9.3.0-opencascade-7.8.0.patch 819 BLAKE2B 51f4af785af5f44b21b641a631fe63
 AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a777742492dfe0cb1e93b597c23e78406e4783b3cdff23ffcac81655efa370bb3746a69d166edd138ec45beeb5c09 SHA512 1a0da4ffb822a038a13201d83f1cf6b42d4438073ea35fe3654d9e907e20c12306b47a511b72cb843097327a186b36560e2590ded47ce73aa8eb5a7655664236
 AUX vtk-9.3.0-update-for-cuda-12.6.patch 779 BLAKE2B 406dc4e2f57009351819d6536eb82ca9566c0544fe664e8a7867f5a36e67e084dbcb3dc60e151db4ef53c881465cd49d604b9b039ff69dfd3e4e8fe420ef0240 SHA512 d293b2a741a6042c30e835d7aa1071344d7813d07099f913d4ca5e4e728f31df233a50bed6a787d712a5eea8fb2396d9bfb4192f71fe7cff927ea1a0332b260a
 AUX vtk-9.3.1-fix-fmt-11.patch 2450 BLAKE2B 91ce3cb941b7a1bf4c1098f582db146bb39b8260c285578c1e0473a652d563d42664592c47f20cd9f67c4dd7f2f2db4d17ff2dd7430441459664569a19cbf601 SHA512 f1567d4320ea591c7ad0015b0922c1b4a97d628242ee33ca573edb68bbafb8a32a783e955e0bc2ac5a23fe3606239510a956f67ae0b89c914570d8a0c0276f88
+AUX vtk-9.4.2-ThirdParty-gcc15.patch 2478 BLAKE2B 2290776ef9fdf6a521b81c1eb4bb8ec5fa4751774faff93bfe4860103a06d4d67e51d82b603592c33e25067824adda696e6b431d77ab621869d67d99dad9b13d SHA512 4f2a3e2d288501286cfb1bc66ad879e002bc7e73f65a1e2a1f0ec584a368c81386b289237dcb869dd5e8d7b2f54141791c62eaeeab3935f5db1aa4da81e0ed2e
+AUX vtk-9.4.2-find-hdf5-in-global-scope.patch 730 BLAKE2B 494d00e8f4c14fc5e453b2e1cdf873f589577cd49e529490657dee602456340bc01cfbffbcf2df77d528c351d26e03060821a32cc5e5827a9dcf0693f7e0fcf2 SHA512 b68d5303c89a6c016618d7f19ecbd5b38bee800af1089d692861a12edbbb69913fa7c93d28d3e7110ad88c6061484dd257e28a69170b6c45c2dbda98d9229bf2
+AUX vtk-9.4.2-fix-fmt-11.patch 1076 BLAKE2B fb12871b42f18d1f5570a3212727dc9b618429347f0790ddf706502263fa660611857f26af4a0f256229865e17eeaa603fea242ed1c5ea9f47f9c8946065d060 SHA512 9a0d82a419bb0dce133a6b465dfb5f7b3fb78b195c893af173417e0b1be9d58c55edda717e921d91c9347c61c3bd8869a7a53df91df99d9f4412d9f10c2e630b
+AUX vtk-9.4.2-opencascade-components.patch 499 BLAKE2B 8b55cef2648f5636ed3dad757aebad9e751aa30aa0d8fe311f209f2f965889761eba2bc27deb3df7506999418fdfa48b3582498f27f5b2c2533944f0ade3b1aa SHA512 17db1158ac94d76d70957553b2ce60203c8b0e55bac7a1b99937602ce890c2e236f52f935ecc9c2c8edb9e583ec14d07fb2f64a25066fc19815a0b3c006f318b
+AUX vtk-9.4.2-pegtl-3.x.patch 1550 BLAKE2B b85abe242f301a19b4cc0b10a00c5c90b057a851441ceb9ff3632eafe276edff1da2256e910dc356b4d2cda28deb991972130b1b36e0e76febfc3af2cfa503ad SHA512 83da53e98db18a59de4fe1f0eb4260d6b6f9d489105da295de5d81f9ca1ed0b81b0401e3b1fa2ce1ad868f59a6d7b16164a57dde032f9413b0dab8084984a064
+AUX vtk-9.4.2-vtk-m-jobpool-size.patch 708 BLAKE2B 3f68633bb058d59ce2fdd4a8eb3c517b263de42032aef7b448d0a745362a39af727d2e3b0c479d15a99bc7812b46f59c3618212de7e0d1e09e80a7f56ef0f7c7 SHA512 2f3534a9f7e7d8cc84bafedcdbc570d4eb04e47105efea263c44a1f7dcd886e40f734eec9a0eb87ad72c7535538d74de70f50d579f3a2d6c075391a8b1c50205
 DIST VTK-9.3.1.tar.gz 99964158 BLAKE2B b85aae0aef1a22bd0496e0f5d2c7d3a5c20bbd7db8951ab1f9fe29a48c01ce960e90dc85f36cb6858c2b7dfd7f12cd1cf2e7d0fbb115fc9fd709dd7b481c598e SHA512 5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3
 DIST VTKData-9.3.1.tar.gz 612744946 BLAKE2B 6b3a09f6cc98630e817aaeca8094c6a6625372269abfa9003212cd1cdbc101b198f5eeb3474ca675be7f03046c58a5d11b4092ab19ed230422c4100011abfee4 SHA512 befc6b68e33d2c2fb6928006d4fe6feda7e0bbaf31df4488911ab8e3865e3fc1cf3834301301aa2b6de94c4489eebf5e2e8521e8830315d2a1f0e65cb73a6fd3
 DIST VTKDataFiles-9.3.1.tar.gz 628903288 BLAKE2B cf5919a627ee49809f79d29577d65a48c3332255551c3c229875b25fce911c75c3edeca8d0dfdf9926f93543963ab0e2c992c7469e2c9eed041c39cfd995647d SHA512 360fadd31ab304a27b208745c674eb31759552e98f587569f481c1bda62c7f8ae72598cd40b2c628bb211aace8f62df2ea7ca66f192f8d2e71bca7a4deaa9e89
 DIST VTKLargeData-9.3.1.tar.gz 247523669 BLAKE2B 88ec5046f502db14dd6a26ef81e386babaf560619e16d769834e96046eab46cf762d8c80f9b51c434b77e4e145d8f60e32efbdb4f57d8305494177abec0806ef SHA512 edf5610edfae90f8465d68e0e06e82018978ba27f5b2ae9701939aeb72019acaabeda435c15787f1c4828b44e34c79e2837565a81d6a3accd368a92c6eacebd1
 DIST VTKLargeDataFiles-9.3.1.tar.gz 247505524 BLAKE2B 5de069309c59a8a73365fb9faba9904189d723fb72976f372e40db3eb100342a19fecd582bd0aa42fc1012675b442a8e42611632004d6b6d6708468c27a4265e SHA512 bbbf0c193432cb5d8a5618c41e66609c7e6f3e4f24f588124c46b537ecec28b5670420b7f77185da534e4098f8b95d8ec4e392fc017df934a84bfc9dc833f634
 DIST vtkDocHtml-9.3.1.tar.gz 165542400 BLAKE2B da8084137b2848f82bf091535950738bd718e65cac8f461fdfb8e9c63ef6db68acfa02655531c8fe22e35f89395d2d066aa5b051abac0e774883552c898de6d9 SHA512 de0d2153c97864b49a8b99e6fbfc8bab78c1522d25bf40ed1f271a8bb4f1f205b008d6bd39f835816972c8439d01f78b68f34d1f88f87755174f0d559841ba29
+EBUILD vtk-9.3.1-r1.ebuild 34578 BLAKE2B 92e101faa90957b83c47d509695503de3b1721b8e3f45f70a89a9a0985f1b915a85517bfecfa6292f050a839f090a851adecc0474cb523614e69306da75b9ed0 SHA512 dc1645a214850d00be40ceba246e7a21f276e386685c17705a81dfe507a657e59e67a23b0f1b2bef42e72bed8de28cf513ffbe893e1bd2f06df3bb9151212062
 EBUILD vtk-9.3.1.ebuild 34551 BLAKE2B de8ccdc6c7fe67148bf1df104bf6549669fba842ed3b483fb6bcd98b5f3c6d53c236ab363b68fc1240611230eecc6cd7faeb5e91dacf1f98831e1f36ac65aab5 SHA512 dc0896391c8c716dc6e6588aed121842cca755912d856c7251ba5dfe7e9443723c7ef23d43974ffd55c81f94401bf199927179fdc2c6aa6f4116512dbd392c42
 MISC metadata.xml 1699 BLAKE2B befce4e1f61b6cb0d772a2826ed9349cf36832ebc0507edc2dff658441b44be351c1fe97c74ac9b21eed8310a254dd2a3b408bc93a15c4b2db8cd55a5e3f703a SHA512 d9921a30c66ef3a3d2a27da1add22a29352cd3fd71c49e834523931b8edf21ca0d785290cddabbe29b068ce00fa05a898c331a1ad80ffaa190e9f92b1a1ab64d
--- a/sci-libs/vtk/files/vtk-9.4.2-ThirdParty-gcc15.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-ThirdParty-gcc15.patch
@@ -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
--- a/sci-libs/vtk/files/vtk-9.4.2-find-hdf5-in-global-scope.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-find-hdf5-in-global-scope.patch
@@ -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
+
--- a/sci-libs/vtk/files/vtk-9.4.2-fix-fmt-11.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-fix-fmt-11.patch
@@ -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
+
--- a/sci-libs/vtk/files/vtk-9.4.2-opencascade-components.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-opencascade-components.patch
@@ -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
--- a/sci-libs/vtk/files/vtk-9.4.2-pegtl-3.x.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-pegtl-3.x.patch
@@ -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
+
--- a/sci-libs/vtk/files/vtk-9.4.2-vtk-m-jobpool-size.patch
+++ b/sci-libs/vtk/files/vtk-9.4.2-vtk-m-jobpool-size.patch
@@ -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)
--- a/sci-libs/vtk/vtk-9.3.1-r1.ebuild
+++ b/sci-libs/vtk/vtk-9.3.1-r1.ebuild