graphics/colmap: update to 3.0

Changes:	https://github.com/colmap/colmap/compare/2.1...3.0

8 files changed, 59 insertions, 33 deletions

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index 3f29d488611a..cb4138ba2909 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	colmap
-DISTVERSION=	2.1
-PORTREVISION=	7
+DISTVERSION=	3.0
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -38,7 +37,7 @@ CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
 TEST_TARGET=	test ARGS="-V"
 
-OPTIONS_DEFINE=		DOCS OPENMP SIMD
+OPTIONS_DEFINE=		DOCS OPENMP SIMD TEST
 OPTIONS_DEFAULT=	OPENMP SIMD
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
@@ -52,6 +51,8 @@ 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
@@ -74,18 +75,10 @@ post-patch:
 post-build-DOCS-on:
 	@${DO_MAKE_BUILD} html -C${WRKSRC}/doc
 
-pre-install:	do-test
+pre-install-TEST-on: do-test
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
-
-# FreeBSD 11.0 i386 has:
-#          7 - base/database_test (Failed)
-#         26 - estimators/epnp_test (Failed)
-#         34 - mvs/depth_map_test (Failed)
-#         39 - optim/loransac_test (Failed)
-#         42 - optim/ransac_test (Failed)
-do-test:	.IGNORE
diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo
index 986ace692e09..b3ae9aba7479 100644
--- a/graphics/colmap/distinfo
+++ b/graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481898956
-SHA256 (colmap-colmap-2.1_GH0.tar.gz) = 637c14b75194a590aeb6bcffdb8a6b2ec08aea68a78b6fcbbf26f2e9f5150ba0
-SIZE (colmap-colmap-2.1_GH0.tar.gz) = 5388786
+TIMESTAMP = 1495458157
+SHA256 (colmap-colmap-3.0_GH0.tar.gz) = e13e993358e37bfd7fa909a255e3be9740f778757991b1b368a00ffa7302b41e
+SIZE (colmap-colmap-3.0_GH0.tar.gz) = 5640200
diff --git a/graphics/colmap/files/patch-nogit b/graphics/colmap/files/patch-nogit
new file mode 100644
index 000000000000..479b06ca72bd
--- /dev/null
+++ b/graphics/colmap/files/patch-nogit
@@ -0,0 +1,28 @@
+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")
diff --git a/graphics/colmap/files/patch-pba-nostd b/graphics/colmap/files/patch-pba-nostd
index d893b723837e..6ab0e9fcf704 100644
--- a/graphics/colmap/files/patch-pba-nostd
+++ b/graphics/colmap/files/patch-pba-nostd
@@ -1,3 +1,5 @@
+pba: unbreak for GCC + libc++
+
 In file included from src/./ext/PBA/pba.h:50:0,
                  from src/./optim/bundle_adjustment.h:29,
                  from src/./util/option_manager.h:34,
diff --git a/graphics/colmap/files/patch-src_CMakeLists.txt b/graphics/colmap/files/patch-src_CMakeLists.txt
index d4fe26ee2cfc..be0f129d170b 100644
--- a/graphics/colmap/files/patch-src_CMakeLists.txt
+++ b/graphics/colmap/files/patch-src_CMakeLists.txt
@@ -1,27 +1,23 @@
-build: properly limit -lpthread and -ldl
+build: limit -ldl to Linux and allow -lpthread for Clang
 
 --- src/CMakeLists.txt.orig	2016-12-07 13:47:54 UTC
 +++ src/CMakeLists.txt
