git: a1e972553d1e - main - graphics/colmap: update to 3.7

The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a1e972553d1e091365b2913ba895738331e86831

commit a1e972553d1e091365b2913ba895738331e86831
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-11-11 20:40:16 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-11-11 20:41:58 +0000

    graphics/colmap: update to 3.7
    
    - Update to 3.7
    - portclippy and portfmt a bit
    - Assume MAINTAINER
---
 graphics/colmap/Makefile  | 35 +++++++++++++++++------------------
 graphics/colmap/distinfo  |  6 +++---
 graphics/colmap/pkg-plist |  8 ++++++++
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index acc2e7ea3edf..6a0fb4625ab2 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -1,17 +1,16 @@
 PORTNAME=	colmap
-DISTVERSION=	3.6
-PORTREVISION=	10
+DISTVERSION=	3.7
 CATEGORIES=	graphics
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fuz@fuz.su
 COMMENT=	Structure from motion and multi-view stereo
 WWW=		https://colmap.github.io/
 
 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_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
@@ -19,31 +18,34 @@ 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 \
+		libceres.so:math/ceres-solver \
 		libfreeimage.so:graphics/freeimage \
-		libceres.so:math/ceres-solver
+		libglog.so:devel/glog
 
-USES=		cmake compiler:${OPENMP}c++11-lib eigen:3 gl localbase qt:5 \
-		sqlite
+USES=		cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \
+		localbase python:env qt:5 sqlite
 USE_GITHUB=	yes
 USE_GL=		gl glew
-USE_QT=		qmake:build buildtools:build core gui opengl:build widgets
+USE_QT=		core gui widgets buildtools:build opengl:build qmake:build
 EXCLUDE=	SQLite
-EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude lib/,}
 CMAKE_OFF=	BOOST_STATIC CUDA_ENABLED
-LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
 TEST_TARGET=	test
 
+LDFLAGS+=	-Wl,--as-needed # gflags, glu, xi, xmu
+
+EXTRACT_AFTER_ARGS=	${EXCLUDE:S,^,--exclude lib/,}
+
 OPTIONS_DEFINE=		CGAL DOCS OPENMP SIMD TEST
 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=	gmake:devel/gmake \
-			sphinx-build:textproc/py-sphinx \
-			${NONEXISTENT}:textproc/py-sphinx_rtd_theme
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			gmake:devel/gmake \
+			sphinx-build:textproc/py-sphinx
 DOCS_PORTDOCS=		*
 
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
@@ -66,9 +68,6 @@ post-patch:
 		${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
diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo
index 6797595808ca..fe2a60c2aa37 100644
--- a/graphics/colmap/distinfo
+++ b/graphics/colmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595590074
-SHA256 (colmap-colmap-3.6_GH0.tar.gz) = ea22d026a3b13d339551319f4562fe1471b7232433695970704669755031a192
-SIZE (colmap-colmap-3.6_GH0.tar.gz) = 6322652
+TIMESTAMP = 1667929528
+SHA256 (colmap-colmap-3.7_GH0.tar.gz) = ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55
+SIZE (colmap-colmap-3.7_GH0.tar.gz) = 6354531
diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist
index 1530c9535338..93ad7e14b50a 100644
--- a/graphics/colmap/pkg-plist
+++ b/graphics/colmap/pkg-plist
@@ -50,6 +50,14 @@ include/colmap/estimators/translation_transform.h
 include/colmap/estimators/triangulation.h
 include/colmap/estimators/two_view_geometry.h
 include/colmap/estimators/utils.h
+include/colmap/exe/database.h
+include/colmap/exe/feature.h
+include/colmap/exe/gui.h
+include/colmap/exe/image.h
+include/colmap/exe/model.h
+include/colmap/exe/mvs.h
+include/colmap/exe/sfm.h
+include/colmap/exe/vocab_tree.h
 include/colmap/feature/extraction.h
 include/colmap/feature/matching.h
 include/colmap/feature/sift.h