commit: caa03a54281bdc978fdbfb210944139ecedc9708 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Tue Dec 3 12:59:16 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 5 18:01:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa03a54
sci-libs/vtk: update patches Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch | 1 + .../vtk-9.3.0-too-many-initializer-values.patch | 5 +++++ .../vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch | 22 ++++++++++++++++++++++ ...tk-9.3.0-vtkm-drop-template-id-from-cdtor.patch | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch index df2d6fc61167..b69d399f3c2a 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-ThirdParty-gcc15.patch @@ -44,3 +44,4 @@ Subject: [PATCH] include cstdint + correct case/words #include <type_traits> #include <cstddef> #include <memory> + diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch index 52c37250c7e7..4be0e88b769c 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch @@ -1,3 +1,8 @@ +From: Paul Zander <negril.nx+gen...@gmail.com> +Subject: [PATCH] vtkm: too many initializer values + +Signed-off-by: Paul Zander <negril.nx+gen...@gmail.com> + --- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx +++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx @@ -334,7 +334,7 @@ diff --git a/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch b/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch new file mode 100644 index 000000000000..6a913a551315 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-update-for-cuda-12.6.patch @@ -0,0 +1,22 @@ +From f568d669465f5825006be2fba8a117060e832618 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gen...@gmail.com> +Date: Sun, 8 Sep 2024 22:27:09 +0200 +Subject: [PATCH] update for cuda 12.6 + +https://github.com/NVIDIA/cccl/commit/733eb94a2b98b8d5b5ab1e39cbd8ac1aed9173ec + +Bug: https://bugs.gentoo.org/938673 +Signed-off-by: Paul Zander <negril.nx+gen...@gmail.com> + +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/WrappedOperators.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/WrappedOperators.h +@@ -195,7 +195,7 @@ namespace detail + // + template <typename T, typename F> + struct is_commutative<vtkm::exec::cuda::internal::WrappedBinaryOperator<T, F>> +- : public thrust::detail::is_arithmetic<T> ++ : public ::cuda::std::is_arithmetic<T> + { + }; + } + diff --git a/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch b/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch new file mode 100644 index 000000000000..ddca73f492a6 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch @@ -0,0 +1,20 @@ +From e9977b71f31525aea5084b3fef9c2bd4c9ad93f1 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gen...@gmail.com> +Date: Sat, 7 Sep 2024 13:29:24 +0200 +Subject: [PATCH] vtkm: drop template-id from cdtor + +warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] + +Signed-off-by: Paul Zander <negril.nx+gen...@gmail.com> + +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h +@@ -31,7 +31,7 @@ class RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP> + : public vtkm::cont::internal::RuntimeDeviceConfigurationBase + { + public: +- RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP>() ++ RuntimeDeviceConfiguration() + : HardwareMaxThreads(InitializeHardwareMaxThreads()) + , CurrentNumThreads(this->HardwareMaxThreads) + {
