git: d48ee4e1b56e - main - graphics/colmap: update to 3.12.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Wed, 09 Jul 2025 15:52:47 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d48ee4e1b56e438b2038b954483bdcdfd3c4cc5e

commit d48ee4e1b56e438b2038b954483bdcdfd3c4cc5e
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-07-04 14:58:19 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-07-09 15:52:34 +0000

    graphics/colmap: update to 3.12.1
    
    Changelog: https://github.com/colmap/colmap/releases/tag/3.12.0
    Changelog: https://github.com/colmap/colmap/releases/tag/3.12.1
---
 graphics/colmap/Makefile                   | 13 ++++++-------
 graphics/colmap/distinfo                   |  6 +++---
 graphics/colmap/files/patch-CMakeLists.txt | 11 ++++-------
 graphics/colmap/pkg-plist                  | 27 ++++++++++++++++++++++-----
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index dbb6cfd7dfe8..47977c264e01 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	colmap
-DISTVERSION=	3.11.1
-PORTREVISION=	2
+DISTVERSION=	3.12.1
 CATEGORIES=	graphics
 
 MAINTAINER=	fuz@FreeBSD.org
@@ -18,22 +17,22 @@ LICENSE_FILE_SIFTGPU=	${WRKSRC}/src/thirdparty/SiftGPU/LICENSE
 LICENSE_PERMS_SIFTGPU=	dist-mirror pkg-mirror auto-accept
 
 LIB_DEPENDS=	libPoseLib.so:graphics/poselib \
-		libboost_filesystem.so:devel/boost-libs \
+		libboost_program_options.so:devel/boost-libs \
 		libceres.so:math/ceres-solver \
-		libflann.so:math/flann \
+		libcurl.so:ftp/curl \
+		libfaiss.so:math/faiss \
 		libfreeimage.so:graphics/freeimage \
 		libglog.so:devel/glog \
-		liblz4.so:archivers/liblz4 \
 		libmetis.so:math/metis
 TEST_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtest.pc:devel/googletest
 
 USES=		cmake:testing compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
-		localbase python:env qt:5 sqlite
+		localbase python:env qt:5 sqlite ssl
 USE_CXXSTD=	c++17
 USE_GITHUB=	yes
 USE_GL=		gl glew
 USE_QT=		core gui widgets buildtools:build opengl:build qmake:build
-CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED FETCH_POSELIB
+CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED FETCH_FAISS FETCH_POSELIB
 CMAKE_TESTING_ON=	TESTS_ENABLED
 
 LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo
index 65f2c01eccf4..ac3ae55ad257 100644
--- a/graphics/colmap/distinfo
+++ b/graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733745417
-SHA256 (colmap-colmap-3.11.1_GH0.tar.gz) = d2c20729ab5b1198e17725b720128f304f4cfae5c0a8c20d75c0e9c5bdee5860
-SIZE (colmap-colmap-3.11.1_GH0.tar.gz) = 3513052
+TIMESTAMP = 1751922819
+SHA256 (colmap-colmap-3.12.1_GH0.tar.gz) = 366496caca43e73a1e61c7ebd9dee51d5b2afe15c0e75e16ebad6cfae6f2860b
+SIZE (colmap-colmap-3.12.1_GH0.tar.gz) = 3577466
diff --git a/graphics/colmap/files/patch-CMakeLists.txt b/graphics/colmap/files/patch-CMakeLists.txt
index d1c928a91f9c..022d12ffe97d 100644
--- a/graphics/colmap/files/patch-CMakeLists.txt
+++ b/graphics/colmap/files/patch-CMakeLists.txt
@@ -1,14 +1,11 @@
---- CMakeLists.txt.orig	2024-10-16 10:58:58 UTC
+--- CMakeLists.txt.orig	2025-07-04 10:48:20 UTC
 +++ CMakeLists.txt
-@@ -125,9 +125,10 @@ endif()
+@@ -132,6 +132,8 @@ endif()
      unset(CLANG_TIDY_EXE)
  endif()
  
-+add_definitions("-DGLOG_USE_GLOG_EXPORT")
++add_compile_definitions(GLOG_USE_GLOG_EXPORT)
 +
  if(IS_MSVC)
      # Some fixes for the Glog library.
--    add_definitions("-DGLOG_USE_GLOG_EXPORT")
-     add_definitions("-DGLOG_NO_ABBREVIATED_SEVERITIES")
-     add_definitions("-DGL_GLEXT_PROTOTYPES")
-     add_definitions("-DNOMINMAX")
+     add_compile_definitions(GLOG_USE_GLOG_EXPORT)
diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist
index 5d20b23dc333..1dae83c7ea7c 100644
--- a/graphics/colmap/pkg-plist
+++ b/graphics/colmap/pkg-plist
@@ -21,7 +21,6 @@ include/colmap/estimators/essential_matrix_poly.h
 include/colmap/estimators/euclidean_transform.h
 include/colmap/estimators/fundamental_matrix.h
 include/colmap/estimators/generalized_absolute_pose.h
-include/colmap/estimators/generalized_absolute_pose_coeffs.h
 include/colmap/estimators/generalized_pose.h
 include/colmap/estimators/generalized_relative_pose.h
 include/colmap/estimators/homography_matrix.h
