From nobody Fri Nov 11 20:42:09 2022 X-Original-To: dev-commits-ports-main@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 4N89cL0T7xz4g0Nd; Fri, 11 Nov 2022 20:42:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N89cL01kWz4SKq; Fri, 11 Nov 2022 20:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668199330; 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=oUoe2GGdgLv80o8mHgTBsXbuHyWdD999eb6z+V2DEIY=; b=tZsD4VQ4tAe+Oqp5M4uUij8IOoBLxznH53cYcKNfWCMbaTnbNlnrfoMfx2s/C18/Zopa3J dFo9kt333P6ZJfEPCqMc5L4GUzgt7mmFC+5CxBQktcJat6xd2N5HhDs6EyPhlPWHtCQgAd W1YrkESesFqPxnyrTxQLyJu/MePIbA7ilhpuqW7ja5sx6TrPXhNfQoE37nN6lrJ1vgNqnR yUWDzrEQUte+FQHYSTuqdLhPPx/SzsdRVufOiORBjoYpKcnx2UcBZ+DAUUuPkHFzPETFiW 2qpJJ39kPnkJ4hkyp4/HjxAhhu4X7GlQwDLeX+YpLGt9HpOC+rBXEdGvCZkI6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668199330; 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=oUoe2GGdgLv80o8mHgTBsXbuHyWdD999eb6z+V2DEIY=; b=teKXAKUNN73iqlalRHVopdjgGu9M1HImmN2j16GAKt/4Xvu0N6kAMYjEHfS82XZka1s51i Bi2X2CgDSHSlKDZgPQni8HvSqQkgS5UkzS+uwMJlouzKWRRhJtN2Zz0T0UJFgMV9XG1OsS VgYvzsrF4140VfOgWKL/fWZjrI/E6b4EaCKRkD37az6CmXNdcQ7YhiLTB6fH/x4McvLUfh A3tCpDhODfmAABFThiT5fqdwqVEj1NsZccSr9eUhoC+IYaDd4kxvU5Pg6EFJOmHDoE+mNp +1Oi5KT5Tk45e1tRT6G+OKQGFbbfWQrzwzIxddszPgEgwUEiPkvoKRAw1buN4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668199330; a=rsa-sha256; cv=none; b=FDrsPuTxQCLqHtN56QD5ZVU9mylguOs2fi4ooXlIhv7Pw7R54x+l7jb/8SKQSJCIYHsJu+ C3+LV2SJ3W3caNyDutWcBaw7g7wB+UCLNSmkROCbjKHLdUglUKRZeZbk9DC+GrIC9qbDJ/ qkY0FQKiFVFxli5JrdUF+Gq/56hfHtdP1x0PJpLwQBbcjIVaIHKRyXUU086uWBIeQJ+4b0 t5JrVYv6znHS/SOVesIF4dIJMQiI1MrB0UR0cLb1Sw7JM4CgpTZi8ue94zvVoLUzzfapdn 7MN6MuhAGM6s34QZSlDEZ4ZpR747sp3TsJAclofHZQqmWTZgrRP1UmINXldIjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N89cK6BtHzx25; Fri, 11 Nov 2022 20:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABKg9nu090773; Fri, 11 Nov 2022 20:42:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABKg92t090772; Fri, 11 Nov 2022 20:42:09 GMT (envelope-from git) Date: Fri, 11 Nov 2022 20:42:09 GMT Message-Id: <202211112042.2ABKg92t090772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: a1e972553d1e - main - graphics/colmap: update to 3.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1e972553d1e091365b2913ba895738331e86831 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1e972553d1e091365b2913ba895738331e86831 commit a1e972553d1e091365b2913ba895738331e86831 Author: Robert Clausecker AuthorDate: 2022-11-11 20:40:16 +0000 Commit: Juraj Lutter 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