diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index bf5d67418a56..eb5f3a155473 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -1,78 +1,78 @@ PORTNAME= colmap -DISTVERSION= 3.12.4 +DISTVERSION= 3.12.5 CATEGORIES= graphics MAINTAINER= fuz@FreeBSD.org COMMENT= Structure from motion and multi-view stereo WWW= https://colmap.github.io/ LICENSE= BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 MIT SIFTGPU LICENSE_COMB= multi LICENSE_NAME_SIFTGPU= SiftGPU non-commercial license LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/src/thirdparty/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING.txt # also FLANN LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/colmap/ui/media/LICENSE 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= libPoseLib.so:graphics/poselib \ libboost_program_options.so:devel/boost-libs \ libceres.so:math/ceres-solver \ libcurl.so:ftp/curl \ libfaiss.so:math/faiss \ libfreeimage.so:graphics/freeimage \ libglog.so:devel/glog \ 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 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= CUDA_ENABLED FETCH_FAISS FETCH_POSELIB CMAKE_TESTING_ON= TESTS_ENABLED LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu OPTIONS_DEFINE= CGAL DOCS OPENMP SIMD OPTIONS_DEFAULT= CGAL OPENMP SIMD CGAL_DESC= Graph-cut on Delaunay triangulation based meshing algorithm CGAL_BUILD_DEPENDS= cgal>0:math/cgal CGAL_LIB_DEPENDS= libgmp.so:math/gmp 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 OPENMP_CMAKE_BOOL= OPENMP_ENABLED .if !exists(/usr/include/omp.h) # XXX ports/199603: LLVM openmp in base doesn't support armv7 yet OPENMP_VARS= OPENMP=gcc- .endif SIMD_CMAKE_BOOL= SIMD_ENABLED SIMD_CFLAGS_i386= -msse2 SIMD_CFLAGS= ${SIMD_CFLAGS_${ARCH}} post-build-DOCS-on: ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} -C ${WRKSRC}/doc html post-install: ${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR}) ${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo # https://github.com/colmap/colmap/issues/3021#issuecomment-2536520512 pre-test: @${ECHO_MSG} Expected test suite failures on displayless machines: @${ECHO_MSG} "24 - feature/colmap_feature_sift_test (Subprocess aborted)" @${ECHO_MSG} "88 - util/colmap_util_opengl_utils_test (Subprocess aborted)" .include diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index 5b5eeb3ba7a4..08882ff634f1 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754391753 -SHA256 (colmap-colmap-3.12.4_GH0.tar.gz) = 320cb5a411cd0aa713adc05e208ec34067638e776260efd8098271342d408997 -SIZE (colmap-colmap-3.12.4_GH0.tar.gz) = 3580471 +TIMESTAMP = 1756392724 +SHA256 (colmap-colmap-3.12.5_GH0.tar.gz) = 93dfb220cce24d988506bbb1d27d4278eacfd4e372df61d380559d414c1bd9e4 +SIZE (colmap-colmap-3.12.5_GH0.tar.gz) = 3584697 diff --git a/graphics/colmap/files/patch-cmake_FindDependencies.cmake b/graphics/colmap/files/patch-cmake_FindDependencies.cmake deleted file mode 100644 index cdb62cbe1cf7..000000000000 --- a/graphics/colmap/files/patch-cmake_FindDependencies.cmake +++ /dev/null @@ -1,19 +0,0 @@ ---- cmake/FindDependencies.cmake.orig 2025-07-31 15:20:30 UTC -+++ cmake/FindDependencies.cmake -@@ -21,8 +21,7 @@ find_package(Boost ${COLMAP_FIND_TYPE} COMPONENTS - - find_package(Boost ${COLMAP_FIND_TYPE} COMPONENTS - graph -- program_options -- system) -+ program_options) - - find_package(Eigen3 ${COLMAP_FIND_TYPE}) - -@@ -247,4 +246,4 @@ if(OPENGL_ENABLED OR CUDA_ENABLED) - list(APPEND COLMAP_COMPILE_DEFINITIONS COLMAP_GPU_ENABLED) - message(STATUS "Enabling GPU support (OpenGL: ${OPENGL_ENABLED}, CUDA: ${CUDA_ENABLED})") - set(GPU_ENABLED ON) --endif() -\ No newline at end of file -+endif()