@@ -50,9 +49,13 @@ include/colmap/feature/utils.h
 include/colmap/geometry/essential_matrix.h
 include/colmap/geometry/gps.h
 include/colmap/geometry/homography_matrix.h
+include/colmap/geometry/normalization.h
 include/colmap/geometry/pose.h
+include/colmap/geometry/pose_prior.h
 include/colmap/geometry/rigid3.h
+include/colmap/geometry/rigid3_matchers.h
 include/colmap/geometry/sim3.h
+include/colmap/geometry/sim3_matchers.h
 include/colmap/geometry/triangulation.h
 include/colmap/image/line.h
 include/colmap/image/undistortion.h
@@ -79,6 +82,7 @@ include/colmap/mvs/model.h
 include/colmap/mvs/normal_map.h
 include/colmap/mvs/patch_match.h
 include/colmap/mvs/patch_match_cuda.h
+include/colmap/mvs/patch_match_options.h
 include/colmap/mvs/workspace.h
 include/colmap/optim/combination_sampler.h
 include/colmap/optim/least_absolute_deviations.h
@@ -93,21 +97,26 @@ include/colmap/retrieval/geometry.h
 include/colmap/retrieval/inverted_file.h
 include/colmap/retrieval/inverted_file_entry.h
 include/colmap/retrieval/inverted_index.h
+include/colmap/retrieval/resources.h
 include/colmap/retrieval/utils.h
 include/colmap/retrieval/visual_index.h
 include/colmap/retrieval/vote_and_verify.h
 include/colmap/scene/camera.h
-include/colmap/scene/camera_rig.h
 include/colmap/scene/correspondence_graph.h
 include/colmap/scene/database.h
 include/colmap/scene/database_cache.h
+include/colmap/scene/frame.h
 include/colmap/scene/image.h
 include/colmap/scene/point2d.h
 include/colmap/scene/point3d.h
 include/colmap/scene/projection.h
 include/colmap/scene/reconstruction.h
 include/colmap/scene/reconstruction_io.h
+include/colmap/scene/reconstruction_io_binary.h
+include/colmap/scene/reconstruction_io_text.h
+include/colmap/scene/reconstruction_io_utils.h
 include/colmap/scene/reconstruction_manager.h
+include/colmap/scene/rig.h
 include/colmap/scene/scene_clustering.h
 include/colmap/scene/synthetic.h
 include/colmap/scene/track.h
@@ -116,8 +125,10 @@ include/colmap/scene/visibility_pyramid.h
 include/colmap/sensor/bitmap.h
 include/colmap/sensor/database.h
 include/colmap/sensor/models.h
+include/colmap/sensor/rig.h
 include/colmap/sensor/specs.h
 include/colmap/sfm/incremental_mapper.h
+include/colmap/sfm/incremental_mapper_impl.h
 include/colmap/sfm/incremental_triangulator.h
 include/colmap/sfm/observation_manager.h
 include/colmap/thirdparty/LSD/lsd.h
@@ -253,8 +264,9 @@ include/colmap/util/cudacc.h
 include/colmap/util/eigen_alignment.h
 include/colmap/util/eigen_matchers.h
 include/colmap/util/endian.h
-include/colmap/util/enum_to_string.h
+include/colmap/util/enum_utils.h
 include/colmap/util/file.h
+include/colmap/util/glog_macros.h
 include/colmap/util/logging.h
 include/colmap/util/misc.h
 include/colmap/util/opengl_utils.h
@@ -287,12 +299,11 @@ lib/libcolmap_ui.a
 lib/libcolmap_util.a
 lib/libcolmap_vlfeat.a
 share/applications/COLMAP.desktop
+%%DATADIR%%/cmake/FindCryptoPP.cmake
 %%DATADIR%%/cmake/FindDependencies.cmake
-%%DATADIR%%/cmake/FindFLANN.cmake
 %%DATADIR%%/cmake/FindFreeImage.cmake
 %%DATADIR%%/cmake/FindGlew.cmake
 %%DATADIR%%/cmake/FindGlog.cmake
-%%DATADIR%%/cmake/FindLZ4.cmake
 %%DATADIR%%/cmake/FindMetis.cmake
 %%DATADIR%%/colmap-config-version.cmake
 %%DATADIR%%/colmap-config.cmake
@@ -305,6 +316,7 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/_sources/cameras.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/changelog.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/cli.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/contribution.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/database.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/datasets.rst.txt
@@ -313,10 +325,12 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/_sources/gui.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/install.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/legacy.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/license.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/cost_functions.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/pycolmap.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/_sources/rigs.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
@@ -361,6 +375,7 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/cameras.html
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/cli.html
+%%PORTDOCS%%%%DOCSDIR%%/concepts.html
 %%PORTDOCS%%%%DOCSDIR%%/contribution.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
 %%PORTDOCS%%%%DOCSDIR%%/datasets.html
@@ -370,11 +385,13 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/gui.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/legacy.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
 %%PORTDOCS%%%%DOCSDIR%%/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/pycolmap/cost_functions.html
 %%PORTDOCS%%%%DOCSDIR%%/pycolmap/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pycolmap/pycolmap.html
+%%PORTDOCS%%%%DOCSDIR%%/rigs.html
 %%PORTDOCS%%%%DOCSDIR%%/search.html
 %%PORTDOCS%%%%DOCSDIR%%/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.html