From nobody Tue Dec 17 00:59:00 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBz391l0Fz5gp2Z; Tue, 17 Dec 2024 00:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBz385WRtz4PHP; Tue, 17 Dec 2024 00:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734397140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ukv7N090s/zHfiPCuAGPFwqLxIkNN3+cUVCAFvbfKUQ=; b=pWvwJGir8nK5LBU8M23+xbLx5Q2Wrz8/RYFHDKYMvu+g9mn17UQfYqmLOSOYRMPEJ5DShM R0J8FmsC9dKixfHkFgsVDpqUI/bFBhciSyI59VBrB7lzpidK9bzS8sKshzXjVpVLmlT1Cq fzWkEveCGh2t5rbWl5DCl4BlQ7hlRIIB/q0Q0srpF/iSbf9eSpoGlNYRxLiSI2AKxyvZoC TU3EKfGpzo2mNoBQLqUeQgp7RC32CAVOcEJjo2aeovMy8y7gY8wh5SIfPVgsMJfOqUCd1L bJEjfz2LY3pJgg4zXuyuZNMRfePsa0bOI+Isvu/UwZsTwJh0TnOW4n6AizciVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734397140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ukv7N090s/zHfiPCuAGPFwqLxIkNN3+cUVCAFvbfKUQ=; b=OYTptZk1yXQ31QgnHMJH3DrF5X+mF6KCFp8wysHNFFwhM8JnlAnBhUZRTBr9cA0ieZBzKX j0RRsvOuHMvM3Ht0q+btgTpZShuxzP4xl/Lc1LOacTAB7DFRsZEQQHnE34O01tv0AJaYWy ZgN3K7TYMo311pbFW/sX7sfh+75N2QNK+/FS36z1fRPznu7FSO27A1TgotFZ7cPkwz5P/e N7xjSeUfZSLVY0ttIGINXqaOe16HxXHF+2pD3LBZS215ecv9cHwfCjPopOvBfNh/mNNHZN 9Ifxj72FQf7UMx1wpL7KQ0asN6EhNIKNJb2De4ujpD9kDypmFopDss5mtEatSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734397140; a=rsa-sha256; cv=none; b=ZXrbJgBtTOuxXxcFPd7TJ1yNo5kNWVntSQyXTfYIRYFutZF7Z+LC/4BLCYdz+69Ogqt54T NeeU30vISX/tBpFO4EUH7L1wcQirdc03fTWbaMT+kZxy0MEMLbc+zEZLxxbYpEw6f3xJBt 4h8vTVwadXRWfQSJCpyorH4W7C50i1nSmTvC4+ES/NgUtRoI+cmi9muA0NtvYZIaCuHlFe GWJBG23trf+vQvQbWB2Dix9mU+90TMVH95i+nBEaESGuBnPQF0yKzYiPlG849KXQQYJauX BYhwR6krZHYUxuQfr4hp7wG1BhnNKVF9seRubEWhQNYgU26ZdLm6+ZE3pdpp1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YBz3852ZVz1FwX; Tue, 17 Dec 2024 00:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BH0x0mD094893; Tue, 17 Dec 2024 00:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BH0x0Qr094890; Tue, 17 Dec 2024 00:59:00 GMT (envelope-from git) Date: Tue, 17 Dec 2024 00:59:00 GMT Message-Id: <202412170059.4BH0x0Qr094890@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 13b4aed19b61 - main - graphics/colmap: touch up List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13b4aed19b6141e9410ba55528d925571b0108e4 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=13b4aed19b6141e9410ba55528d925571b0108e4 commit 13b4aed19b6141e9410ba55528d925571b0108e4 Author: Robert Clausecker AuthorDate: 2024-12-11 16:50:32 +0000 Commit: Robert Clausecker 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