From 7baf7bc9f3390bab2f47e2bcbd35b065663bc80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 27 Jan 2022 01:15:59 +0100 Subject: [PATCH] [colmap] Upgrade to version 3.7 (#22805) * [colmap] Upgrade to version 3.7 * Format * version --- ports/colmap/portfile.cmake | 4 ++-- ports/colmap/vcpkg.json | 6 ++---- versions/baseline.json | 4 ++-- versions/c-/colmap.json | 5 +++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 1a5069730e..d1af859f66 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,10 +1,10 @@ -set(COLMAP_REF "3.6") +set(COLMAP_REF "3.7") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF ${COLMAP_REF} - SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632 + SHA512 a0c943383b9c8028e646e1cbcd9aab5f778c4f9e26a627da6c9d938b5816425d08f2ba651498b60f3b3ba1b8d4c5e6f82b5717b5d97778b99629170a988143ab HEAD_REF dev PATCHES fix-dependency-freeimage.patch diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index b9b5a09a29..b8efe322ef 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "colmap", - "version-string": "3.6", - "port-version": 2, + "version-string": "3.7", "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", @@ -9,7 +8,6 @@ "boost-filesystem", "boost-graph", "boost-program-options", - "boost-regex", "boost-system", "boost-test", { @@ -55,7 +53,7 @@ ] }, "tests": { - "description": "Enable TESTS." + "description": "Build all tests." } } } diff --git a/versions/baseline.json b/versions/baseline.json index 37f0168cc4..fa6006e716 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1461,8 +1461,8 @@ "port-version": 6 }, "colmap": { - "baseline": "3.6", - "port-version": 2 + "baseline": "3.7", + "port-version": 0 }, "comms": { "baseline": "3.4.0", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 118e56326a..b29b67cc11 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708", + "version-string": "3.7", + "port-version": 0 + }, { "git-tree": "7d3a2a8f71b464856f91f3b8b7e2362ec27d6487", "version-string": "3.6",