diff --git a/ports/colmap/fix-link-glog.patch b/ports/colmap/fix-link-glog.patch deleted file mode 100644 index ee1ca512c3..0000000000 --- a/ports/colmap/fix-link-glog.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/colmap/feature/CMakeLists.txt b/src/colmap/feature/CMakeLists.txt -index 78a2814..3680d05 100644 ---- a/src/colmap/feature/CMakeLists.txt -+++ b/src/colmap/feature/CMakeLists.txt -@@ -40,6 +40,7 @@ COLMAP_ADD_LIBRARY( - utils.h utils.cc - PUBLIC_LINK_LIBS - Eigen3::Eigen -+ glog::glog - PRIVATE_LINK_LIBS - colmap_util - colmap_math -diff --git a/src/colmap/image/CMakeLists.txt b/src/colmap/image/CMakeLists.txt -index 64381cb..875bea2 100644 ---- a/src/colmap/image/CMakeLists.txt -+++ b/src/colmap/image/CMakeLists.txt -@@ -38,6 +38,7 @@ COLMAP_ADD_LIBRARY( - warp.h warp.cc - PUBLIC_LINK_LIBS - Eigen3::Eigen -+ glog::glog - PRIVATE_LINK_LIBS - colmap_util - colmap_sensor -diff --git a/src/colmap/retrieval/CMakeLists.txt b/src/colmap/retrieval/CMakeLists.txt -index 903a935..cb8ad6a 100644 ---- a/src/colmap/retrieval/CMakeLists.txt -+++ b/src/colmap/retrieval/CMakeLists.txt -@@ -43,6 +43,7 @@ COLMAP_ADD_LIBRARY( - PUBLIC_LINK_LIBS - Boost::boost - Eigen3::Eigen -+ glog::glog - flann - lz4 - PRIVATE_LINK_LIBS diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 0284ec52b7..7cd675cb85 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,13 +1,11 @@ -set(COLMAP_REF "e99036415ec0cf0f75c1d0b8d60fdd91af0d6c68") # v3.9.1 +set(COLMAP_REF "0bd66d901c7549051e21e8f648777f802eb20a73") # v3.10 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF "${VERSION}" - SHA512 8af849f99e7f7bd024d8aaa0c66ae9192fd1a6f63869b96d77300e5203ac510f5359456567a786e29b14cbd1d580d1e3305194c3db8fd6ce10c1d592f988294c + SHA512 1bcb6b1a740d07666e9f1dcc813bd4464113d0054238c0f86a0ed94099918947d1a58d83661f8ff3fc699727627436b2b555c5d51d37c8ebad7f590155dcb43d HEAD_REF main - PATCHES - fix-link-glog.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 b2782ad4de..56da41beab 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "colmap", - "version": "3.9.1", + "version": "3.10", "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 d148f00097..c096d56923 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1785,7 +1785,7 @@ "port-version": 11 }, "colmap": { - "baseline": "3.9.1", + "baseline": "3.10", "port-version": 0 }, "color-console": { diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index a42df42c08..384a2b8893 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29a181de8c80f9008a9a46657a16ed187530a59b", + "version": "3.10", + "port-version": 0 + }, { "git-tree": "baca06856960d0b705e668bc376b84ebf565e3ce", "version": "3.9.1",