From e3b562d4674129c6746ca7e3d395f9119ae1d8a5 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 25 Jun 2026 21:14:19 -0700 Subject: [PATCH 1/6] [rtabmap] update to 0.23.7 --- ports/rtabmap/portfile.cmake | 2 +- ports/rtabmap/vcpkg.json | 2 +- versions/r-/rtabmap.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 3f92f28cfdbb71..d0c48da467bbd4 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO introlab/rtabmap REF ${VERSION} - SHA512 9bcd0f359e0ee8060cf7088761544a3f7d38aadb37df820958f0811aa7b8edbfaf00f00d9472a8bf46261d4e5d868f9c10785263aaabaf374b6e5aa5237d70b0 + SHA512 92c7709b189886e8de772bcf68b0e04ad79a411f0886c2bf8319d001a6015f197b6fb04ae1b3e9e90a2fbc83f5ecf4e607a631644dfa9453073315344c23ee73 HEAD_REF master PATCHES 0001-cmakelists-fixes.patch diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index 3d3edd81395a4a..acbeee001a0e76 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rtabmap", - "version": "0.23.2", + "version": "0.23.7", "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": null, diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index 8b2fa29e60416a..e59d56f843a6a7 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b9854ef10fa7c4acef51005aed1febb756ec655", + "version": "0.23.7", + "port-version": 0 + }, { "git-tree": "9f2ab528536f58b4eb54ac6404497896857ab463", "version": "0.23.2", From 1a69051fd56a9b65d331ec09e74545662912ac10 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 25 Jun 2026 21:25:20 -0700 Subject: [PATCH 2/6] missing baseline.json --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 09d5ee68ffba12..8a0157a91b19ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8953,7 +8953,7 @@ "port-version": 5 }, "rtabmap": { - "baseline": "0.23.2", + "baseline": "0.23.7", "port-version": 0 }, "rtabmap-res-tool": { From daa06f961588640bd3bf6733d02012b41aed125f Mon Sep 17 00:00:00 2001 From: matlabbe Date: Fri, 26 Jun 2026 00:55:40 -0700 Subject: [PATCH 3/6] fixed missing tools --- ports/rtabmap/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index d0c48da467bbd4..1e7f95b3fc3411 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -126,6 +126,7 @@ if("tools" IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES rtabmap-camera + rtabmap-cidsims_dataset rtabmap-console rtabmap-detectMoreLoopClosures rtabmap-export @@ -139,6 +140,7 @@ if("tools" IN_LIST FEATURES) rtabmap-euroc_dataset rtabmap-cleanupLocalGrids rtabmap-globalBundleAdjustment + rtabmap-reduceGraph AUTO_CLEAN ) if("gui" IN_LIST FEATURES) From 747af0241e8d51e831890bcf9f6bfa3c44ed88c4 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Fri, 26 Jun 2026 00:57:00 -0700 Subject: [PATCH 4/6] version --- versions/r-/rtabmap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index e59d56f843a6a7..1215f4b61380d9 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1b9854ef10fa7c4acef51005aed1febb756ec655", + "git-tree": "ba813e11bf7ab123b9c34357ffc8206d556fe250", "version": "0.23.7", "port-version": 0 }, From 3a3088588bcaf17910683f9af42d7820775dbbcd Mon Sep 17 00:00:00 2001 From: matlabbe Date: Fri, 26 Jun 2026 09:25:46 -0700 Subject: [PATCH 5/6] [rtabmap] fix tools feature build without Qt (report tool) --- ports/rtabmap/0005-fix-report-without-qt.patch | 17 +++++++++++++++++ ports/rtabmap/portfile.cmake | 1 + versions/r-/rtabmap.json | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ports/rtabmap/0005-fix-report-without-qt.patch diff --git a/ports/rtabmap/0005-fix-report-without-qt.patch b/ports/rtabmap/0005-fix-report-without-qt.patch new file mode 100644 index 00000000000000..28303117fd18ba --- /dev/null +++ b/ports/rtabmap/0005-fix-report-without-qt.patch @@ -0,0 +1,17 @@ +diff --git a/tools/Report/CMakeLists.txt b/tools/Report/CMakeLists.txt +index 790a6a61..9e5f2ab2 100644 +--- a/tools/Report/CMakeLists.txt ++++ b/tools/Report/CMakeLists.txt +@@ -11,8 +11,11 @@ TARGET_LINK_LIBRARIES(report ${LIBRARIES}) + + SET_TARGET_PROPERTIES(report PROPERTIES + OUTPUT_NAME ${PROJECT_PREFIX}-report +- COMPILE_DEFINITIONS "WITH_QT" + ) ++ ++IF(WITH_QT AND (QT4_FOUND OR Qt5_FOUND OR Qt6_FOUND)) ++ SET_TARGET_PROPERTIES(report PROPERTIES COMPILE_DEFINITIONS "WITH_QT") ++ENDIF(WITH_QT AND (QT4_FOUND OR Qt5_FOUND OR Qt6_FOUND)) + + INSTALL(TARGETS report + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 1e7f95b3fc3411..f72301832605cc 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( 0002-fix-link.patch 0003-multi-definition.patch 0004-remove-apple-sys-path.patch + 0005-fix-report-without-qt.patch ) # Will use vcpkg to find these packages file(REMOVE_RECURSE diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index 1215f4b61380d9..daead111b877b7 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ba813e11bf7ab123b9c34357ffc8206d556fe250", + "git-tree": "697749cfc4da722dce4e5b5e5b873425cc9b0171", "version": "0.23.7", "port-version": 0 }, From 781009ca17fae0f3617ff8762b0fddb9901dfadf Mon Sep 17 00:00:00 2001 From: matlabbe Date: Fri, 26 Jun 2026 20:07:37 -0700 Subject: [PATCH 6/6] [rtabmap] Update arm64-windows feature baseline --- scripts/ci.feature.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 58f9d6488ab88f..1790db82a7f554 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1285,7 +1285,6 @@ rsocket:arm64-linux=cascade rsocket:arm64-windows=cascade rsocket:x86-windows=cascade rtabmap:arm64-linux=cascade -rtabmap:arm64-windows=cascade rtabmap[k4w2,openni2](arm | !windows)=cascade rtabmap[opencv-cuda](!x64 | android | osx)=cascade rtabmap[openmp]:arm64-osx=feature-fails # No openmp on default osx toolchain