From ded9717095600a356b624cab03326e44764afed4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Jun 2024 02:07:09 +0200 Subject: [PATCH] [VTK/paraview] update to 5.12.1 (#39352) --- ports/paraview/portfile.cmake | 14 +-- ports/paraview/vcpkg.json | 2 +- ports/vtk/10945.diff | 195 ---------------------------------- ports/vtk/10972.diff | 151 -------------------------- ports/vtk/iotr.patch | 14 +++ ports/vtk/ot-dep.patch | 33 ------ ports/vtk/portfile.cmake | 14 +-- ports/vtk/vcpkg.json | 3 +- versions/baseline.json | 6 +- versions/p-/paraview.json | 5 + versions/v-/vtk.json | 5 + 11 files changed, 39 insertions(+), 403 deletions(-) delete mode 100644 ports/vtk/10945.diff delete mode 100644 ports/vtk/10972.diff delete mode 100644 ports/vtk/ot-dep.patch diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 1d80486c85..c387c9fda2 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -50,8 +50,8 @@ index f1897d6f719c3b61b6d4fa317966c007dab2fc23..e88d7c89198696832e5645bfb0e758fd vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView - REF b701926ba2bd753eff36aec56e36ad4d5ac3168b # v5.12.0 - SHA512 9fbebfa11b60c81deec0df7508a0433a1bced620367477e15314e232d50ba6a6196074d3d701434652cb9a2e0c946159f44e8e16682aa6326a89ebd6caa1f5d9 + REF 8751c670e2aac949f17dd701a5a2f13849afafb2 # v5.12.1 + SHA512 ed7b7e183c9d1350d8d2feadf7b76bef939bc657f49e5160e2e96e2329642d8ba1c0a8ab7cb58ff068ba21b7adc3f52676b38779e1ecec31b4714184c2364072 HEAD_REF master PATCHES ${ext_vtk_patch_copy} @@ -72,9 +72,9 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH VISITIT_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/visitbridge - REF 92ad478e3d6b18b111ef45ab76d6dad5d3530381 - SHA512 c4893929b99419a365e90450f9c6d8a72f30f88aadbfe5c7d23ec4a46e9cf301e0b9c31cd602d1ab717ffb6744ae45abe41cb0e9c1f02b83e4468c702e8d023d - PATCHES + REF 093ea1dfddbb3266554ece823ae8d7dedc66eb3f + SHA512 0fd5dd3fbc8e61123dedb8e30b3150109ef855bc398d01ed0defe0c560692c91231ff72568ee6a1840edc21d6ea3c9c164dbeb29b8590315ee5c153a3d77d568 + PATCHES ${VisItPatches} ) #VTK_MODULE_USE_EXTERNAL_ParaView_protobuf @@ -84,8 +84,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH QTTESTING_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/qttesting - REF 9d4346485cfce79ad448f7e5656b2525b255b2ca # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6 - SHA512 7561cd66e1a12053b7a81ab7a80ad2163922995317a503761521151668a905602fb1bb23c963e18d2739d17aa4187ccf1b4bd1010b0494aab6d4fc004e0e9760 + REF 375c33053704e2d99dda4d2e1dfc9f6f85b3e73f + SHA512 4d42352394017f4a07ed96dea6b5c0caf3bc6b22bbe0c8f5df6d2740cb7b2946e0b04ac7b79b88bc7c4281bb8d48071878f42c41c042de8ef6979818d26490e5 ) vcpkg_from_gitlab( diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index fe359ae7c6..d8b4f28b15 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "paraview", - "version": "5.12.0", + "version": "5.12.1", "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "license": "BSD-3-Clause", diff --git a/ports/vtk/10945.diff b/ports/vtk/10945.diff deleted file mode 100644 index 404bb0be71..0000000000 --- a/ports/vtk/10945.diff +++ /dev/null @@ -1,195 +0,0 @@ -diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake -index d8282ff98f79548e66a1794c7daf9cd253f0a9e5..7163c690b069c3176a9c921d7799b105bb4b1825 100644 ---- a/CMake/vtkModule.cmake -+++ b/CMake/vtkModule.cmake -@@ -129,6 +129,73 @@ function (_vtk_module_split_module_name name prefix) - PARENT_SCOPE) - endfunction () - -+#[==[.rst: -+.. cmake:command:: _vtk_module_optional_dependency_exists -+ -+ Detect whether an optional dependency exists or not. -+ |module-internal| -+ -+ Optional dependencies need to be detected -+ namespace and target name part. -+ -+ .. code-block:: cmake -+ -+ _vtk_module_split_module_name( -+ SATISFIED_VAR -+ [PACKAGE ]) -+ -+ The result will be returned in the variable specified by ``SATISFIED_VAR``. If -+ ``PACKAGE`` is not given, ``_vtk_build_PACKAGE`` will be used if defined, -+ otherwise an error will be raised. -+#]==] -+function (_vtk_module_optional_dependency_exists dependency) -+ cmake_parse_arguments(_vtk_optional_dep -+ "" -+ "SATISFIED_VAR;PACKAGE" -+ "" -+ ${ARGN}) -+ -+ if (_vtk_optional_dep_UNPARSED_ARGUMENTS) -+ message(FATAL_ERROR -+ "Unparsed arguments for `_vtk_module_optional_dependency_exists`: " -+ "${_vtk_optional_dep_UNPARSED_ARGUMENTS}") -+ endif () -+ -+ if (NOT _vtk_optional_dep_PACKAGE) -+ if (NOT DEFINED _vtk_build_PACKAGE) -+ message(FATAL_ERROR -+ "The `PACKAGE` argument is required outside of `vtk_module_build` " -+ "usage.") -+ endif () -+ set(_vtk_optional_dep_PACKAGE -+ "${_vtk_build_PACKAGE}") -+ endif () -+ -+ if (NOT _vtk_optional_dep_SATISFIED_VAR) -+ message(FATAL_ERROR -+ "The `SATISFIED_VAR` argument is required.") -+ endif () -+ -+ set(_vtk_optional_dep_satisfied 0) -+ if (TARGET "${dependency}") -+ _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse) -+ if (_vtk_optional_dep_PACKAGE STREQUAL _vtk_optional_dep_parse_NAMESPACE) -+ set(_vtk_optional_dep_satisfied 1) -+ else () -+ set(_vtk_optional_dep_found_var -+ "${_vtk_optional_dep_parse_NAMESPACE}_${_vtk_optional_dep_parse_TARGET_NAME}_FOUND") -+ if (DEFINED "${_vtk_optional_dep_found_var}" AND -+ ${_vtk_optional_dep_found_var}) -+ set(_vtk_optional_dep_satisfied 1) -+ endif () -+ endif () -+ endif () -+ -+ set("${_vtk_optional_dep_SATISFIED_VAR}" -+ "${_vtk_optional_dep_satisfied}" -+ PARENT_SCOPE) -+endfunction () -+ - #[==[.rst: - - .. _module-parse-module: -@@ -2827,8 +2894,12 @@ function (vtk_module_build) - get_property(_vtk_build_kit_module_optional_depends GLOBAL - PROPERTY "_vtk_module_${_vtk_build_kit_module}_optional_depends") - foreach (_vtk_build_kit_module_private_depend IN LISTS _vtk_build_kit_module_private_depends _vtk_build_kit_module_optional_depends) -- if (NOT TARGET "${_vtk_build_kit_module_private_depend}") -- continue () -+ if (_vtk_build_kit_module_private_depend IN_LIST _vtk_build_kit_module_optional_depends) -+ _vtk_module_optional_dependency_exists("${_vtk_build_kit_module_private_depend}" -+ SATISFIED_VAR _vtk_build_kit_module_has_optional_dep) -+ if (NOT _vtk_build_kit_module_has_optional_dep) -+ continue () -+ endif () - endif () - - # But we don't need to link to modules that are part of the kit we are -@@ -4124,7 +4195,9 @@ function (vtk_module_add_module name) - get_property(_vtk_add_module_optional_depends GLOBAL - PROPERTY "_vtk_module_${_vtk_build_module}_optional_depends") - foreach (_vtk_add_module_optional_depend IN LISTS _vtk_add_module_optional_depends) -- if (TARGET "${_vtk_add_module_optional_depend}") -+ _vtk_module_optional_dependency_exists("${_vtk_add_module_optional_depend}" -+ SATISFIED_VAR _vtk_add_module_optional_depend_exists) -+ if (_vtk_add_module_optional_depend_exists) - set(_vtk_add_module_optional_depend_link "${_vtk_add_module_optional_depend}") - if (_vtk_add_module_build_with_kit) - get_property(_vtk_add_module_optional_depend_kit GLOBAL -@@ -4149,7 +4222,7 @@ function (vtk_module_add_module name) - string(REPLACE "::" "_" _vtk_add_module_optional_depend_safe "${_vtk_add_module_optional_depend}") - target_compile_definitions("${_vtk_add_module_real_target}" - PRIVATE -- "VTK_MODULE_ENABLE_${_vtk_add_module_optional_depend_safe}=$") -+ "VTK_MODULE_ENABLE_${_vtk_add_module_optional_depend_safe}=$") - endforeach () - - if (_vtk_add_module_private_depends_forward_link) -@@ -4801,10 +4874,12 @@ function (vtk_module_add_executable name) - get_property(_vtk_add_executable_optional_depends GLOBAL - PROPERTY "_vtk_module_${_vtk_build_module}_optional_depends") - foreach (_vtk_add_executable_optional_depend IN LISTS _vtk_add_executable_optional_depends) -+ _vtk_module_optional_dependency_exists("${_vtk_add_executable_optional_depend}" -+ SATISFIED_VAR _vtk_add_executable_optional_depend_exists) - string(REPLACE "::" "_" _vtk_add_executable_optional_depend_safe "${_vtk_add_executable_optional_depend}") - target_compile_definitions("${_vtk_add_executable_target_name}" - PRIVATE -- "VTK_MODULE_ENABLE_${_vtk_add_executable_optional_depend_safe}=$") -+ "VTK_MODULE_ENABLE_${_vtk_add_executable_optional_depend_safe}=$") - endforeach () - - if (_vtk_module_warnings) -@@ -5135,6 +5210,12 @@ while (_vtk_module_find_package_components_to_check) - list(APPEND _vtk_module_find_package_components_checked - \"\${_vtk_module_component}\") - -+ # Any 'components' with `::` are not from our package and must have been -+ # provided/satisfied elsewhere. -+ if (_vtk_module_find_package_components MATCHES \"::\") -+ continue () -+ endif () -+ - list(APPEND _vtk_module_find_package_components - \"\${_vtk_module_component}\") - if (\${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_\${_vtk_module_component}) -diff --git a/CMake/vtkModuleTesting.cmake b/CMake/vtkModuleTesting.cmake -index 4d91c569e63e1d7c7747fa25da30903645cb9b84..55ebd2651e9c329b05d8b12a9cfad6ea87e74b26 100644 ---- a/CMake/vtkModuleTesting.cmake -+++ b/CMake/vtkModuleTesting.cmake -@@ -79,13 +79,15 @@ function (vtk_module_test_executable name) - PROPERTY "_vtk_module_${_vtk_build_test}_test_optional_depends") - set(optional_depends_flags) - foreach (test_optional_depend IN LISTS test_optional_depends) -- if (TARGET "${test_optional_depend}") -+ _vtk_module_optional_dependency_exists("${test_optional_depend}" -+ SATISFIED_VAR test_optional_depend_exists) -+ if (test_optional_depend_exists) - list(APPEND test_depends - "${test_optional_depend}") - endif () - string(REPLACE "::" "_" safe_test_optional_depend "${test_optional_depend}") - list(APPEND optional_depends_flags -- "VTK_MODULE_ENABLE_${safe_test_optional_depend}=$") -+ "VTK_MODULE_ENABLE_${safe_test_optional_depend}=$") - endforeach () - - if (_vtk_build_UTILITY_TARGET) -diff --git a/Documentation/release/dev/better-optional-deps-checks.md b/Documentation/release/dev/better-optional-deps-checks.md -new file mode 100644 -index 0000000000000000000000000000000000000000..2ce1e98d95dc247a8912dc1b976f592548a83d49 ---- /dev/null -+++ b/Documentation/release/dev/better-optional-deps-checks.md -@@ -0,0 +1,3 @@ -+## better-optional-deps-checks -+ -+Optional dependencies now have better logic for detecting the usability of external optional dependencies. -diff --git a/Testing/External/CMakeLists.txt b/Testing/External/CMakeLists.txt -index 8d2de9844d979c3298b8fe337f428dbe12b86191..510620f7616f9152f4dfb8f364579a1c3bf1bcdb 100644 ---- a/Testing/External/CMakeLists.txt -+++ b/Testing/External/CMakeLists.txt -@@ -53,6 +53,7 @@ vtk_module_scan( - - # Input information for test build files. - option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF) -+set(_vtk_build_PACKAGE "VTK") - set(_vtk_build_TEST_DATA_TARGET "VTKData") - set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing") - set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing") -diff --git a/Testing/ExternalWheel/CMakeLists.txt b/Testing/ExternalWheel/CMakeLists.txt -index 518380d5370a9b0b61e0d0f48ae751a81b595098..c9c984578b682f1a6a605b3546e826b63f9c88ea 100644 ---- a/Testing/ExternalWheel/CMakeLists.txt -+++ b/Testing/ExternalWheel/CMakeLists.txt -@@ -82,6 +82,7 @@ endforeach () - - # Input information for test build files. - option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF) -+set(_vtk_build_PACKAGE "VTK") - set(_vtk_build_TEST_DATA_TARGET "VTKData") - set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing") - set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing") diff --git a/ports/vtk/10972.diff b/ports/vtk/10972.diff deleted file mode 100644 index 586520f309..0000000000 --- a/ports/vtk/10972.diff +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in -index 30479050f9d2e4d3123844debbb807df18905a45..48e0ee709f2dce6f23e2365fe65e5f4f4fa444f2 100644 ---- a/CMake/vtk-config.cmake.in -+++ b/CMake/vtk-config.cmake.in -@@ -236,8 +236,18 @@ if (${CMAKE_FIND_PACKAGE_NAME}_WRAP_JAVA) - endif () - endif () - -+set(_vtk_search_components -+ ${${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS}) -+if (NOT _vtk_search_components) -+ set(_vtk_search_components -+ ${${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS}) -+endif () -+list(REMOVE_ITEM _vtk_search_components -+ # These components need to always be requested explicitly since they are -+ # not modules. -+ @_vtk_non_module_components@) - set(_vtk_components_to_check) --foreach (_vtk_component IN LISTS "${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS") -+foreach (_vtk_component IN LISTS _vtk_search_components) - if (DEFINED "${CMAKE_FIND_PACKAGE_NAME}_${_vtk_component}_FOUND") - # It was already not-found (likely due to `find-package` failures). - elseif (TARGET "${CMAKE_FIND_PACKAGE_NAME}::${_vtk_component}") -@@ -250,6 +260,7 @@ foreach (_vtk_component IN LISTS "${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS") - endif () - endforeach () - unset(_vtk_component) -+unset(_vtk_search_components) - - while (_vtk_components_to_check) - list(GET _vtk_components_to_check 0 _vtk_component) -diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake -index 7163c690b069c3176a9c921d7799b105bb4b1825..ed7e398aa56cdaa079e688a8bfae96b9b97b6919 100644 ---- a/CMake/vtkModule.cmake -+++ b/CMake/vtkModule.cmake -@@ -140,13 +140,10 @@ endfunction () - - .. code-block:: cmake - -- _vtk_module_split_module_name( -- SATISFIED_VAR -- [PACKAGE ]) -+ _vtk_module_optional_dependency_exists( -+ SATISFIED_VAR ) - -- The result will be returned in the variable specified by ``SATISFIED_VAR``. If -- ``PACKAGE`` is not given, ``_vtk_build_PACKAGE`` will be used if defined, -- otherwise an error will be raised. -+ The result will be returned in the variable specified by ``SATISFIED_VAR``. - #]==] - function (_vtk_module_optional_dependency_exists dependency) - cmake_parse_arguments(_vtk_optional_dep -@@ -161,16 +158,6 @@ function (_vtk_module_optional_dependency_exists dependency) - "${_vtk_optional_dep_UNPARSED_ARGUMENTS}") - endif () - -- if (NOT _vtk_optional_dep_PACKAGE) -- if (NOT DEFINED _vtk_build_PACKAGE) -- message(FATAL_ERROR -- "The `PACKAGE` argument is required outside of `vtk_module_build` " -- "usage.") -- endif () -- set(_vtk_optional_dep_PACKAGE -- "${_vtk_build_PACKAGE}") -- endif () -- - if (NOT _vtk_optional_dep_SATISFIED_VAR) - message(FATAL_ERROR - "The `SATISFIED_VAR` argument is required.") -@@ -178,16 +165,22 @@ function (_vtk_module_optional_dependency_exists dependency) - - set(_vtk_optional_dep_satisfied 0) - if (TARGET "${dependency}") -- _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse) -- if (_vtk_optional_dep_PACKAGE STREQUAL _vtk_optional_dep_parse_NAMESPACE) -- set(_vtk_optional_dep_satisfied 1) -- else () -+ # If the target is imported, we check its `_FOUND` variable. If it is not -+ # imported, we assume it is set up properly as a normal target (or an -+ # `ALIAS`). -+ get_property(_vtk_optional_dep_is_imported -+ TARGET "${dependency}" -+ PROPERTY IMPORTED) -+ if (_vtk_optional_dep_is_imported) -+ _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse) - set(_vtk_optional_dep_found_var - "${_vtk_optional_dep_parse_NAMESPACE}_${_vtk_optional_dep_parse_TARGET_NAME}_FOUND") - if (DEFINED "${_vtk_optional_dep_found_var}" AND - ${_vtk_optional_dep_found_var}) - set(_vtk_optional_dep_satisfied 1) - endif () -+ else () -+ set(_vtk_optional_dep_satisfied 1) - endif () - endif () - -diff --git a/Filters/Parallel/Testing/Python/CMakeLists.txt b/Filters/Parallel/Testing/Python/CMakeLists.txt -index a59308d5bda968bbc4864eaae45fa1cfb677e1a3..90db33b578d570d1d8a75ab0d82f29781250c4a8 100644 ---- a/Filters/Parallel/Testing/Python/CMakeLists.txt -+++ b/Filters/Parallel/Testing/Python/CMakeLists.txt -@@ -8,9 +8,9 @@ vtk_add_test_python(TestIntegrateAttributes.py NO_OUTPUT NO_VALID NO_RT) - vtk_add_test_python(TestRemoveGhosts.py NO_DATA NO_OUTPUT NO_VALID NO_RT) - vtk_add_test_python(TestResamplingInterpolator.py) - --if(TARGET pvtkpython) -+if(TARGET VTK::pvtkpython) - add_test(NAME vtkFiltersParallelPython-testTransmit - COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} -- $ ${CMAKE_CURRENT_SOURCE_DIR}/testTransmit.py -+ $ ${CMAKE_CURRENT_SOURCE_DIR}/testTransmit.py - ${VTK_MPI_POSTFLAGS}) - endif() -diff --git a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt -index 87033ff51b7631ce556aeef42b94430d467a0549..9fa4fd126e753d025357a41c945f0a4fcbfe9ebc 100644 ---- a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt -+++ b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt -@@ -121,7 +121,7 @@ vtk_test_cxx_executable(vtkRenderingRayTracingCxxTests all_tests RENDERING_FACTO - - - # Do we have MPI and parallel support --if (VTK_ENABLE_OSPRAY AND TARGET vtkRenderingParallel AND TARGET vtkParallelMPI) -+if (VTK_ENABLE_OSPRAY AND TARGET VTK::RenderingParallel AND TARGET VTK::ParallelMPI) - set(vtkRenderingRayTracingCxx-MPI_NUMPROCS 2) - vtk_add_test_mpi(vtkRenderingRayTracingCxx-MPI tests - TESTING_DATA -diff --git a/Testing/External/CMakeLists.txt b/Testing/External/CMakeLists.txt -index 510620f7616f9152f4dfb8f364579a1c3bf1bcdb..8d2de9844d979c3298b8fe337f428dbe12b86191 100644 ---- a/Testing/External/CMakeLists.txt -+++ b/Testing/External/CMakeLists.txt -@@ -53,7 +53,6 @@ vtk_module_scan( - - # Input information for test build files. - option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF) --set(_vtk_build_PACKAGE "VTK") - set(_vtk_build_TEST_DATA_TARGET "VTKData") - set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing") - set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing") -diff --git a/Testing/ExternalWheel/CMakeLists.txt b/Testing/ExternalWheel/CMakeLists.txt -index c9c984578b682f1a6a605b3546e826b63f9c88ea..518380d5370a9b0b61e0d0f48ae751a81b595098 100644 ---- a/Testing/ExternalWheel/CMakeLists.txt -+++ b/Testing/ExternalWheel/CMakeLists.txt -@@ -82,7 +82,6 @@ endforeach () - - # Input information for test build files. - option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF) --set(_vtk_build_PACKAGE "VTK") - set(_vtk_build_TEST_DATA_TARGET "VTKData") - set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing") - set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing") - diff --git a/ports/vtk/iotr.patch b/ports/vtk/iotr.patch index 10ee575364..a7f9f1bd97 100644 --- a/ports/vtk/iotr.patch +++ b/ports/vtk/iotr.patch @@ -10,3 +10,17 @@ index 26470b965..bee76107a 100644 #include +diff --git a/IO/IOSS/vtkIOSSReaderInternal.cxx b/IO/IOSS/vtkIOSSReaderInternal.cxx +index de8d456..237644b 100644 +--- a/IO/IOSS/vtkIOSSReaderInternal.cxx ++++ b/IO/IOSS/vtkIOSSReaderInternal.cxx +@@ -9,6 +9,8 @@ + #include "vtkIOSSReaderCommunication.h" + #include "vtkIOSSUtilities.h" + ++#include VTK_IOSS(Iotr_Factory.h) ++ + #include "vtkCellArrayIterator.h" + #include "vtkCellData.h" + #include "vtkDataArraySelection.h" + diff --git a/ports/vtk/ot-dep.patch b/ports/vtk/ot-dep.patch deleted file mode 100644 index 7f35c3c9d0..0000000000 --- a/ports/vtk/ot-dep.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Filters/OpenTURNS/CMakeLists.txt b/Filters/OpenTURNS/CMakeLists.txt -index 8bbc0cd..729e323 100644 ---- a/Filters/OpenTURNS/CMakeLists.txt -+++ b/Filters/OpenTURNS/CMakeLists.txt -@@ -1,9 +1,11 @@ --find_package(OpenTURNS 1.8 REQUIRED) -+vtk_module_find_package( PRIVATE_IF_SHARED -+ PACKAGE OpenTURNS -+ VERSION 1.12 -+) - --if (EXISTS "${OPENTURNS_USE_FILE}") -- # removed in 1.21 -- include (${OPENTURNS_USE_FILE}) --endif () -+if(NOT TARGET OT) -+ message(FATAL_ERROR "OpenTURNS OT target not available") -+endif() - - set(classes - vtkOTDensityMap -@@ -28,8 +30,7 @@ vtk_module_add_module(VTK::FiltersOpenTURNS - - vtk_module_link(VTK::FiltersOpenTURNS - PRIVATE -- ${OPENTURNS_LIBRARIES}) --vtk_module_include(VTK::FiltersOpenTURNS -- PRIVATE -- ${OPENTURNS_INCLUDE_DIRS}) -+ OT -+) -+ - vtk_add_test_mangling(VTK::FiltersOpenTURNS) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1d79e39e8d..bb98e47f32 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -10,8 +10,8 @@ set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK - REF 407d4b541111686c40fa53935e7d22c70d5a3f7c # v9.3.x used by ParaView 5.12.0 - SHA512 4170d8b6e89ad90020b16d38d6e91c144eb4f1ffd6d6b82a5f2827bf5b16dac98896fcf1a57822bdb56470f56df02adb05836ce98871b779e4733e2cd60a9a76 + REF 09a76bc55b37caad94d0d8ebe865caaed1b438af # v9.3.x used by ParaView 5.12.0 + SHA512 396ee901fafacae8aef860b9c9c17cb92ae8b4969527fd271ad8dd9f6a9e0dc8e3dc807c8d43cc585608ad101a64edcd7aff49e1580c7a61a817c2ea8e2655f5 HEAD_REF master PATCHES FindLZMA.patch @@ -34,10 +34,7 @@ vcpkg_from_github( fast-float.patch fix-exprtk.patch # just for dbow2 and theia devendor_exodusII.patch - ot-dep.patch remove-prefix-changes.patch - 10945.diff - 10972.diff hdf5helper.patch opencascade-7.8.0.patch ) @@ -343,11 +340,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") -## Files Modules needed by ParaView -if("paraview" IN_LIST FEATURES) - file(INSTALL "${SOURCE_PATH}/Rendering/ParallelLIC/vtkMPIPixelView.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/vtkpythonmodules/static_python") #python headers file(GLOB_RECURSE STATIC_PYTHON_FILES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/*/static_python/*.h") @@ -382,6 +374,6 @@ endif() # Usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) # Handle copyright -file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtk/VTK-vtk-module-properties.cmake" "_vtk_module_import_prefix}/lib/vtk-9.3/hierarchy" "_vtk_module_import_prefix}$<$:/debug>/lib/vtk-9.3/hierarchy") diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index e64aded01b..3094b2240e 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vtk", - "version-semver": "9.3.0-pv5.12.0", - "port-version": 4, + "version-semver": "9.3.0-pv5.12.1", "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 98a1bbcf7b..be734ff984 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6693,7 +6693,7 @@ "port-version": 3 }, "paraview": { - "baseline": "5.12.0", + "baseline": "5.12.1", "port-version": 0 }, "parmetis": { @@ -9249,8 +9249,8 @@ "port-version": 1 }, "vtk": { - "baseline": "9.3.0-pv5.12.0", - "port-version": 4 + "baseline": "9.3.0-pv5.12.1", + "port-version": 0 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index 213512c7b7..f892110c1f 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8786e13e09e9f44ff0cc01f994d8e808f9d54532", + "version": "5.12.1", + "port-version": 0 + }, { "git-tree": "2a5437265d59f394fd71329e0ea2e16fef5cd516", "version": "5.12.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index ad4e922797..826fb4f3c7 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e3082989d374dd77c1498762624412872053b05", + "version-semver": "9.3.0-pv5.12.1", + "port-version": 0 + }, { "git-tree": "679af6f82484acf134c028480564699523c988ed", "version-semver": "9.3.0-pv5.12.0",