-@@ -34,6 +34,7 @@ set(COLMAP_LIBRARIES
+@@ -41,6 +41,7 @@ set(COLMAP_LIBRARIES
      sqlite3
      sift_gpu
      vlfeat
 +    ${CMAKE_DL_LIBS}
-     ${Boost_LIBRARIES}
-     ${GLOG_LIBRARIES}
-     ${FREEIMAGE_LIBRARIES}
-@@ -41,11 +42,11 @@ set(COLMAP_LIBRARIES
-     ${OPENGL_LIBRARIES})
- 
- if(CUDA_ENABLED)
--    set(COLMAP_LIBRARIES mvs mvs_cuda ${COLMAP_LIBRARIES})
-+    list(APPEND COLMAP_LIBRARIES mvs mvs_cuda)
+     ${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)
-+    list(APPEND COLMAP_LIBRARIES pthread)
++    set(COLMAP_LIBRARIES ${COLMAP_LIBRARIES} pthread)
  endif()
  
  set(COLMAP_UI_LIBRARIES ui)
diff --git a/graphics/colmap/files/patch-src_util_CMakeLists.txt b/graphics/colmap/files/patch-src_util_CMakeLists.txt
index 728d789e0e1f..3d718744e4fa 100644
--- a/graphics/colmap/files/patch-src_util_CMakeLists.txt
+++ b/graphics/colmap/files/patch-src_util_CMakeLists.txt
@@ -1,3 +1,5 @@
+build: prevent Clang < 4.0 crashing on i386
+
 --- src/util/CMakeLists.txt.orig	2016-08-09 10:34:35 UTC
 +++ src/util/CMakeLists.txt
 @@ -23,3 +23,10 @@ COLMAP_ADD_TEST(random_test random_test.
diff --git a/graphics/colmap/files/patch-vlfeat-rtcpu b/graphics/colmap/files/patch-vlfeat-rtcpu
index 9cf922ecbb74..1274f802d5f9 100644
--- a/graphics/colmap/files/patch-vlfeat-rtcpu
+++ b/graphics/colmap/files/patch-vlfeat-rtcpu
@@ -1,8 +1,8 @@
 build: don't force SSE2/AVX, enable at runtime instead
 
---- CMakeLists.txt.orig	2016-12-07 13:47:54 UTC
+--- CMakeLists.txt.orig	2017-05-22 13:02:37 UTC
 +++ CMakeLists.txt
-@@ -16,8 +16,6 @@ include(CheckCXXCompilerFlag)
+@@ -17,8 +17,6 @@ include(CheckCXXCompilerFlag)
  # the CMake policies in this file
  include(${CMAKE_SOURCE_DIR}/cmake/CMakeHelper.cmake NO_POLICY_SCOPE)
  
@@ -11,11 +11,11 @@ build: don't force SSE2/AVX, enable at runtime instead
  if(EXISTS ${CMAKE_SOURCE_DIR}/LocalConfig.cmake)
      include(${CMAKE_SOURCE_DIR}/LocalConfig.cmake)
  endif()
-@@ -29,6 +27,7 @@ endif()
+@@ -28,6 +26,7 @@ endif()
+ # Options
+ ################################################################################
  
- enable_testing()
- 
-+option(SIMD_ENABLED "Wether to enable SIMD optimizations" ON)
++option(SIMD_ENABLED "Whether to enable SIMD optimizations" ON)
  option(OPENMP_ENABLED "Whether to enable OpenMP" ON)
  option(LTO_ENABLED "Whether to enable link-time optimization" ON)
  option(CUDA_ENABLED "Whether to enable CUDA, if available" ON)
diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist
index 973c6db5ff9a..0e4a27104db3 100644
--- a/graphics/colmap/pkg-plist
+++ b/graphics/colmap/pkg-plist
@@ -1,3 +1,4 @@
+bin/automatic_reconstructor
 bin/bundle_adjuster
 bin/colmap
 bin/color_extractor
@@ -13,11 +14,15 @@ bin/image_undistorter
 bin/mapper
 bin/matches_importer
 bin/model_aligner
+bin/model_analyzer
 bin/model_converter
 bin/model_merger
+bin/model_orientation_aligner
+bin/point_triangulator
 bin/rig_bundle_adjuster
 bin/sequential_matcher
 bin/spatial_matcher
+bin/transitive_matcher
 bin/vocab_tree_builder
 bin/vocab_tree_matcher
 bin/vocab_tree_retriever