Date: Tue, 24 Mar 2026 19:17:11 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 177047a0eb18 - main - graphics/colmap: update to 4.0.2 Message-ID: <69c2e337.429ea.457f6b8e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=177047a0eb18ae076a05c172b642c5db8a34a306 commit 177047a0eb18ae076a05c172b642c5db8a34a306 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-03-21 13:31:19 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-03-24 19:12:38 +0000 graphics/colmap: update to 4.0.2 - now uses OpenImageIO instead of FreeImage - new option ONNX to use ONNX Runtime - added USES=display:test, fixing one unit test Changelog: https://github.com/colmap/colmap/releases/tag/4.0.0 Changelog: https://github.com/colmap/colmap/releases/tag/4.0.1 Changelog: https://github.com/colmap/colmap/releases/tag/4.0.2 --- graphics/colmap/Makefile | 21 ++++--- graphics/colmap/distinfo | 6 +- graphics/colmap/pkg-plist | 150 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 132 insertions(+), 45 deletions(-) diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 7942e92f3348..d2b479e5c65a 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -1,5 +1,5 @@ PORTNAME= colmap -DISTVERSION= 3.13.0 +DISTVERSION= 4.0.2 CATEGORIES= graphics MAINTAINER= fuz@FreeBSD.org @@ -21,18 +21,19 @@ LIB_DEPENDS= libPoseLib.so:graphics/poselib \ libceres.so:math/ceres-solver \ libcurl.so:ftp/curl \ libfaiss.so:math/faiss \ - libfreeimage.so:graphics/freeimage \ + libOpenImageIO.so:graphics/openimageio \ libglog.so:devel/glog \ - libmetis.so:math/metis + libmetis.so:math/metis \ + libcholmod.so:math/suitesparse-cholmod 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:6 sqlite ssl +USES= cmake:testing compiler:${OPENMP}c++11-lib desktop-file-utils \ + display:test eigen:3 gl localbase python:env qt:6 sqlite ssl USE_CXXSTD= c++17 USE_GITHUB= yes USE_GL= gl glew USE_QT= base -CMAKE_OFF= CUDA_ENABLED FETCH_FAISS FETCH_POSELIB +CMAKE_OFF= CUDA_ENABLED FETCH_FAISS FETCH_POSELIB FETCH_ONNX CMAKE_TESTING_ON= TESTS_ENABLED .if exists(/usr/include/omp.h) CMAKE_ON+= OPENMP_ENABLED @@ -42,8 +43,8 @@ CMAKE_OFF+= OPENMP_ENABLED LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu -OPTIONS_DEFINE= CGAL DOCS SIMD -OPTIONS_DEFAULT= CGAL SIMD +OPTIONS_DEFINE= CGAL ONNX DOCS SIMD +OPTIONS_DEFAULT= CGAL ONNX SIMD CGAL_DESC= Graph-cut on Delaunay triangulation based meshing algorithm CGAL_BUILD_DEPENDS= cgal>0:math/cgal @@ -53,6 +54,10 @@ CGAL_CMAKE_BOOL= CGAL_ENABLED DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ gmake:devel/gmake sphinx-build:textproc/py-sphinx +ONNX_DESC= Use Open Neural Network Exchange (ONNX) +ONNX_LIB_DEPENDS= libonnxruntime.so:misc/onnxruntime +ONNX_CMAKE_BOOL= ONNX_ENABLED + SIMD_CMAKE_BOOL= SIMD_ENABLED SIMD_CFLAGS_i386= -msse2 SIMD_CFLAGS= ${SIMD_CFLAGS_${ARCH}} diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index b8f81fb42106..f76b2b2299a2 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762535298 -SHA256 (colmap-colmap-3.13.0_GH0.tar.gz) = 98a8f8cf6358774be223239a9b034cc9d55bf66c43f54fc6ddea9128a1ee197a -SIZE (colmap-colmap-3.13.0_GH0.tar.gz) = 3622068 +TIMESTAMP = 1774081476 +SHA256 (colmap-colmap-4.0.2_GH0.tar.gz) = d220b54481b08212dcfe9e6deca6e998546a462a80140c3bd4ed9318d8c74482 +SIZE (colmap-colmap-4.0.2_GH0.tar.gz) = 4111050 diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist index 6bc131eca6fc..28fb474eb673 100644 --- a/graphics/colmap/pkg-plist +++ b/graphics/colmap/pkg-plist @@ -1,36 +1,55 @@ bin/colmap include/colmap/controllers/automatic_reconstruction.h +include/colmap/controllers/base_option_manager.h 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/global_pipeline.h include/colmap/controllers/hierarchical_pipeline.h include/colmap/controllers/image_reader.h include/colmap/controllers/incremental_pipeline.h +include/colmap/controllers/matcher_cache.h include/colmap/controllers/option_manager.h -include/colmap/estimators/absolute_pose.h -include/colmap/estimators/affine_transform.h +include/colmap/controllers/pairing.h +include/colmap/controllers/reconstruction_clustering.h +include/colmap/controllers/rotation_averaging.h +include/colmap/controllers/undistorters.h include/colmap/estimators/alignment.h include/colmap/estimators/bundle_adjustment.h +include/colmap/estimators/bundle_adjustment_ceres.h include/colmap/estimators/coordinate_frame.h -include/colmap/estimators/cost_functions.h +include/colmap/estimators/cost_functions/alignment.h +include/colmap/estimators/cost_functions/calibration.h +include/colmap/estimators/cost_functions/manifold.h +include/colmap/estimators/cost_functions/motion_averaging.h +include/colmap/estimators/cost_functions/pose_prior.h +include/colmap/estimators/cost_functions/reprojection_error.h +include/colmap/estimators/cost_functions/sampson_error.h +include/colmap/estimators/cost_functions/utils.h include/colmap/estimators/covariance.h -include/colmap/estimators/essential_matrix.h -include/colmap/estimators/essential_matrix_coeffs.h -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_pose.h -include/colmap/estimators/generalized_relative_pose.h -include/colmap/estimators/homography_matrix.h -include/colmap/estimators/manifold.h +include/colmap/estimators/global_positioning.h +include/colmap/estimators/gravity_refinement.h include/colmap/estimators/pose.h -include/colmap/estimators/similarity_transform.h -include/colmap/estimators/translation_transform.h +include/colmap/estimators/rotation_averaging.h +include/colmap/estimators/rotation_averaging_impl.h +include/colmap/estimators/solvers/absolute_pose.h +include/colmap/estimators/solvers/affine_transform.h +include/colmap/estimators/solvers/essential_matrix.h +include/colmap/estimators/solvers/essential_matrix_coeffs.h +include/colmap/estimators/solvers/essential_matrix_poly.h +include/colmap/estimators/solvers/euclidean_transform.h +include/colmap/estimators/solvers/fundamental_matrix.h +include/colmap/estimators/solvers/generalized_absolute_pose.h +include/colmap/estimators/solvers/generalized_relative_pose.h +include/colmap/estimators/solvers/homography_matrix.h +include/colmap/estimators/solvers/poselib_utils.h +include/colmap/estimators/solvers/similarity_transform.h +include/colmap/estimators/solvers/translation_transform.h include/colmap/estimators/triangulation.h include/colmap/estimators/two_view_geometry.h -include/colmap/estimators/utils.h +include/colmap/estimators/view_graph_calibration.h include/colmap/exe/database.h include/colmap/exe/feature.h include/colmap/exe/gui.h @@ -39,13 +58,17 @@ include/colmap/exe/model.h include/colmap/exe/mvs.h include/colmap/exe/sfm.h include/colmap/exe/vocab_tree.h +include/colmap/feature/aliked.h include/colmap/feature/extractor.h include/colmap/feature/index.h include/colmap/feature/matcher.h -include/colmap/feature/pairing.h +include/colmap/feature/onnx_matchers.h +include/colmap/feature/onnx_utils.h +include/colmap/feature/resources.h include/colmap/feature/sift.h include/colmap/feature/types.h include/colmap/feature/utils.h +include/colmap/geometry/bbox.h include/colmap/geometry/essential_matrix.h include/colmap/geometry/gps.h include/colmap/geometry/homography_matrix.h @@ -60,11 +83,14 @@ include/colmap/geometry/triangulation.h include/colmap/image/line.h include/colmap/image/undistortion.h include/colmap/image/warp.h +include/colmap/math/connected_components.h include/colmap/math/graph_cut.h include/colmap/math/math.h include/colmap/math/matrix.h include/colmap/math/polynomial.h include/colmap/math/random.h +include/colmap/math/spanning_tree.h +include/colmap/math/union_find.h include/colmap/mvs/consistency_graph.h include/colmap/mvs/cuda_flip.h include/colmap/mvs/cuda_rotate.h @@ -77,12 +103,14 @@ include/colmap/mvs/gpu_mat_prng.h include/colmap/mvs/gpu_mat_ref_image.h include/colmap/mvs/image.h include/colmap/mvs/mat.h +include/colmap/mvs/mesh_simplification.h include/colmap/mvs/meshing.h 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/texture_mapping.h include/colmap/mvs/workspace.h include/colmap/optim/combination_sampler.h include/colmap/optim/least_absolute_deviations.h @@ -110,8 +138,10 @@ include/colmap/scene/frame.h include/colmap/scene/image.h include/colmap/scene/point2d.h include/colmap/scene/point3d.h +include/colmap/scene/pose_graph.h include/colmap/scene/projection.h include/colmap/scene/reconstruction.h +include/colmap/scene/reconstruction_clustering.h include/colmap/scene/reconstruction_io.h include/colmap/scene/reconstruction_io_binary.h include/colmap/scene/reconstruction_io_text.h @@ -130,6 +160,7 @@ include/colmap/sensor/database.h include/colmap/sensor/models.h include/colmap/sensor/rig.h include/colmap/sensor/specs.h +include/colmap/sfm/global_mapper.h include/colmap/sfm/incremental_mapper.h include/colmap/sfm/incremental_mapper_impl.h include/colmap/sfm/incremental_triangulator.h @@ -141,39 +172,84 @@ include/colmap/thirdparty/PoissonRecon/Array.inl include/colmap/thirdparty/PoissonRecon/BSplineData.h include/colmap/thirdparty/PoissonRecon/BSplineData.inl include/colmap/thirdparty/PoissonRecon/BinaryNode.h +include/colmap/thirdparty/PoissonRecon/BlockedVector.h include/colmap/thirdparty/PoissonRecon/CmdLineParser.h include/colmap/thirdparty/PoissonRecon/CmdLineParser.inl +include/colmap/thirdparty/PoissonRecon/DataStream.h +include/colmap/thirdparty/PoissonRecon/DataStream.imp.h +include/colmap/thirdparty/PoissonRecon/DataStream.imp.inl +include/colmap/thirdparty/PoissonRecon/DataStream.inl +include/colmap/thirdparty/PoissonRecon/Extrapolator.h +include/colmap/thirdparty/PoissonRecon/FEMTree.Evaluation.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.Initialize.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.LevelSet.2D.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.LevelSet.3D.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.LevelSet.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.SortedTreeNodes.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.System.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.WeightedSamples.inl +include/colmap/thirdparty/PoissonRecon/FEMTree.h +include/colmap/thirdparty/PoissonRecon/FEMTree.inl include/colmap/thirdparty/PoissonRecon/Factor.h -include/colmap/thirdparty/PoissonRecon/FunctionData.h -include/colmap/thirdparty/PoissonRecon/FunctionData.inl include/colmap/thirdparty/PoissonRecon/Geometry.h include/colmap/thirdparty/PoissonRecon/Geometry.inl -include/colmap/thirdparty/PoissonRecon/Hash.h +include/colmap/thirdparty/PoissonRecon/Image.h +include/colmap/thirdparty/PoissonRecon/JPEG.h +include/colmap/thirdparty/PoissonRecon/JPEG.inl +include/colmap/thirdparty/PoissonRecon/LinearSolvers.h include/colmap/thirdparty/PoissonRecon/MAT.h include/colmap/thirdparty/PoissonRecon/MAT.inl include/colmap/thirdparty/PoissonRecon/MarchingCubes.h -include/colmap/thirdparty/PoissonRecon/MemoryUsage.h -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.Evaluation.inl -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.IsoSurface.inl -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.SortedTreeNodes.inl -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.System.inl -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.WeightedSamples.inl -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.h -include/colmap/thirdparty/PoissonRecon/MultiGridOctreeData.inl -include/colmap/thirdparty/PoissonRecon/MyTime.h -include/colmap/thirdparty/PoissonRecon/Octree.h -include/colmap/thirdparty/PoissonRecon/Octree.inl +include/colmap/thirdparty/PoissonRecon/MergePlyClientServer.h +include/colmap/thirdparty/PoissonRecon/MergePlyClientServer.inl +include/colmap/thirdparty/PoissonRecon/MultiThreading.h +include/colmap/thirdparty/PoissonRecon/MyAtomic.h +include/colmap/thirdparty/PoissonRecon/MyExceptions.h +include/colmap/thirdparty/PoissonRecon/MyMiscellany.h +include/colmap/thirdparty/PoissonRecon/NestedVector.h +include/colmap/thirdparty/PoissonRecon/PNG.h +include/colmap/thirdparty/PoissonRecon/PNG.inl include/colmap/thirdparty/PoissonRecon/PPolynomial.h include/colmap/thirdparty/PoissonRecon/PPolynomial.inl +include/colmap/thirdparty/PoissonRecon/ParameterPack.h include/colmap/thirdparty/PoissonRecon/Ply.h -include/colmap/thirdparty/PoissonRecon/PointStream.h -include/colmap/thirdparty/PoissonRecon/PointStream.inl +include/colmap/thirdparty/PoissonRecon/Ply.inl +include/colmap/thirdparty/PoissonRecon/PlyFile.h +include/colmap/thirdparty/PoissonRecon/PlyFile.inl +include/colmap/thirdparty/PoissonRecon/PointExtent.h +include/colmap/thirdparty/PoissonRecon/PointExtent.inl +include/colmap/thirdparty/PoissonRecon/PointPartition.h +include/colmap/thirdparty/PoissonRecon/PointPartition.inl +include/colmap/thirdparty/PoissonRecon/PointPartitionClientServer.h +include/colmap/thirdparty/PoissonRecon/PointPartitionClientServer.inl +include/colmap/thirdparty/PoissonRecon/PoissonRecon.client.inl include/colmap/thirdparty/PoissonRecon/PoissonRecon.h +include/colmap/thirdparty/PoissonRecon/PoissonRecon.server.inl +include/colmap/thirdparty/PoissonRecon/PoissonReconClientServer.h +include/colmap/thirdparty/PoissonRecon/PoissonReconClientServer.inl include/colmap/thirdparty/PoissonRecon/Polynomial.h include/colmap/thirdparty/PoissonRecon/Polynomial.inl +include/colmap/thirdparty/PoissonRecon/PreProcessor.h +include/colmap/thirdparty/PoissonRecon/Rasterizer.h +include/colmap/thirdparty/PoissonRecon/Rasterizer.inl +include/colmap/thirdparty/PoissonRecon/Reconstructors.h +include/colmap/thirdparty/PoissonRecon/Reconstructors.streams.h +include/colmap/thirdparty/PoissonRecon/RegularGrid.h +include/colmap/thirdparty/PoissonRecon/RegularGrid.inl +include/colmap/thirdparty/PoissonRecon/RegularTree.h +include/colmap/thirdparty/PoissonRecon/RegularTree.inl +include/colmap/thirdparty/PoissonRecon/Socket.h +include/colmap/thirdparty/PoissonRecon/Socket.inl include/colmap/thirdparty/PoissonRecon/SparseMatrix.h include/colmap/thirdparty/PoissonRecon/SparseMatrix.inl +include/colmap/thirdparty/PoissonRecon/SparseMatrixInterface.h +include/colmap/thirdparty/PoissonRecon/SparseMatrixInterface.inl +include/colmap/thirdparty/PoissonRecon/Streams.h include/colmap/thirdparty/PoissonRecon/SurfaceTrimmer.h +include/colmap/thirdparty/PoissonRecon/VertexFactory.h +include/colmap/thirdparty/PoissonRecon/VertexFactory.inl +include/colmap/thirdparty/PoissonRecon/Window.h +include/colmap/thirdparty/PoissonRecon/Window.inl include/colmap/thirdparty/SiftGPU/CLTexImage.h include/colmap/thirdparty/SiftGPU/CuTexImage.h include/colmap/thirdparty/SiftGPU/FrameBufferObject.h @@ -244,6 +320,7 @@ include/colmap/ui/line_painter.h include/colmap/ui/log_widget.h include/colmap/ui/main_window.h include/colmap/ui/match_matrix_widget.h +include/colmap/ui/mesh_painter.h include/colmap/ui/model_viewer_widget.h include/colmap/ui/movie_grabber_widget.h include/colmap/ui/options_widget.h @@ -272,9 +349,9 @@ include/colmap/util/file.h include/colmap/util/glog_macros.h include/colmap/util/logging.h include/colmap/util/misc.h +include/colmap/util/oiio_utils.h include/colmap/util/opengl_utils.h include/colmap/util/ply.h -include/colmap/util/sqlite3_utils.h include/colmap/util/string.h include/colmap/util/testing.h include/colmap/util/threading.h @@ -283,6 +360,7 @@ include/colmap/util/types.h include/colmap/util/version.h lib/libcolmap_controllers.a lib/libcolmap_estimators.a +lib/libcolmap_estimators_solvers.a lib/libcolmap_exe.a lib/libcolmap_feature.a lib/libcolmap_feature_types.a @@ -295,6 +373,7 @@ lib/libcolmap_optim.a lib/libcolmap_poisson_recon.a lib/libcolmap_retrieval.a lib/libcolmap_scene.a +lib/libcolmap_scene_types.a lib/libcolmap_sensor.a lib/libcolmap_sfm.a lib/libcolmap_sift_gpu.a @@ -302,12 +381,13 @@ lib/libcolmap_ui.a lib/libcolmap_util.a lib/libcolmap_vlfeat.a share/applications/COLMAP.desktop +%%DATADIR%%/cmake/FindCHOLMOD.cmake %%DATADIR%%/cmake/FindCryptoPP.cmake %%DATADIR%%/cmake/FindDependencies.cmake -%%DATADIR%%/cmake/FindFreeImage.cmake %%DATADIR%%/cmake/FindGlew.cmake %%DATADIR%%/cmake/FindGlog.cmake %%DATADIR%%/cmake/FindMetis.cmake +%%DATADIR%%/cmake/Findonnxruntime.cmake %%DATADIR%%/colmap-config-version.cmake %%DATADIR%%/colmap-config.cmake %%DATADIR%%/colmap-targets-%%CMAKE_BUILD_TYPE%%.cmake @@ -324,6 +404,7 @@ share/applications/COLMAP.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/database.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/datasets.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/faq.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/features.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/format.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/gui.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt @@ -383,6 +464,7 @@ share/applications/COLMAP.desktop %%PORTDOCS%%%%DOCSDIR%%/database.html %%PORTDOCS%%%%DOCSDIR%%/datasets.html %%PORTDOCS%%%%DOCSDIR%%/faq.html +%%PORTDOCS%%%%DOCSDIR%%/features.html %%PORTDOCS%%%%DOCSDIR%%/format.html %%PORTDOCS%%%%DOCSDIR%%/genindex.html %%PORTDOCS%%%%DOCSDIR%%/gui.htmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c2e337.429ea.457f6b8e>