<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cbb19ed24410f56a031723b73bd6b22ebe9d1834">https://github.com/macports/macports-ports/commit/cbb19ed24410f56a031723b73bd6b22ebe9d1834</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cbb19ed2441 vtk: update to 9.4.0
</span>cbb19ed2441 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cbb19ed24410f56a031723b73bd6b22ebe9d1834
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Wed Nov 27 04:51:38 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> vtk: update to 9.4.0
</span>---
graphics/vtk/Portfile | 15 ++++-------
graphics/vtk/files/patch-MACH_TASK_BASIC_INFO.diff | 24 -----------------
graphics/vtk/files/patch-use-x11.diff | 30 +++++++++-------------
3 files changed, 17 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/Portfile b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2718650a82..da1aeb2cb71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@ compiler.cxx_standard 2011
</span> compiler.blacklist-append {clang < 900}
name vtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics devel
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,9 @@ master_sites ${homepage}/files/release/${branch}
</span>
distname VTK-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98a2dbf4db1fb92b974f8476490b913718bfd36f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 99964158
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b265f1752ab0be2687ada62e2376177f54ccbbf0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16f3ffd65fafd68fab469bcb091395bf5432617c7db27cbce86a737bf09ec5b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 118611659
</span>
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,11 +63,6 @@ depends_lib-append \
</span>
mpi.enforce_variant hdf5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Re restoring support for legacy macOS, see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11171
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.kitware.com/vtk/vtk/-/issues/19352
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-MACH_TASK_BASIC_INFO.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.pre_args-delete \
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-MACH_TASK_BASIC_INFO.diff b/graphics/vtk/files/patch-MACH_TASK_BASIC_INFO.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f45777cb3d7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-MACH_TASK_BASIC_INFO.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ThirdParty/ioss/vtkioss/Ioss_Utils.C 2023-11-14 07:37:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ThirdParty/ioss/vtkioss/Ioss_Utils.C 2024-05-28 19:48:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -885,12 +885,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kern_return_t error;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_msg_type_number_t outCount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MACH_TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_task_basic_info_data_t taskinfo{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- taskinfo.virtual_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outCount = MACH_TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error = task_info(mach_task_self(), MACH_TASK_BASIC_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinterpret_cast<task_info_t>(&taskinfo), &outCount);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ task_basic_info_data_t taskinfo{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ taskinfo.virtual_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ outCount = TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error = task_info(mach_task_self(), TASK_BASIC_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ reinterpret_cast<task_info_t>(&taskinfo), &outCount);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (error == KERN_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memory_usage = taskinfo.resident_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-use-x11.diff b/graphics/vtk/files/patch-use-x11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 48fbef64c88..9982e376d74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-use-x11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/files/patch-use-x11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> The build system does not seem to consistently respect non-default options.
Fix that in the patch. The following forces X11 on Apple and fixes linking.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2023-11-14 07:37:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2024-05-28 23:18:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-11-25 00:01:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-11-26 18:50:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,8 @@
</span>
if (APPLE)
include(vtkApple)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,20 +11,14 @@ Fix that in the patch. The following forces X11 on Apple and fixes linking.
</span> + set(VTK_USE_X ON FORCE)
endif ()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # must be before the following iOS / Android
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For VTK 9.4.0: It looks like upstream already fixed previous hunk #1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "elseif (VTK_USE_SDL2)". Remove hunk #1, leave hunk #2 in place.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Rendering/OpenGL2/CMakeLists.txt 2023-11-14 07:37:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Rendering/OpenGL2/CMakeLists.txt 2024-05-28 23:22:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OVERRIDE vtkEGLRenderWindow)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(has_vtkRenderWindow_override 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories("${CMAKE_ANDROID_NDK}/sources/android/native_app_glue")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif (EMSCRIPTEN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif (VTK_USE_SDL2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add some custom overrides
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtk_object_factory_declare(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BASE vtkRenderWindow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Rendering/OpenGL2/CMakeLists.txt.orig 2024-11-25 00:01:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Rendering/OpenGL2/CMakeLists.txt 2024-11-26 18:50:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -438,6 +438,7 @@
</span> if (VTK_USE_X)
vtk_module_find_package(PACKAGE X11)
vtk_module_link(VTK::RenderingOpenGL2 PUBLIC X11::X11)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +27,8 @@ Fix that in the patch. The following forces X11 on Apple and fixes linking.
</span> vtk_module_link(VTK::RenderingOpenGL2 PRIVATE X11::Xcursor)
else()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMake/vtkOpenGLOptions.cmake 2023-11-14 07:37:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMake/vtkOpenGLOptions.cmake 2024-05-28 23:20:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMake/vtkOpenGLOptions.cmake.orig 2024-11-25 00:01:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMake/vtkOpenGLOptions.cmake 2024-11-26 18:50:58
</span> @@ -8,12 +8,12 @@
include(CMakeDependentOption)
</pre><pre style='margin:0'>
</pre>