diff --git a/ports/spz/android-log.diff b/ports/spz/android-log.diff deleted file mode 100644 index 588e58a840..0000000000 --- a/ports/spz/android-log.diff +++ /dev/null @@ -1,14 +0,0 @@ -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 $ diff --git a/ports/spz/portfile.cmake b/ports/spz/portfile.cmake index d67fb61519..90227a90a3 100644 --- a/ports/spz/portfile.cmake +++ b/ports/spz/portfile.cmake @@ -6,17 +6,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nianticlabs/spz REF v${VERSION} - SHA512 e1ee9314bd0a698e73db6d02937a20eea9419864d45eaa03e184cd9fca07dc08a92c2dfedf8e2415cbfc1ca3917435eb54ad0badd0f584aeeb2038b3bf7f000a + SHA512 0e6bd1dd3f8625cc6730c0cc3a53f65a414a0504c463ca108ac972e4f09e949c49fd98d1033e27947080ead573695747c2a0b9c1a3d8aac7a39351abeb70bfc6 HEAD_REF main PATCHES - android-log.diff + tools-improvements.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + ply_to_spz + spz_to_ply + spz_info + AUTO_CLEAN + ) +endif() + vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/spz") diff --git a/ports/spz/tools-improvements.patch b/ports/spz/tools-improvements.patch new file mode 100644 index 0000000000..ad2fd2107e --- /dev/null +++ b/ports/spz/tools-improvements.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 876e29f..998d86c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,6 +78,8 @@ install(EXPORT spzTargets + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/spz" + ) + ++if(BUILD_TOOLS) ++ + # CLI Tools + add_executable(ply_to_spz cli_tools/src/ply_to_spz.cpp) + target_link_libraries(ply_to_spz PRIVATE spz) +@@ -95,6 +97,21 @@ install(TARGETS ply_to_spz spz_to_ply spz_info + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + ++set_target_properties(ply_to_spz PROPERTIES ++ CXX_STANDARD 17 ++ CXX_STANDARD_REQUIRED ON ++) ++set_target_properties(spz_to_ply PROPERTIES ++ CXX_STANDARD 17 ++ CXX_STANDARD_REQUIRED ON ++) ++set_target_properties(spz_info PROPERTIES ++ CXX_STANDARD 17 ++ CXX_STANDARD_REQUIRED ON ++) ++ ++endif() ++ + # --- Python Bindings Option --- + option(BUILD_PYTHON_BINDINGS "Build Python bindings using nanobind" OFF) + diff --git a/ports/spz/vcpkg.json b/ports/spz/vcpkg.json index c0adcaeb3e..b46ed45dae 100644 --- a/ports/spz/vcpkg.json +++ b/ports/spz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spz", - "version": "2.0.0", + "version": "2.1.0", "description": "File format for 3D Gaussian splats.", "homepage": "https://scaniverse.com/spz", "license": "MIT", @@ -14,5 +14,10 @@ "host": true }, "zlib" - ] + ], + "features": { + "tools": { + "description": "Build tools" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index fbc2587287..5c680206fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9209,7 +9209,7 @@ "port-version": 3 }, "spz": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "sqlcipher": { diff --git a/versions/s-/spz.json b/versions/s-/spz.json index cac0b0cbc7..11c84552c5 100644 --- a/versions/s-/spz.json +++ b/versions/s-/spz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5545809c57a4ccdcd3797dc6f9b125ea417ada1", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "c6e9711713d30eeadab3ea219b2423b0c4fd650f", "version": "2.0.0",