Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 443768) +++ head/graphics/colmap/Makefile (revision 443769) @@ -1,84 +1,85 @@ # $FreeBSD$ PORTNAME= colmap -DISTVERSION= 3.0 +DISTVERSION= 3.1-4 +DISTVERSIONSUFFIX= -g542ce21 # doc fixes CATEGORIES= graphics 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}/src/ext/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/src/ext/FLANN/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/ui/media/LICENSE LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.txt LICENSE_FILE_MIT= ${WRKSRC}/src/ext/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/src/ext/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept BUILD_DEPENDS= eigen>=3:math/eigen3 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 fortran localbase sqlite USE_GITHUB= yes USE_GL= gl glew glut USE_QT5= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,} CMAKE_ARGS= -DBOOST_STATIC=off -DCUDA_ENABLED=off CFLAGS+= -DVL_OS_LINUX=1 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= DOCS OPENMP SIMD TEST OPTIONS_DEFAULT= OPENMP SIMD DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_USES= gmake DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED # XXX ports/199603 + ports/210337 OPENMP_VARS= OPENMP=gcc- SIMD_CMAKE_BOOL= SIMD_ENABLED TEST_CMAKE_BOOL= TESTS_ENABLED post-patch: @${REINPLACE_CMD} -e 's/Qt5OpenGL/Qt5Widgets/' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/install.*test/d' \ ${WRKSRC}/cmake/CMakeHelper.cmake # XXX Unbundle FLANN as it has more consumers @${REINPLACE_CMD} -e '/SQLite/d' \ ${WRKSRC}/src/ext/CMakeLists.txt @${REINPLACE_CMD} -e 's,ext/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: @${DO_MAKE_BUILD} html -C${WRKSRC}/doc pre-install-TEST-on: do-test 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 443768) +++ head/graphics/colmap/distinfo (revision 443769) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495458157 -SHA256 (colmap-colmap-3.0_GH0.tar.gz) = e13e993358e37bfd7fa909a255e3be9740f778757991b1b368a00ffa7302b41e -SIZE (colmap-colmap-3.0_GH0.tar.gz) = 5640200 +TIMESTAMP = 1497537121 +SHA256 (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = c8b6c5f9eea30f8e5ff95fe87ff1cc6123639c450602035082d33609b6e275de +SIZE (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = 5657539 Index: head/graphics/colmap/files/patch-nogit =================================================================== --- head/graphics/colmap/files/patch-nogit (revision 443768) +++ head/graphics/colmap/files/patch-nogit (nonexistent) @@ -1,28 +0,0 @@ -build: make git dependency optional - ---- CMakeLists.txt.orig 2017-05-22 13:02:37 UTC -+++ CMakeLists.txt -@@ -72,7 +72,7 @@ find_package(Ceres REQUIRED) - find_package(OpenGL REQUIRED) - find_package(GLUT REQUIRED) - find_package(Glew REQUIRED) --find_package(Git REQUIRED) -+find_package(Git) - - if(CUDA_ENABLED) - find_package(CUDA QUIET) ---- cmake/GenerateVersionDefinitions.cmake.orig 2017-05-22 13:02:37 UTC -+++ cmake/GenerateVersionDefinitions.cmake -@@ -1,3 +1,4 @@ -+if(Git_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") - execute_process(COMMAND - "${GIT_EXECUTABLE}" rev-parse --short HEAD - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -@@ -9,6 +10,7 @@ execute_process(COMMAND - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_VARIABLE GIT_COMMIT_DATE - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif() - - configure_file("${CMAKE_SOURCE_DIR}/src/util/version.h.in" - "${CMAKE_SOURCE_DIR}/src/util/version.h") Property changes on: head/graphics/colmap/files/patch-nogit ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/colmap/files/patch-src_CMakeLists.txt =================================================================== --- head/graphics/colmap/files/patch-src_CMakeLists.txt (revision 443768) +++ head/graphics/colmap/files/patch-src_CMakeLists.txt (nonexistent) @@ -1,23 +0,0 @@ -build: limit -ldl to Linux and allow -lpthread for Clang - ---- src/CMakeLists.txt.orig 2016-12-07 13:47:54 UTC -+++ src/CMakeLists.txt -@@ -41,6 +41,7 @@ set(COLMAP_LIBRARIES - sqlite3 - sift_gpu - vlfeat -+ ${CMAKE_DL_LIBS} - ${Boost_FILESYSTEM_LIBRARY} - ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${Boost_REGEX_LIBRARY} -@@ -61,8 +62,8 @@ if(CUDA_ENABLED) - util_cuda) - endif() - --if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") -- set(COLMAP_LIBRARIES ${COLMAP_LIBRARIES} pthread dl) -+if(UNIX) -+ set(COLMAP_LIBRARIES ${COLMAP_LIBRARIES} pthread) - endif() - - set(COLMAP_UI_LIBRARIES ui) Property changes on: head/graphics/colmap/files/patch-src_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property