[pdal] Revise and update

ports/pdal-c/cmake-project-include.cmake

@@ -0,0 +1,3 @@
+if(WIN32)
+	add_compile_definitions(NOMINMAX)
+endif()

ports/pdal-c/portfile.cmake

@@ -1,32 +1,28 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO PDAL/CAPI
-	REF 1.8
-	SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf
-	HEAD_REF master
-	PATCHES
-		${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch
-		${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch
-		${CMAKE_CURRENT_LIST_DIR}/remove-tests.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO PDAL/CAPI
+    REF v2.1.0
+    SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd
+    HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-	SOURCE_PATH ${SOURCE_PATH}
-	PREFER_NINJA
-	OPTIONS
-		-DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
+        -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF
+        -DPDALC_ENABLE_DOCS:BOOL=OFF
+        -DPDALC_ENABLE_TESTS:BOOL=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Remove headers from debug
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Install copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.md
-	DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdal-c
-	RENAME copyright
-)
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/pdal-c/vcpkg.json

@@ -1,9 +1,17 @@
 {
   "name": "pdal-c",
-  "version-string": "1.8",
-  "port-version": 3,
+  "version-string": "2.1",
   "description": "C API for the Point Data Abstraction Library (PDAL)",
+  "homepage": "https://github.com/PDAL/CAPI#readme",
+  "supports": "!(windows & staticcrt)",
   "dependencies": [
-    "pdal"
+    {
+      "name": "pdal",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }

ports/pdal/0002-no-source-dir-writes.patch

@@ -19,31 +19,3 @@ index dc146d1..9b82544 100644
      ${PDAL_SRC_DIR}/compression/*.cpp)
  file(GLOB_RECURSE PRIVATE_SRCS
      ${PDAL_FILTERS_DIR}/private/*.cpp
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index b02aa4a..d60b041 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -66,9 +66,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc
- if(UNIX OR APPLE)
-     # Autoconf compatibility variables to use the same script source.
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.in"
--                   "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" @ONLY)
-+                   "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" @ONLY)
-
--    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config"
-+    file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config"
-         DESTINATION
-             "${PDAL_OUTPUT_BIN_DIR}/"
-         FILE_PERMISSIONS
-@@ -85,9 +85,9 @@ if(UNIX OR APPLE)
- elseif(WIN32)
-     # Autoconf compatibility variables to use the same script source.
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config-bat.in"
--                   "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" @ONLY)
-+                   "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" @ONLY)
-
--    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat"
-+    file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat"
-          DESTINATION
-             "${PDAL_OUTPUT_BIN_DIR}/"
-          FILE_PERMISSIONS

ports/pdal/0003-fix-copy-vendor.patch

@@ -1,59 +1,20 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43e446a..c4c7d6f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -339,6 +339,30 @@ install(DIRECTORY ${PDAL_FILTERS_DIR}
- install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp}
-   DESTINATION include/pdal
- )
-+# Install vendor headers
-+install(DIRECTORY ${PDAL_VENDOR_ARBITER_DIR}
-+    DESTINATION include/pdal/vendor
-+    FILES_MATCHING PATTERN "*.hpp"
-+    PATTERN "private" EXCLUDE
-+)
-+
-+install(DIRECTORY ${PDAL_VENDOR_JSONCPP_DIR}
-+    DESTINATION include/pdal/vendor
-+    FILES_MATCHING PATTERN "*.h"
-+    PATTERN "private" EXCLUDE
-+)
-+
-+install(DIRECTORY ${PDAL_VENDOR_KAZHDAN_DIR}
-+    DESTINATION include/pdal/vendor
-+    FILES_MATCHING PATTERN "*.h"
-+    PATTERN "private" EXCLUDE
-+)
-+
-+install(DIRECTORY ${PDAL_VENDOR_NANOFLANN_DIR}
-+    DESTINATION include/pdal/vendor
-+    FILES_MATCHING PATTERN "*.hpp"
-+    PATTERN "private" EXCLUDE
-+)
-
- #
- # CPACK
-@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-
- export(
-     TARGETS
--        ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
-+        ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME}
-     FILE
-         "${PDAL_BINARY_DIR}/PDALTargets.cmake")
-
-diff --git a/cmake/directories.cmake b/cmake/directories.cmake
-index f079ec7..8e366e8 100644
---- a/cmake/directories.cmake
-+++ b/cmake/directories.cmake
-@@ -11,4 +11,7 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels)
- set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters)
- set(PDAL_IO_DIR ${ROOT_DIR}/io)
- set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor)
--
-+set(PDAL_VENDOR_ARBITER_DIR ${PDAL_VENDOR_DIR}/arbiter)
-+set(PDAL_VENDOR_JSONCPP_DIR ${PDAL_VENDOR_DIR}/jsoncpp)
-+set(PDAL_VENDOR_KAZHDAN_DIR ${PDAL_VENDOR_DIR}/kazhdan)
-+set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann)
-
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e918a3e..a3f9a03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR}
+ install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp}
+   DESTINATION include/pdal
+ )
++# Instaqll vendor headers
++install(DIRECTORY
++        ${PDAL_VENDOR_DIR}/arbiter
++        ${PDAL_VENDOR_DIR}/kazhdan
++        ${PDAL_VENDOR_DIR}/nanoflann
++    DESTINATION include/pdal/vendor
++    FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h"
++    PATTERN "private" EXCLUDE
++)
+
+ #
+ # CPACK