microsoft · strega-nil · May 11, 2020 · May 3, 2020 · May 3, 2020 · May 3, 2020
diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt
@@ -40,7 +40,7 @@ list(REMOVE_ITEM lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/xxhash.h")
 INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}")
 
 install(EXPORT lz4Config
- FILE lz4Config.cmake
+ FILE lz4-config.cmake
  NAMESPACE lz4::
  DESTINATION "${INSTALL_CMAKE_DIR}"
 )

diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL
@@ -1,5 +1,5 @@
 Source: lz4
-Version: 1.9.2-1
+Version: 1.9.2-2
 Homepage: https://github.com/lz4/lz4
 Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
 Build-Depends: xxhash
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
@@ -1,5 +1,5 @@
 Source: pcl
-Version: 1.9.1-12
+Version: 1.9.1-13
 Homepage: https://github.com/PointCloudLibrary/pcl
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
 Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio

diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
@@ -45,7 +45,7 @@ vcpkg_configure_cmake(
  -DWITH_LIBUSB=OFF
  -DWITH_PNG=ON
  -DWITH_QHULL=ON
- -DWITH_VTK=ON
+ -DWITH_VTK=OFF # disabled due to API changes in 9.0
  # FEATURES
  ${FEATURE_OPTIONS}
 )

diff --git a/ports/pegtl-2/CONTROL b/ports/pegtl-2/CONTROL
@@ -1,3 +1,4 @@
 Source: pegtl-2
-Version: 2.8.1
+Version: 2.8.1-1
 Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.
+Homepage: https://github.com/taocpp/PEGTL
diff --git a/ports/pegtl-2/portfile.cmake b/ports/pegtl-2/portfile.cmake
@@ -1,4 +1,3 @@
-include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO taocpp/pegtl
@@ -25,7 +24,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl-2/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl-2/copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
 
 # Handle collision with latest pegtl
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-config.cmake ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-2-config.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/pegtl-config.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/pegtl-config-version.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config-version.cmake)
diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake
@@ -1,4 +1,3 @@
-include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO taocpp/pegtl

diff --git a/ports/vtk-dicom/CONTROL b/ports/vtk-dicom/CONTROL
@@ -1,7 +1,8 @@
 Source: vtk-dicom
-Version: 0.8.12
+Version: 0.8.12-1
 Description: DICOM for VTK
-Build-Depends: vtk, zlib
+Homepage: https://github.com/dgobbi/vtk-dicom
+Build-Depends: vtk[core], zlib
 
 Feature: gdcm
 Description: Use gdcm for decompressing DICOM files.

diff --git a/ports/vtk-dicom/portfile.cmake b/ports/vtk-dicom/portfile.cmake
@@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO dgobbi/vtk-dicom
  REF 5034c68450de857b70fbe4a4b9f8dddb62badef3 # v0.8.12
  SHA512 bad1ed6a4a412402a2cd69e5f85b2b73f1ee7ea46a6bbcac31c5f66d07ae006679ffbd9a3c70f9baa1b05b1af0a2d4ca0efc34ec0a85a92f5116b900e81635cd
  HEAD_REF master
+ PATCHES std.patch # similar patch is already in master
 )
 
 if ("gdcm" IN_LIST FEATURES)
@@ -21,22 +20,23 @@ if(USE_GDCM)
  -DUSE_DCMTK=OFF
  )
 endif()
