From nobody Tue Feb 14 20:23:44 2023 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 4PGXjD5lrkz3pxKF; Tue, 14 Feb 2023 20:23:44 +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 4PGXjD58M6z3ymd; Tue, 14 Feb 2023 20:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676406224; 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=AdvtTs3pzpOhLqQAcpsaymZWgIHxwGDBkmiEdBkBexg=; b=gesKVBrPHf9CjzdQHUF2UxZao6IFFVVKxTkqHNqQB83mbMgAKasQ72cbE2NID1RY0UAB44 DdyD3lnwF3/XhpORyvMAwbXK1q8a5jLdpq9VrjMgcmjIR3Q5qxlHCbkH/c0z+wohrr94lq uJaCiA9J8qZTt0hcJANKKyjZu3DLuXMxr5Gr1bAvC6t2SfVPdc8a/wf3luMz3+ThZ1IbAJ PGCc7Ty1kI2DiBXrWNG9wsV0gG8VHFmaSjV+qXlx3hNx2t2alC7vsAD0KIjdPtFV7c8uyp sTDlxE8FAfSSF52WktqUmBmbp2xviVIw/m0DOXj9QTpJfmeRQU1kJO3CQ2E/Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676406224; 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=AdvtTs3pzpOhLqQAcpsaymZWgIHxwGDBkmiEdBkBexg=; b=LsOhIPSRlCcVYzuDfCcVCuAMqmZP7RVveCIVr2bZ6MZFptdpU/y+2UEUkixRFZ8GCMTpQ6 OsnQRUe96WnRB65F//GGY8RMtY6RwZW2+jE7Dn/RsxsQgbkoxtqaiTmwkf6SFEJFZ6kTMV jB2b76rfDOoZTc+gdIDDZgyiHSxCFI2BWb1zQbXGthBTekFg6uMNPwt7MpzhRVR6ljNM3B F7QjwnRMhR6oy0iD1YeS0v6HQ755JQu5Ff09U8o2VtmFt/nfjQqBkCfXYzkJ5JRQVLnnoY h2Stgi0B70KC+6+6/l5xr2XoCnTVndLc5dOCEoLGq9jw0GKeqbFc/1UXX1jD2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676406224; a=rsa-sha256; cv=none; b=ClELZYtg1advZPovAPjRuCVCymVzHSW7p3yudtaDioEw46qUL5rvHCTIlU/wUI1zKlZZqC xX/2B9vUM4zK1shU2yjFx5tCwui2gZ1p0SQx5MaKMh8WUrVlJRKJHnneOtYQT518PxY/cJ PDU5m73PivPh0wpDOZseyLobMjCnizESeMdFOdkKvD6kyShaNo1ogjt679cYU2TN9mk/Ep WXgxToXyfiJJv5BgaHJKa3/z2QWDXTDa/D28uA7LcEZxA7nWYY/0oTs8nfKig9dHnV8mTJ 7Pmd+XWafEtjUZ/K9cnCY77vY4tlTbBphH5r3AdqFd2dReEqSKpgNNL6GVJAqQ== 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 4PGXjD3f9Xz1C0x; Tue, 14 Feb 2023 20:23:44 +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 31EKNi0D059578; Tue, 14 Feb 2023 20:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EKNip5059577; Tue, 14 Feb 2023 20:23:44 GMT (envelope-from git) Date: Tue, 14 Feb 2023 20:23:44 GMT Message-Id: <202302142023.31EKNip5059577@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: b62e5d969022 - main - graphics/colmap: update to 3.8 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b62e5d969022eb4120ecf4537b130df6ee34eead Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b62e5d969022eb4120ecf4537b130df6ee34eead commit b62e5d969022eb4120ecf4537b130df6ee34eead Author: Robert Clausecker AuthorDate: 2023-02-08 16:51:17 +0000 Commit: Robert Clausecker CommitDate: 2023-02-14 20:18:57 +0000 graphics/colmap: update to 3.8 - add two missing dependencies - libflann is no longer bundled, build with math/flann instead Changelog: https://colmap.github.io/changelog.html Approved by: flo (mentor) Differential Revision: https://reviews.freebsd.org/D38512 --- graphics/colmap/Makefile | 13 ++++------ graphics/colmap/distinfo | 6 ++--- graphics/colmap/pkg-plist | 61 ++++------------------------------------------- 3 files changed, 12 insertions(+), 68 deletions(-) diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index f4bf2069c454..710a80484797 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -1,6 +1,5 @@ PORTNAME= colmap -DISTVERSION= 3.7 -PORTREVISION= 1 +DISTVERSION= 3.8 CATEGORIES= graphics MAINTAINER= fuz@FreeBSD.org @@ -20,8 +19,11 @@ LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libceres.so:math/ceres-solver \ + libflann.so:math/flann \ libfreeimage.so:graphics/freeimage \ - libglog.so:devel/glog + libglog.so:devel/glog \ + liblz4.so:archivers/liblz4 \ + libmetis.so:math/metis USES= cmake compiler:${OPENMP}c++11-lib desktop-file-utils eigen:3 gl \ localbase python:env qt:5 sqlite @@ -63,11 +65,6 @@ 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 - @${REINPLACE_CMD} -e '/SQLite/d' \ - ${WRKSRC}/lib/CMakeLists.txt - @${REINPLACE_CMD} -e 's,SQLite/,,' \ - ${WRKSRC}/src/base/database.h \ - ${WRKSRC}/src/util/sqlite3_utils.h .if !defined(DISPLAY) # QApplication @${REINPLACE_CMD} -e '/opengl_utils_test/d' \ ${WRKSRC}/src/util/CMakeLists.txt diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index fe2a60c2aa37..4cab03e40c82 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667929528 -SHA256 (colmap-colmap-3.7_GH0.tar.gz) = ceb7cca204550d65b890cd0082c66f4bc69193daf9da64616d8147a46b76cc55 -SIZE (colmap-colmap-3.7_GH0.tar.gz) = 6354531 +TIMESTAMP = 1675295251 +SHA256 (colmap-colmap-3.8_GH0.tar.gz) = 02288f8f61692fe38049d65608ed832b31246e7792692376afb712fa4cef8775 +SIZE (colmap-colmap-3.8_GH0.tar.gz) = 3698389 diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist index 93ad7e14b50a..a84d751e9920 100644 --- a/graphics/colmap/pkg-plist +++ b/graphics/colmap/pkg-plist @@ -63,61 +63,6 @@ include/colmap/feature/matching.h include/colmap/feature/sift.h include/colmap/feature/types.h include/colmap/feature/utils.h -include/colmap/lib/FLANN/algorithms/all_indices.h -include/colmap/lib/FLANN/algorithms/autotuned_index.h -include/colmap/lib/FLANN/algorithms/center_chooser.h -include/colmap/lib/FLANN/algorithms/composite_index.h -include/colmap/lib/FLANN/algorithms/dist.h -include/colmap/lib/FLANN/algorithms/hierarchical_clustering_index.h -include/colmap/lib/FLANN/algorithms/kdtree_cuda_3d_index.h -include/colmap/lib/FLANN/algorithms/kdtree_cuda_builder.h -include/colmap/lib/FLANN/algorithms/kdtree_index.h -include/colmap/lib/FLANN/algorithms/kdtree_single_index.h -include/colmap/lib/FLANN/algorithms/kmeans_index.h -include/colmap/lib/FLANN/algorithms/linear_index.h -include/colmap/lib/FLANN/algorithms/lsh_index.h -include/colmap/lib/FLANN/algorithms/nn_index.h -include/colmap/lib/FLANN/config.h -include/colmap/lib/FLANN/config.h.in -include/colmap/lib/FLANN/defines.h -include/colmap/lib/FLANN/ext/lz4.h -include/colmap/lib/FLANN/ext/lz4hc.h -include/colmap/lib/FLANN/flann.h -include/colmap/lib/FLANN/flann.hpp -include/colmap/lib/FLANN/general.h -include/colmap/lib/FLANN/io/hdf5.h -include/colmap/lib/FLANN/mpi/client.h -include/colmap/lib/FLANN/mpi/index.h -include/colmap/lib/FLANN/mpi/matrix.h -include/colmap/lib/FLANN/mpi/queries.h -include/colmap/lib/FLANN/mpi/server.h -include/colmap/lib/FLANN/nn/ground_truth.h -include/colmap/lib/FLANN/nn/index_testing.h -include/colmap/lib/FLANN/nn/simplex_downhill.h -include/colmap/lib/FLANN/util/allocator.h -include/colmap/lib/FLANN/util/any.h -include/colmap/lib/FLANN/util/cuda/heap.h -include/colmap/lib/FLANN/util/cuda/result_set.h -include/colmap/lib/FLANN/util/cutil_math.h -include/colmap/lib/FLANN/util/dynamic_bitset.h -include/colmap/lib/FLANN/util/heap.h -include/colmap/lib/FLANN/util/logger.h -include/colmap/lib/FLANN/util/lsh_table.h -include/colmap/lib/FLANN/util/matrix.h -include/colmap/lib/FLANN/util/object_factory.h -include/colmap/lib/FLANN/util/params.h -include/colmap/lib/FLANN/util/random.h -include/colmap/lib/FLANN/util/result_set.h -include/colmap/lib/FLANN/util/sampling.h -include/colmap/lib/FLANN/util/saving.h -include/colmap/lib/FLANN/util/serialization.h -include/colmap/lib/FLANN/util/timer.h -include/colmap/lib/Graclus/metisLib/defs.h -include/colmap/lib/Graclus/metisLib/macros.h -include/colmap/lib/Graclus/metisLib/metis.h -include/colmap/lib/Graclus/metisLib/proto.h -include/colmap/lib/Graclus/metisLib/rename.h -include/colmap/lib/Graclus/metisLib/struct.h include/colmap/lib/LSD/lsd.h include/colmap/lib/PBA/ConfigBA.h include/colmap/lib/PBA/CuTexImage.h @@ -311,8 +256,6 @@ include/colmap/util/timer.h include/colmap/util/types.h include/colmap/util/version.h lib/colmap/libcolmap.a -lib/colmap/libflann.a -lib/colmap/libgraclus.a lib/colmap/liblsd.a lib/colmap/libpba.a lib/colmap/libpoisson_recon.a @@ -322,6 +265,10 @@ share/applications/COLMAP.desktop %%DATADIR%%/COLMAPConfig.cmake %%DATADIR%%/COLMAPConfigVersion.cmake %%DATADIR%%/cmake/FindEigen3.cmake +%%DATADIR%%/cmake/FindFLANN.cmake %%DATADIR%%/cmake/FindFreeImage.cmake %%DATADIR%%/cmake/FindGlew.cmake %%DATADIR%%/cmake/FindGlog.cmake +%%DATADIR%%/cmake/FindLZ4.cmake +%%DATADIR%%/cmake/FindMetis.cmake +%%DATADIR%%/cmake/FindSQLite3.cmake