git: 1e2a4c95b428 - main - graphics/colmap: update to 3.11.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 10 Dec 2024 09:07:08 UTC
The branch main has been updated by fuz:

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

commit 1e2a4c95b428fec16c0f5c6deaa13d73c6a19df7
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-12-09 15:58:22 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-10 09:05:46 +0000

    graphics/colmap: update to 3.11.1
    
    Changelog: https://github.com/colmap/colmap/releases/tag/3.11.0
    Changelog: https://github.com/colmap/colmap/releases/tag/3.11.1
---
 graphics/colmap/Makefile  | 10 ++++++----
 graphics/colmap/distinfo  |  6 +++---
 graphics/colmap/pkg-plist | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index b2dbd366a963..0457ca2324ab 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	colmap
-DISTVERSION=	3.10
-PORTREVISION=	1
+DISTVERSION=	3.11.1
 CATEGORIES=	graphics
 
 MAINTAINER=	fuz@FreeBSD.org
@@ -17,7 +16,8 @@ LICENSE_FILE_MIT=	${WRKSRC}/src/thirdparty/PoissonRecon/LICENSE
 LICENSE_FILE_SIFTGPU=	${WRKSRC}/src/thirdparty/SiftGPU/LICENSE
 LICENSE_PERMS_SIFTGPU=	dist-mirror pkg-mirror auto-accept
 
-LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+LIB_DEPENDS=	libPoseLib.so:graphics/poselib \
+		libboost_filesystem.so:devel/boost-libs \
 		libceres.so:math/ceres-solver \
 		libflann.so:math/flann \
 		libfreeimage.so:graphics/freeimage \
@@ -31,7 +31,7 @@ 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
+CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED FETCH_POSELIB
 CMAKE_TESTING_ON=	TESTS_ENABLED
 
 LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
@@ -54,6 +54,8 @@ OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 SIMD_CMAKE_BOOL=	SIMD_ENABLED
+SIMD_CFLAGS_i386=	-msse2
+SIMD_CFLAGS=		${SIMD_CFLAGS_${ARCH}}
 
 #post-patch:
 # XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning:
diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo
index 2d17a0019fbf..65f2c01eccf4 100644
--- a/graphics/colmap/distinfo
+++ b/graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1729071767
-SHA256 (colmap-colmap-3.10_GH0.tar.gz) = 61850f323e201ab6a1abbfb0e4a8b3ba1c4cedbf55e0a5716bdea1df8ae1813a
-SIZE (colmap-colmap-3.10_GH0.tar.gz) = 3472972
+TIMESTAMP = 1733745417
+SHA256 (colmap-colmap-3.11.1_GH0.tar.gz) = d2c20729ab5b1198e17725b720128f304f4cfae5c0a8c20d75c0e9c5bdee5860
+SIZE (colmap-colmap-3.11.1_GH0.tar.gz) = 3513052
diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist
index 2a6d52ee972e..5d20b23dc333 100644
--- a/graphics/colmap/pkg-plist
+++ b/graphics/colmap/pkg-plist
@@ -4,9 +4,9 @@ include/colmap/controllers/bundle_adjustment.h
 include/colmap/controllers/feature_extraction.h
 include/colmap/controllers/feature_matching.h
 include/colmap/controllers/feature_matching_utils.h
-include/colmap/controllers/hierarchical_mapper.h
+include/colmap/controllers/hierarchical_pipeline.h
 include/colmap/controllers/image_reader.h
-include/colmap/controllers/incremental_mapper.h
+include/colmap/controllers/incremental_pipeline.h
 include/colmap/controllers/option_manager.h
 include/colmap/estimators/absolute_pose.h
 include/colmap/estimators/affine_transform.h
@@ -25,6 +25,7 @@ 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
+include/colmap/estimators/manifold.h
 include/colmap/estimators/pose.h
 include/colmap/estimators/similarity_transform.h
 include/colmap/estimators/translation_transform.h
@@ -40,6 +41,7 @@ include/colmap/exe/mvs.h
 include/colmap/exe/sfm.h
 include/colmap/exe/vocab_tree.h
 include/colmap/feature/extractor.h
+include/colmap/feature/index.h
 include/colmap/feature/matcher.h
 include/colmap/feature/pairing.h
 include/colmap/feature/sift.h
@@ -249,7 +251,10 @@ include/colmap/util/controller_thread.h
 include/colmap/util/cuda.h
 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/file.h
 include/colmap/util/logging.h
 include/colmap/util/misc.h
 include/colmap/util/opengl_utils.h
@@ -309,6 +314,9 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_sources/install.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/tutorial.rst.txt
 %%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
@@ -331,6 +339,7 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/_static/css/fonts/lato-normal.woff
 %%PORTDOCS%%%%DOCSDIR%%/_static/css/fonts/lato-normal.woff2
 %%PORTDOCS%%%%DOCSDIR%%/_static/css/theme.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/custom.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/file.png
@@ -363,6 +372,9 @@ share/applications/COLMAP.desktop
 %%PORTDOCS%%%%DOCSDIR%%/install.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%%/search.html
 %%PORTDOCS%%%%DOCSDIR%%/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.html