-
+vcpkg_find_acquire_program(PYTHON3)
 vcpkg_configure_cmake(
  SOURCE_PATH ${SOURCE_PATH}
  PREFER_NINJA
  OPTIONS
  -DBUILD_PROGRAMS=OFF
  -DBUILD_EXAMPLES=OFF
+ "-DPython3_EXECUTABLE=${PYTHON3}"
  ${ADDITIONAL_OPTIONS}
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk-dicom)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk-dicom/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk-dicom/copyright)
+file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/vtk-dicom/std.patch b/ports/vtk-dicom/std.patch
@@ -0,0 +1,74 @@
+diff --git a/Source/vtkScancoCTReader.cxx b/Source/vtkScancoCTReader.cxx
+index a71f2e46e..afe202ffc 100644
+--- a/Source/vtkScancoCTReader.cxx 
++++ b/Source/vtkScancoCTReader.cxx
+@@ -176,7 +176,7 @@ int vtkScancoCTReader::CheckVersion(const char header[16])
+ //----------------------------------------------------------------------------
+ int vtkScancoCTReader::CanReadFile(const char *filename)
+ {
+- ifstream infile(filename, ios::in | ios::binary);
++ std::ifstream infile(filename, ios::in | ios::binary);
+
+ bool canRead = false;
+ if (infile.good())
+@@ -409,7 +409,7 @@ void vtkScancoCTReader::StripString(char *dest, const char *cp, size_t l)
+ }
+
+ //----------------------------------------------------------------------------
+-int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead)
++int vtkScancoCTReader::ReadISQHeader(std::ifstream *file, unsigned long bytesRead)
+ {
+ if (bytesRead < 512)
+ {
+@@ -620,7 +620,7 @@ int vtkScancoCTReader::ReadISQHeader(ifstream *file, unsigned long bytesRead)
+ }
+
+ //----------------------------------------------------------------------------
+-int vtkScancoCTReader::ReadAIMHeader(ifstream *file, unsigned long bytesRead)
++int vtkScancoCTReader::ReadAIMHeader(std::ifstream *file, unsigned long bytesRead)
+ {
+ if (bytesRead < 160)
+ {
+@@ -987,7 +987,7 @@ int vtkScancoCTReader::RequestInformation(
+ const char *ufilename = filename;
+ #endif
+
+- ifstream infile(ufilename, ios::in | ios::binary);
++ std::ifstream infile(ufilename, ios::in | ios::binary);
+ if (!infile.good())
+ {
+ vtkErrorMacro("Cannot open file " << filename);
+@@ -1115,7 +1115,7 @@ int vtkScancoCTReader::RequestData(
+ static_cast<unsigned char *>(data->GetScalarPointer());
+
+ // open the file
+- ifstream infile(filename, ios::in | ios::binary);
++ std::ifstream infile(filename, ios::in | ios::binary);
+ if (!infile.good())
+ {
+ vtkErrorMacro("Cannot open file " << filename);
+diff --git a/Source/vtkScancoCTReader.h b/Source/vtkScancoCTReader.h
+index ca31d7572..240d532f2 100644
+--- a/Source/vtkScancoCTReader.h 
++++ b/Source/vtkScancoCTReader.h
+@@ -34,6 +34,7 @@
+ #ifndef vtkScancoCTReader_h
+ #define vtkScancoCTReader_h
+
++#include <iosfwd>
+ #include "vtkImageReader2.h"
+ #include "vtkDICOMModule.h" // For export macro
+ #include "vtkDICOMConfig.h" // For configuration details
+@@ -185,10 +186,10 @@ protected:
+ void InitializeHeader();
+
+ //! Read an ISQ header.
+- int ReadISQHeader(ifstream *file, unsigned long bytesRead);
++ int ReadISQHeader(std::ifstream *file, unsigned long bytesRead);
+
+ //! Read AIM header.
+- int ReadAIMHeader(ifstream *file, unsigned long bytesRead);
++ int ReadAIMHeader(std::ifstream *file, unsigned long bytesRead);
+
+ //! Check the file header to see what type of file it is.
+ /*!
diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL
@@ -0,0 +1,23 @@
+Source: vtk-m
+Version: 1.5.0
+Homepage: https://gitlab.kitware.com/vtk/vtk-m/
+Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.
+Supports: x64 & !uwp
+
+Feature: cuda
+Description: Use the NVIDIA CUDA device adapter.
+Build-Depends: cuda
+
+Feature: omp
+Description: Use the OpenMP device adapter.
+
+Feature: tbb
+Description: Use the Intel TBB device adapter.
+Build-Depends: tbb
+
+Feature: mpi
+Description: Use the MPI controller.
+Build-Depends: mpi
+
+Feature: double
+Description: Use double precision in floating point calculations
diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake
@@ -0,0 +1,61 @@
+# VENDORED DEPENDENCIES! 
+# TODO: Should be replaced in the future with VCPKG internal versions
+# add_subdirectory(thirdparty/diy)
+# add_subdirectory(thirdparty/lodepng)
+# if(VTKm_ENABLE_LOGGING)
+ # add_subdirectory(thirdparty/loguru)
+# endif()
+# add_subdirectory(thirdparty/optionparser)
+# add_subdirectory(thirdparty/taotuple)
+# add_subdirectory(thirdparty/lcl)
+
+vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS 
+ FEATURES
+ cuda VTKm_ENABLE_CUDA
+ omp VTKm_ENABLE_OPENMP
+ tbb VTKm_ENABLE_TBB
+ mpi VTKm_ENABLE_MPI
+ double VTKm_USE_DOUBLE_PRECISION
+ )
+
+if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX})
+ set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc")
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ message(STATUS "Feature CUDA forces static build!")
+ endif()
+ set(VCPKG_LIBRARY_LINKAGE "static") # CUDA forces static build.
+endif()
+
+list(APPEND OPTIONS -DVTKm_ENABLE_RENDERING=ON)
+list(APPEND OPTIONS -DVTKm_ENABLE_DEVELOPER_FLAGS=OFF)
+list(APPEND OPTIONS -DVTKm_ENABLE_CPACK=OFF)
+list(APPEND OPTIONS -DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON)
+# For port customizations on unix systems. 
+# Please feel free to make these port features if it makes any sense
+#list(APPEND OPTIONS -DVTKm_ENABLE_GL_CONTEXT=ON) # or
+#list(APPEND OPTIONS -DVTKm_ENABLE_EGL_CONTEXT=ON) # or
+#list(APPEND OPTIONS -DVTKm_ENABLE_OSMESA_CONTEXT=ON)
+list(APPEND OPTIONS -DBUILD_TESTING=OFF)
+
+vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" 
+ OUT_SOURCE_PATH SOURCE_PATH 
+ REPO vtk/vtk-m 
+ REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build
+ SHA512 2f2a273f74d9a583df9e25a4792440d8d89652fa14b3153f2ea5afbd329b50970e7b9bd68e0ccd036baf5c1f3ad7a8302d95c01dbb30d9a46c045987eebf5370)
+ # For people only wanting vtk-m and not VTK 
+ #REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1
+ #SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9)
+vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} 
+ PREFER_NINJA 
+ OPTIONS ${OPTIONS})
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5 TARGET_PATH share/vtkm)
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake _contents)
+string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.5")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents})
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake ${_contents})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
@@ -1,25 +1,41 @@
 Source: vtk
-Version: 8.2.0-13
+Version: 9.0
 Description: Software system for 3D computer graphics, image processing, and visualization
 Homepage: https://github.com/Kitware/VTK
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2
+
+Feature: vtkm
+Description: Build with vtk-m accelerator and module.
+Build-Depends: vtk-m[core]
 
 Feature: openvr
 Description: OpenVR functionality for VTK
 Build-Depends: sdl2, openvr
 
 Feature: qt
 Description: Qt functionality for VTK
-Build-Depends: qt5
+Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats, qt5-x11extras (linux)
 
 Feature: mpi
 Description: MPI functionality for VTK
-Build-Depends: mpi, hdf5[parallel]
+Build-Depends: mpi, hdf5[core, parallel], vtk-m[core,mpi]
 
 Feature: python
 Description: Python functionality for VTK
 Build-Depends: python3
 
 Feature: atlmfc
 Description: Mfc functionality for vtk on Windows
-Build-Depends: atlmfc (windows)
+Build-Depends: atlmfc (windows)
+
+Feature: paraview
+Description: Build vtk modules required by paraview
+Build-Depends: vtk[core, qt], vtk[core, atlmfc] (windows)
+
+Feature: cuda
+Description: Support CUDA compilation
+Build-Depends: cuda
+
+Feature: all
+Description: Build vtk modules required by paraview
+Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc] (windows)