Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 504414) +++ head/graphics/colmap/Makefile (revision 504415) @@ -1,92 +1,95 @@ # $FreeBSD$ PORTNAME= colmap DISTVERSION= 3.5 PORTREVISION= 7 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b5ccc54e68e3.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Structure from motion and multi-view stereo LICENSE= BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 GPLv3+ MIT SIFTGPU LICENSE_COMB= multi LICENSE_NAME_SIFTGPU= SiftGPU non-commercial license LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/lib/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.txt # also FLANN LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/ui/media/LICENSE LICENSE_FILE_GPLv3+ = ${WRKSRC}/lib/PBA/LICENSE # also Graclus, LSD LICENSE_FILE_MIT= ${WRKSRC}/lib/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/lib/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libglog.so:devel/glog \ libfreeimage.so:graphics/freeimage \ libceres.so:math/ceres-solver USES= cmake compiler:${OPENMP}c++11-lib eigen:3 localbase qt:5 sqlite USE_GITHUB= yes USE_GL= gl glew USE_QT= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude lib/,} CMAKE_OFF= BOOST_STATIC CUDA_ENABLED CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu TEST_TARGET= test ARGS="-V" OPTIONS_DEFINE= CGAL DOCS OPENMP SIMD TEST OPTIONS_DEFAULT= CGAL OPENMP SIMD CGAL_DESC= Graph-cut on Delaunay triangulation based meshing algorithm CGAL_LIB_DEPENDS= libCGAL.so:math/cgal CGAL_CMAKE_BOOL= CGAL_ENABLED DOCS_BUILD_DEPENDS= gmake:devel/gmake \ sphinx-build:textproc/py-sphinx DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED .if ${MACHINE_ARCH} == i386 || !exists(/usr/include/omp.h) # XXX base/230888 via #pragma omp atomic # XXX ports/199603 + ports/210337 OPENMP_VARS= OPENMP=gcc- .endif SIMD_CMAKE_BOOL= SIMD_ENABLED TEST_CMAKE_BOOL= TESTS_ENABLED post-patch: # XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning: # https://github.com/colmap/colmap/commit/4b594eb85c13 # https://github.com/colmap/colmap/commit/1e9f1f3324cd @${REINPLACE_CMD} -e '/SQLite/d' \ ${WRKSRC}/lib/CMakeLists.txt @${REINPLACE_CMD} -e 's,SQLite/,,' \ ${WRKSRC}/src/base/database.h \ ${WRKSRC}/src/util/sqlite3_utils.h .if !defined(DISPLAY) # QApplication @${REINPLACE_CMD} -e '/feature_matching_test/d' \ -e '/feature_extraction_test/d' \ ${WRKSRC}/src/base/CMakeLists.txt @${REINPLACE_CMD} -e '/opengl_utils_test/d' \ ${WRKSRC}/src/util/CMakeLists.txt .endif post-build-DOCS-on: @${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} html -C${WRKSRC}/doc pre-install-TEST-on: do-test post-install: # XXX Clean up garbage after install(DIRECTORY) @${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/graphics/colmap/distinfo =================================================================== --- head/graphics/colmap/distinfo (revision 504414) +++ head/graphics/colmap/distinfo (revision 504415) @@ -1,3 +1,5 @@ TIMESTAMP = 1535031594 SHA256 (colmap-colmap-3.5_GH0.tar.gz) = 7a23856a5662daf5466ef9cdf821eb139f2e1bd6f0d3a03d1558ace5bc49bc06 SIZE (colmap-colmap-3.5_GH0.tar.gz) = 5872165 +SHA256 (b5ccc54e68e3.patch) = 38e8328e52889ec18dd69939c4fbef8b653d5f0fe022ca8eb3ae3b521582a3a8 +SIZE (b5ccc54e68e3.patch) = 1757