[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build (#31257)

* [pdal] Update to v2.5.3 * [pdal] Update baseline * [pdal-c] Update to v2.2.0 * [pdal-c] Update baseline * update usage * update version --------- Co-authored-by: Monica <[email protected]>
microsoft · May 9, 2023 · 1f7f116 · 1f7f116
1 parent 8805e31
commit 1f7f116
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 35 deletions.
diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PDAL/CAPI
-    REF v2.1.0
-    SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd
+    REF "v${VERSION}"
+    SHA512 6fe2136831e37c2f87643b3c971a1397d8912c230e9bfde53a51ec1769bc5c2f08482395263906975c5d40dbabd32852a5a145a159cdcf2548390a0aff72a295
     HEAD_REF master
 )
 

diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "pdal-c",
-  "version": "2.1",
-  "port-version": 1,
+  "version": "2.2.0",
   "description": "C API for the Point Data Abstraction Library (PDAL)",
   "homepage": "https://github.com/PDAL/CAPI#readme",
   "supports": "!(windows & staticcrt)",

diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch
@@ -1,9 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 42cca1e..43b0ced 100644
+index 1705a8426..248edcd38 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
- target_link_libraries(${PDAL_BASE_LIB_NAME}
+@@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME}
      PRIVATE
          ${CMAKE_THREAD_LIBS_INIT}
          ${CMAKE_DL_LIBS}
@@ -13,7 +12,7 @@ index 42cca1e..43b0ced 100644
          ${LIBXML2_LIBRARIES}
          ${ZLIB_LIBRARIES}
 diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
-index bfaa5b2..e73ec9e 100644
+index dfe3dc024..42a78d646 100644
 --- a/cmake/zstd.cmake
 +++ b/cmake/zstd.cmake
 @@ -4,7 +4,14 @@

diff --git a/ports/pdal/fix-gcc-13-build.patch b/ports/pdal/fix-gcc-13-build.patch
@@ -0,0 +1,12 @@
+diff --git a/plugins/e57/libE57Format/include/E57Format.h b/plugins/e57/libE57Format/include/E57Format.h
+index 267d8c77bb..89d2b36a09 100644
+--- a/plugins/e57/libE57Format/include/E57Format.h
++++ b/plugins/e57/libE57Format/include/E57Format.h
+@@ -31,6 +31,7 @@
+
+ //! @file  E57Format.h header file for the E57 API
+
++#include <cstdint>
+ #include <cfloat>
+ #include <memory>
+ #include <vector>
diff --git a/ports/pdal/fix-gcc8-compatibility.patch b/ports/pdal/fix-gcc8-compatibility.patch
diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 679b4e7..08965d9 100644
+index 1705a8426..d13d41786 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -187,7 +187,7 @@ add_subdirectory(apps)
+@@ -192,7 +192,7 @@ add_subdirectory(apps)
  # so that users only need link libpdalcpp.
  #
  if (APPLE)

diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
@@ -3,16 +3,16 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO PDAL/PDAL
-    REF 2.4.3
-    SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a
+    REF "${VERSION}"
+    SHA512 cefc610682f8dafd5c186ed612edc2db904690c3a53d5111ece0965d197053b064bd8cbd9adab293c47ec1894949b5e33623b0f0e6b6cad35617a20f0039bd79
     HEAD_REF master
     PATCHES
         fix-dependency.patch
         fix-unix-compiler-options.patch
         fix-find-library-suffix.patch
         no-pkgconfig-requires.patch
         no-rpath.patch
-        fix-gcc8-compatibility.patch #Upstream PR: https://github.com/PDAL/PDAL/pull/3864
+        fix-gcc-13-build.patch  #upstream PR: https://github.com/PDAL/PDAL/pull/4039
 )
 
 # Prefer pristine CMake find modules + wrappers and config files from vcpkg.

diff --git a/ports/pdal/usage b/ports/pdal/usage
@@ -1,7 +1,7 @@
 The package pdal provides CMake variables:
 
     find_package(PDAL CONFIG REQUIRED)
-    target_include_directories(${PDAL_INCLUDE_DIRS})
+    target_include_directories(main PRIVATE ${PDAL_INCLUDE_DIRS})
     target_link_libraries(main PRIVATE ${PDAL_LIBRARIES})
 
 If necessary, override the default plugin search path by setting the

diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "pdal",
-  "version": "2.4.3",
-  "port-version": 3,
+  "version": "2.5.3",
   "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
   "homepage": "https://pdal.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6109,12 +6109,12 @@
       "port-version": 1
     },
     "pdal": {
-      "baseline": "2.4.3",
-      "port-version": 3
+      "baseline": "2.5.3",
+      "port-version": 0
     },
     "pdal-c": {
-      "baseline": "2.1",
-      "port-version": 1
+      "baseline": "2.2.0",
+      "port-version": 0
     },
     "pdcurses": {
       "baseline": "3.9",

diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d7916bf5653f1e62814a0a975e2af90d6862c881",
+      "version": "2.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e84b5eb190d2b4885ff56ec4168b1c6ba5569fb9",
       "version": "2.1",

diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36cec2be04df8ba1771c374ccc8ae3c8a0cc96f3",
+      "version": "2.5.3",
+      "port-version": 0
+    },
     {
       "git-tree": "e0e82c8480da2e69cc7532911895844095466aad",
       "version": "2.4.3",