[vtkm|vtk|paraview] update ports

ports/openmvs/fix-static-build.patch

@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 39ec359ac3..03225b8940 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -177,10 +177,10 @@ if(Boost_FOUND)
+ 	LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST)
+ 	ADD_DEFINITIONS(${Boost_DEFINITIONS})
+ 	LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+-	if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE)
+-		# work around this missing library link in vcpkg
+-		LIST(APPEND Boost_LIBRARIES zstd)
+-	endif()
++  LINK_LIBRARIES(${Boost_LIBRARIES})
++  find_package(zstd CONFIG REQUIRED)
++  LINK_LIBRARIES($<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
++
+ 	SET(_USE_BOOST TRUE)
+ endif()
+

ports/openmvs/portfile.cmake

@@ -9,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         fix-build.patch
         no-absolute-paths.patch
+        fix-static-build.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

ports/openmvs/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "openmvs",
   "version": "2.1.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "OpenMVS: open Multi-View Stereo reconstruction library",
   "homepage": "https://cdcseacave.github.io/openMVS",
   "license": "AGPL-3.0-only",

ports/paraview/fix-build.patch

@@ -0,0 +1,45 @@
+diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake
+index cba0380cd9..9c8bbc5084 100644
+--- a/CMake/vtkModuleWrapClientServer.cmake
++++ b/CMake/vtkModuleWrapClientServer.cmake
+@@ -72,8 +72,8 @@ function (_vtk_module_wrap_client_server_sources module sources classes)
+         "guarantee intended behavior.")
+     endif ()
+   endif ()
+-  file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}")
+-  file(GENERATE OUTPUT "include_directories_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}")
++  file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}")
++  file(GENERATE OUTPUT "include_directories_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}")
+   file(GENERATE
+     OUTPUT  "${_vtk_client_server_args_file}"
+     CONTENT "$<$<BOOL:${_vtk_client_server_genex_compile_definitions_all}>:\n-D\'$<JOIN:${_vtk_client_server_genex_compile_definitions_all},\'\n-D\'>\'>\n
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1be00fb71a..c47cf20d55 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ if (PARAVIEW_USE_EXTERNAL_VTK)
+       "External VTK not found but ParaView requires VTK to function")
+   endif ()
+   if (NOT PARAVIEW_BUILD_SHARED_LIBS)
+-    message(FATAL_ERROR
++    message(WARNING
+       "Static build with external VTK does not currently work.")
+   endif()
+   get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY)
+diff --git a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
+index 06e517964b..fbf9f5c2df 100644
+--- a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
++++ b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
+@@ -13,8 +13,9 @@ extern "C"
+   void vtkPVInitializePythonModules();
+   void VTKUTILITIESPYTHONINTERPRETERPATH_EXPORT vtkPVPythonInterpreterPath()
+   {
+-    std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules);
+-    vtkPythonInterpreter::SetUserPythonPath(
+-      libraryPath.c_str(), "paraview/__init__.py" /*landmark*/);
++    // Ignore this for now. Requires a slightly newer VTK version than PV 5.12 uses.
++    //std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules);
++    //vtkPythonInterpreter::SetUserPythonPath(
++    //  libraryPath.c_str(), "paraview/__init__.py" /*landmark*/);
+   }
+ }

ports/paraview/fix-configure.patch

@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b9fd80..94ad133 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -557,7 +557,16 @@ if (PARAVIEW_USE_EXTERNAL_VTK)
+     endforeach()
+   endmacro()
+   search_dependent_targets(${vtk_modules})
+-  find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}")  
++
++  if (PARAVIEW_USE_PYTHON)
++    get_target_property(vtk_python_modules VTK::vtkpythonmodules "INTERFACE_LINK_LIBRARIES")
++    list(TRANSFORM vtk_python_modules REPLACE "Python$" "" OUTPUT_VARIABLE vtk_modules_wrapped)
++    list(TRANSFORM vtk_modules_wrapped REPLACE "^VTK::vtk" "" OUTPUT_VARIABLE vtk_components_wrapped)
++    list(APPEND vtk_components ${vtk_components_wrapped})
++    list(REMOVE_DUPLICATES vtk_components)
++  endif()
++
++  find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}")
+   if (PARAVIEW_USE_PYTHON)
+     find_package(Python3 3.3 QUIET REQUIRED COMPONENTS Interpreter)
+     set(PYTHON_VERSION_MAJOR "${Python3_VERSION_MAJOR}")
+diff --git a/Qt/Python/vtk.module b/Qt/Python/vtk.module
+index f82f076..86dbafd 100644
+--- a/Qt/Python/vtk.module
++++ b/Qt/Python/vtk.module
+@@ -12,7 +12,7 @@ GROUPS
+   PARAVIEW_CANONICAL
+ DEPENDS
+   ParaView::pqCore
+-  ParaView::PythonInitializer
++  #ParaView::PythonInitializer <- Creates a cycle
+   VTK::PythonInterpreter
+   VTK::WrappingPythonCore
+ TEST_LABELS