[pdal, pdal-dimbuilder] Update to 2.9.1 [spz] New port (#47073)

dg0yt · web-flow · commit e16176e668eb · 2025-08-29T02:31:46.000-07:00
diff --git a/ports/pdal-dimbuilder/portfile.cmake b/ports/pdal-dimbuilder/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
     #[[
         Attention: pdal must be updated together with pdal-dimbuilder
     #]]
-    SHA512 85aaab726d172ef46b8cf05bd72772da72cf5615db549cd262acc4d468f631f1093577b9866ca598b7bef72507f7774e599e66a6cbbf589bd1b5b85bb8107642
+    SHA512 4a7f4356530a3d2c1ecde8c3aa7cfee052eb7d57a33e5e8bf7699e05bf0994bfc5552562b22af744879866336deea228cee75b543b89399fbeb952c400c33ea2
     HEAD_REF master
     PATCHES
         namespace-nl.diff
diff --git a/ports/pdal-dimbuilder/vcpkg.json b/ports/pdal-dimbuilder/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pdal-dimbuilder",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "A tool used by the PDAL build process",
   "homepage": "https://pdal.io/",
   "license": "BSD-3-Clause",
diff --git a/ports/pdal/dependencies.diff b/ports/pdal/dependencies.diff
@@ -12,10 +12,10 @@ index dc65543..5bccbce 100644
 -add_subdirectory(vendor/utfcpp)
  add_subdirectory(vendor/lepcc)
 -add_subdirectory(vendor/h3)
- add_subdirectory(vendor/spz)
  add_subdirectory(tools)
  add_subdirectory(apps)
-@@ -220,12 +217,13 @@ add_library(PDAL::PDAL ALIAS ${PDAL_LIB_NAME})
+ 
+@@ -230,12 +227,13 @@ add_library(PDAL::PDAL ALIAS ${PDAL_LIB_NAME})
  
  
  
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
@@ -7,14 +7,13 @@ vcpkg_from_github(
     #[[
         Attention: pdal-dimbuilder must be updated together with pdal
     #]]
-    SHA512 85aaab726d172ef46b8cf05bd72772da72cf5615db549cd262acc4d468f631f1093577b9866ca598b7bef72507f7774e599e66a6cbbf589bd1b5b85bb8107642
+    SHA512 4a7f4356530a3d2c1ecde8c3aa7cfee052eb7d57a33e5e8bf7699e05bf0994bfc5552562b22af744879866336deea228cee75b543b89399fbeb952c400c33ea2
     HEAD_REF master
     PATCHES
         dependencies.diff
         external-dimbuilder.diff
         find-library-suffix.diff
         no-rpath.patch
-        spz-zlib.diff  # https://github.com/PDAL/PDAL/issues/4745
 )
 file(REMOVE_RECURSE
     "${SOURCE_PATH}/cmake/modules/FindCurl.cmake"
@@ -47,6 +46,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         hdf5        BUILD_PLUGIN_HDF
         lzma        WITH_LZMA
         pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD
+        spz         BUILD_PLUGIN_SPZ
         zstd        WITH_ZSTD
 )
 
@@ -107,14 +107,10 @@ file(READ "${SOURCE_PATH}/vendor/lepcc/src/LEPCC.h" license)
 string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" license "${license}")
 file(WRITE "${lepcc_license}" "${license}")
 
-set(spz_license "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/spz LICENSE")
-file(COPY_FILE "${SOURCE_PATH}/vendor/spz/LICENSE" "${spz_license}")
-
 vcpkg_install_copyright(FILE_LIST
     "${SOURCE_PATH}/LICENSE.txt"
     "${arbiter_license}"
     "${kazhdan_license}"
     "${lazperf_license}"
     "${lepcc_license}"
-    "${spz_license}"
 )
diff --git a/ports/pdal/spz-zlib.diff b/ports/pdal/spz-zlib.diff
diff --git a/ports/pdal/usage b/ports/pdal/usage
@@ -1,8 +1,8 @@
 pdal provides CMake targets:
 
   find_package(PDAL CONFIG REQUIRED)
-  target_link_libraries(main PRIVATE $<TARGET_NAME:pdalcpp>)
-        
+  target_link_libraries(main PRIVATE pdalcpp)
+
 If necessary, override the default plugin search path by setting the
 environment variable PDAL_DRIVER_PATH to a list of directories that
 PDAL should search for plugins.
diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pdal",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.",
   "homepage": "https://pdal.io/",
   "license": null,
@@ -81,6 +81,12 @@
         }
       ]
     },
+    "spz": {
+      "description": "Build the SPZ plugin",
+      "dependencies": [
+        "spz"
+      ]
+    },
     "supported-plugins": {
       "description": "Default set of plugins, dependent on platform",
       "dependencies": [
diff --git a/ports/spz/android-log.diff b/ports/spz/android-log.diff
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca49824..01f53ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,9 @@ add_library(spz ${spz_sources})
+ add_library(spz::spz ALIAS spz)
+ 
+ target_link_libraries(spz PRIVATE ZLIB::ZLIB)
++if(ANDROID)
++  target_link_libraries(spz PRIVATE log)
++endif()
+ 
+ target_include_directories(spz
+   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cc>
diff --git a/ports/spz/portfile.cmake b/ports/spz/portfile.cmake
@@ -0,0 +1,25 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nianticlabs/spz
+    REF v${VERSION}
+    SHA512 e1ee9314bd0a698e73db6d02937a20eea9419864d45eaa03e184cd9fca07dc08a92c2dfedf8e2415cbfc1ca3917435eb54ad0badd0f584aeeb2038b3bf7f000a
+    HEAD_REF main
+    PATCHES
+        android-log.diff
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/spz")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/spz/vcpkg.json b/ports/spz/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "spz",
+  "version": "2.0.0",
+  "description": "File format for 3D Gaussian splats.",
+  "homepage": "https://scaniverse.com/spz",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7309,15 +7309,15 @@
       "port-version": 0
     },
     "pdal": {
-      "baseline": "2.9.0",
+      "baseline": "2.9.1",
       "port-version": 0
     },
     "pdal-c": {
       "baseline": "2.2.0",
       "port-version": 0
     },
     "pdal-dimbuilder": {
-      "baseline": "2.9.0",
+      "baseline": "2.9.1",
       "port-version": 0
     },
     "pdcurses": {
@@ -9136,6 +9136,10 @@
       "baseline": "1.1",
       "port-version": 3
     },
+    "spz": {
+      "baseline": "2.0.0",
+      "port-version": 0
+    },
     "sqlcipher": {
       "baseline": "4.6.1",
       "port-version": 3
diff --git a/versions/p-/pdal-dimbuilder.json b/versions/p-/pdal-dimbuilder.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9025bba827883d6e57fa0ba293c561485d65630d",
+      "version": "2.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "38afc2f2b79098fc88f3280e5a2a3d650fd0774e",
       "version": "2.9.0",
diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cec04ca4e450bd89509d75da2bd75e313975c5ec",
+      "version": "2.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "cb2dc06ee5a21456cd9107eb556222b65d4cea88",
       "version": "2.9.0",
diff --git a/versions/s-/spz.json b/versions/s-/spz.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "c6e9711713d30eeadab3ea219b2423b0c4fd650f",
+      "version": "2.0.0",
+      "port-version": 0
+    }
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pdal-dimbuilder",`
`3`		`- "version": "2.9.0",`
	`3`	`+ "version": "2.9.1",`
`4`	`4`	`"description": "A tool used by the PDAL build process",`
`5`	`5`	`"homepage": "https://pdal.io/",`
`6`	`6`	`"license": "BSD-3-Clause",`