From 567034cdf2c305acb5415173e225030ceee5b660 Mon Sep 17 00:00:00 2001
From: SunBlack <SunBlack@users.noreply.github.com>
Date: Mon, 31 Aug 2026 14:43:17 +0200
Subject: [PATCH] [rtabmap-res-tool] Update to 0.23.8 (#53602)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 ports/rtabmap-res-tool/portfile.cmake | 67 +++++++++++++++------------
 ports/rtabmap-res-tool/vcpkg.json     |  4 +-
 versions/baseline.json                |  2 +-
 versions/r-/rtabmap-res-tool.json     |  5 ++
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/ports/rtabmap-res-tool/portfile.cmake b/ports/rtabmap-res-tool/portfile.cmake
index 122716a339..1ed11c2007 100644
--- a/ports/rtabmap-res-tool/portfile.cmake
+++ b/ports/rtabmap-res-tool/portfile.cmake
@@ -1,30 +1,37 @@
-# Only the standalone tool
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-set(VCPKG_BUILD_TYPE release)
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO introlab/rtabmap
-    REF ${VERSION}
-    SHA512 9bcd0f359e0ee8060cf7088761544a3f7d38aadb37df820958f0811aa7b8edbfaf00f00d9472a8bf46261d4e5d868f9c10785263aaabaf374b6e5aa5237d70b0
-    HEAD_REF master
-)
-file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DINSTALL_INCLUDE_DIR=include
-        -DINSTALL_CMAKE_DIR=lib/cmake
-        -DRTABMAP_VERSION=${VERSION}
-)
-vcpkg_cmake_install()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
-
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
-file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+# Only the standalone tool
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+set(VCPKG_BUILD_TYPE release)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO introlab/rtabmap
+    REF "${VERSION}"
+    SHA512 b18515a1215d76592f748c6d18c4c7cd6311739be411dfbc787d11d69729b1193265d5970816cef2b5b5dc9f4418547896d7749fd76137c0888e1dcb7de66fca
+    HEAD_REF master
+)
+file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DINSTALL_INCLUDE_DIR=include
+        -DINSTALL_CMAKE_DIR=lib/cmake
+        -DRTABMAP_VERSION=${VERSION}
+)
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/include"
+    "${CURRENT_PACKAGES_DIR}/lib"
+)
+
+# We don't use vcpkg_copy_tools here, as some platforms need rtabmap-res_tool-${UTILITE_VERSION}, aside from rtabmap-res_tool
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE"
+        "${SOURCE_PATH}/utilite/resource_generator/main.cpp"
+)
diff --git a/ports/rtabmap-res-tool/vcpkg.json b/ports/rtabmap-res-tool/vcpkg.json
index 77fe147da5..c09df2b0a3 100644
--- a/ports/rtabmap-res-tool/vcpkg.json
+++ b/ports/rtabmap-res-tool/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "rtabmap-res-tool",
-  "version": "0.23.2",
+  "version": "0.23.8",
   "description": "Real-Time Appearance-Based Mapping, resource generator",
   "homepage": "https://introlab.github.io/rtabmap/",
-  "license": "BSD-3-Clause",
+  "license": "BSD-3-Clause AND LGPL-3.0-or-later",
   "supports": "native",
   "dependencies": [
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 9f376e02b3..12c11ea470 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9021,7 +9021,7 @@
       "port-version": 0
     },
     "rtabmap-res-tool": {
-      "baseline": "0.23.2",
+      "baseline": "0.23.8",
       "port-version": 0
     },
     "rtaudio": {
diff --git a/versions/r-/rtabmap-res-tool.json b/versions/r-/rtabmap-res-tool.json
index 2b48a50022..62108c3875 100644
--- a/versions/r-/rtabmap-res-tool.json
+++ b/versions/r-/rtabmap-res-tool.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0be839430c53891d22475bb8dacb887c73262a29",
+      "version": "0.23.8",
+      "port-version": 0
+    },
     {
       "git-tree": "b8e610eae2d8c418506f21d191f687f28d1ec5c1",
       "version": "0.23.2",