diff --git a/ports/vtk/Findproj.patch b/ports/vtk/Findproj.patch index d83b0f4510..f5e1068354 100644 --- a/ports/vtk/Findproj.patch +++ b/ports/vtk/Findproj.patch @@ -1,7 +1,14 @@ diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake -index e2344bb17..bac4c747e 100644 +index 6f607d4..86c85a9 100644 --- a/CMake/FindLibPROJ.cmake +++ b/CMake/FindLibPROJ.cmake +@@ -1,5 +1,5 @@ + find_path(LibPROJ_INCLUDE_DIR +- NAMES proj_api.h proj.h ++ NAMES proj.h + DOC "libproj include directories") + mark_as_advanced(LibPROJ_INCLUDE_DIR) + @@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE mark_as_advanced(LibPROJ_LIBRARY_RELEASE) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 97cc9f7370..a28fca9aeb 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 4, + "port-version": 5, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -31,7 +31,10 @@ "lz4", "netcdf-c", "pegtl", - "proj", + { + "name": "proj", + "default-features": false + }, "pugixml", { "name": "seacas", @@ -101,13 +104,9 @@ "gdal": { "description": "Support GDAL compilation", "dependencies": [ - "gdal", { - "name": "vtk", - "default-features": false, - "features": [ - "mpi" - ] + "name": "gdal", + "default-features": false } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 4f9c4cdb5d..1ccae0e93d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8238,7 +8238,7 @@ }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 4 + "port-version": 5 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 056094cec4..3234293a5b 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d58e0bca42952f053f26534bad7771a29a1e16c8", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 5 + }, { "git-tree": "1261828e6817fb1dcc11cbb50a257104e87c1e69", "version-semver": "9.2.0-pv5.11.0",