From adc5a060111cc411cd21c2eeb59c8c719bd2305d Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Wed, 17 Dec 2025 15:55:11 -0500 Subject: [PATCH] [colmap] fix missing cassert issue (#48931) Co-authored-by: Kai Pastor --- ports/colmap/add-missing-cassert.patch | 13 +++++++++++++ ports/colmap/portfile.cmake | 1 + ports/colmap/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/colmap.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/colmap/add-missing-cassert.patch diff --git a/ports/colmap/add-missing-cassert.patch b/ports/colmap/add-missing-cassert.patch new file mode 100644 index 0000000000..8a195a7ab9 --- /dev/null +++ b/ports/colmap/add-missing-cassert.patch @@ -0,0 +1,13 @@ +diff --git a/src/colmap/sfm/observation_manager.cc b/src/colmap/sfm/observation_manager.cc +index 22d076da..53412449 100644 +--- a/src/colmap/sfm/observation_manager.cc ++++ b/src/colmap/sfm/observation_manager.cc +@@ -36,6 +36,8 @@ + #include "colmap/util/logging.h" + #include "colmap/util/misc.h" + ++#include ++ + namespace colmap { + + bool MergeAndFilterReconstructions(const double max_reproj_error, diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 622af9ce92..aa0fad73e5 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES no-glu.diff + add-missing-cassert.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index a66e5477a4..cd6bfb987f 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version": "3.12.6", + "port-version": 1, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6ebd7e66ac..1e523bed41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1906,7 +1906,7 @@ }, "colmap": { "baseline": "3.12.6", - "port-version": 0 + "port-version": 1 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 32f2d6e9fc..1b9df462b4 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "868e9b94358a0830aad7c62adbc5beae1e52b6b7", + "version": "3.12.6", + "port-version": 1 + }, { "git-tree": "360970f724ed81ffbfa522c23b6a5ff6366b718a", "version": "3.12.6",