git: 13b4aed19b61 - main - graphics/colmap: touch up

The branch main has been updated by fuz:

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

commit 13b4aed19b6141e9410ba55528d925571b0108e4
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-12-11 16:50:32 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-17 00:31:52 +0000

    graphics/colmap: touch up
    
     - document expected test suite failures
     - add missing TEST_DEPENDS
     - remove outdated commented out Makefile chunk
    
    See also:       https://github.com/colmap/colmap/issues/3021
---
 graphics/colmap/Makefile | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index 0457ca2324ab..15e955cbd7a4 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS=	libPoseLib.so:graphics/poselib \
 		libglog.so:devel/glog \
 		liblz4.so:archivers/liblz4 \
 		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
@@ -49,7 +50,7 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx
 
 OPENMP_CMAKE_BOOL=	OPENMP_ENABLED
 .if !exists(/usr/include/omp.h)
-# XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
+# XXX ports/199603: LLVM openmp in base doesn't support armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
@@ -57,15 +58,6 @@ SIMD_CMAKE_BOOL=	SIMD_ENABLED
 SIMD_CFLAGS_i386=	-msse2
 SIMD_CFLAGS=		${SIMD_CFLAGS_${ARCH}}
 
-#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
-#.if !defined(DISPLAY) # QApplication
-#	@${REINPLACE_CMD} -e '/opengl_utils_test/d' \
-#		${WRKSRC}/src/util/CMakeLists.txt
-#.endif
-
 post-build-DOCS-on:
 	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} -C ${WRKSRC}/doc html
 
@@ -77,4 +69,10 @@ post-install-DOCS-on:
 		. ${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 <bsd.port.mk>