From nobody Tue Dec 10 09:07:08 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 4Y6tCc5FFRz5fr2K; Tue, 10 Dec 2024 09:07:08 +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 4Y6tCc4QWQz44xy; Tue, 10 Dec 2024 09:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733821628; 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=zP/x1Av5KffjiJph5glGGeOAOKAq6HydpAiqzmSouA8=; b=Zip5D6PE5YjlWtM2uQ5kDFiCwHURUN7MJv3qf5KEiLguYl7kBalFle46NYgGtPNC1m1/o1 qcbjVZ62IjLv9UrQmr1Q9MhFkNT5evThjd/xslZksRyvP6ZAxODDra0efLr45fOBqUurEN yBBSaZpSm/qX+fKZTYJj/LlMoxBLyWMbW9M2Nh/WriXB2b9xuRqI8uWb4Lxu+7PDm6YiU5 vJzfFkEUiWDqg6/F87LNsT7tjpVuybvRhkQi/OUhThuyTZCfVNPvymUW36ZOVc3Nsm20D1 13Skw2NH6DnRU+Njpwf/xBULETqT9oue1EjwIVV1PLHcDFzh+gy8NFe8tw+26Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733821628; 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=zP/x1Av5KffjiJph5glGGeOAOKAq6HydpAiqzmSouA8=; b=n385yb/VyJmYJptrdF/yFwcwlb5OeSn9ryIy7F6GWVuquZkoxasdRHHwMioHSvfnxsnvwq 2SJpexJ8GLBOfPDhD0ESYOPe3rXXhXkSGGIg+tx5l8+PXrtXr/PwiX2LuuRR9uU5UBkv/6 1dNiICmiKYN1hH4XUupioV/lh2PPL5qF1qdL1xVcITPvJzCLJTYCX3cP+LAAlr/hMvwe2u GQ+1PSxJXbXubUjxDOWseFfYXctYe6VHQfuJyelQ5n/LQLaLGVlDOfE3o8TLJ76dkq6jkE qQXrVWnAWCNANfrGsuHQzIkn1DUsKqfQ4lHORtkjzkI3KATB8wGmxc7oMtjJzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733821628; a=rsa-sha256; cv=none; b=WWE9tvac3b3+u5RhS3/NXmkyjd7aGKarlxuh6Vw1Km2u+lFpOqQn0E9JmjnS6lIE/KFds4 7E6vmq4lSsIrjVZ6heYoWLTABmNT1PM9fnWxTfRk58q7PNeOMfKPVu0DjJ70qna2+bsWDD 7+s/br2idBzfgQUEGBuFMZqI+pN30p1yT5d9Lqnwc3eJNSMiflsmG4P8AwWF+6THynCczJ oKpi2dscq2mhelr6HsqJf7nSE7UnmQuMxynsQP3mmwgGRpfmoP6cFVQQQkcp7VtnBGquWk //rQlf4XVP45f1T1zGSctC8fGLGlxhXHueALyy7cROCTip0rd02tT9HbdgNEeg== 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 4Y6tCc409qzH8G; Tue, 10 Dec 2024 09:07:08 +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 4BA978NJ002087; Tue, 10 Dec 2024 09:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA978tf002084; Tue, 10 Dec 2024 09:07:08 GMT (envelope-from git) Date: Tue, 10 Dec 2024 09:07:08 GMT Message-Id: <202412100907.4BA978tf002084@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: 1e2a4c95b428 - main - graphics/colmap: update to 3.11.1 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: 1e2a4c95b428fec16c0f5c6deaa13d73c6a19df7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e2a4c95b428fec16c0f5c6deaa13d73c6a19df7 commit 1e2a4c95b428fec16c0f5c6deaa13d73c6a19df7 Author: Robert Clausecker AuthorDate: 2024-12-09 15:58:22 +0000 Commit: Robert Clausecker CommitDate: 2024-12-10 09:05:46 +0000 graphics/colmap: update to 3.11.1 Changelog: https://github.com/colmap/colmap/releases/tag/3.11.0 Changelog: https://github.com/colmap/colmap/releases/tag/3.11.1 --- graphics/colmap/Makefile | 10 ++++++---- graphics/colmap/distinfo | 6 +++--- graphics/colmap/pkg-plist | 16 ++++++++++++++-- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index b2dbd366a963..0457ca2324ab 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -1,6 +1,5 @@ PORTNAME= colmap -DISTVERSION= 3.10 -PORTREVISION= 1 +DISTVERSION= 3.11.1 CATEGORIES= graphics MAINTAINER= fuz@FreeBSD.org @@ -17,7 +16,8 @@ LICENSE_FILE_MIT= ${WRKSRC}/src/thirdparty/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/src/thirdparty/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept -LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ +LIB_DEPENDS= libPoseLib.so:graphics/poselib \ + libboost_filesystem.so:devel/boost-libs \ libceres.so:math/ceres-solver \ libflann.so:math/flann \ libfreeimage.so:graphics/freeimage \ @@ -31,7 +31,7 @@ USE_CXXSTD= c++17 USE_GITHUB= yes USE_GL= gl glew USE_QT= core gui widgets buildtools:build opengl:build qmake:build -CMAKE_OFF= BOOST_STATIC CUDA_ENABLED +CMAKE_OFF= BOOST_STATIC CUDA_ENABLED FETCH_POSELIB CMAKE_TESTING_ON= TESTS_ENABLED LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu @@ -54,6 +54,8 @@ OPENMP_VARS= OPENMP=gcc- .endif 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: diff --git a/graphics/colmap/distinfo b/graphics/colmap/distinfo index 2d17a0019fbf..65f2c01eccf4 100644 --- a/graphics/colmap/distinfo +++ b/graphics/colmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729071767 -SHA256 (colmap-colmap-3.10_GH0.tar.gz) = 61850f323e201ab6a1abbfb0e4a8b3ba1c4cedbf55e0a5716bdea1df8ae1813a -SIZE (colmap-colmap-3.10_GH0.tar.gz) = 3472972 +TIMESTAMP = 1733745417 +SHA256 (colmap-colmap-3.11.1_GH0.tar.gz) = d2c20729ab5b1198e17725b720128f304f4cfae5c0a8c20d75c0e9c5bdee5860 +SIZE (colmap-colmap-3.11.1_GH0.tar.gz) = 3513052 diff --git a/graphics/colmap/pkg-plist b/graphics/colmap/pkg-plist index 2a6d52ee972e..5d20b23dc333 100644 --- a/graphics/colmap/pkg-plist +++ b/graphics/colmap/pkg-plist @@ -4,9 +4,9 @@ include/colmap/controllers/bundle_adjustment.h include/colmap/controllers/feature_extraction.h include/colmap/controllers/feature_matching.h include/colmap/controllers/feature_matching_utils.h -include/colmap/controllers/hierarchical_mapper.h +include/colmap/controllers/hierarchical_pipeline.h include/colmap/controllers/image_reader.h -include/colmap/controllers/incremental_mapper.h +include/colmap/controllers/incremental_pipeline.h include/colmap/controllers/option_manager.h include/colmap/estimators/absolute_pose.h include/colmap/estimators/affine_transform.h @@ -25,6 +25,7 @@ include/colmap/estimators/generalized_absolute_pose_coeffs.h include/colmap/estimators/generalized_pose.h include/colmap/estimators/generalized_relative_pose.h include/colmap/estimators/homography_matrix.h +include/colmap/estimators/manifold.h include/colmap/estimators/pose.h include/colmap/estimators/similarity_transform.h include/colmap/estimators/translation_transform.h @@ -40,6 +41,7 @@ include/colmap/exe/mvs.h include/colmap/exe/sfm.h include/colmap/exe/vocab_tree.h include/colmap/feature/extractor.h +include/colmap/feature/index.h include/colmap/feature/matcher.h include/colmap/feature/pairing.h include/colmap/feature/sift.h @@ -249,7 +251,10 @@ include/colmap/util/controller_thread.h include/colmap/util/cuda.h include/colmap/util/cudacc.h include/colmap/util/eigen_alignment.h +include/colmap/util/eigen_matchers.h include/colmap/util/endian.h +include/colmap/util/enum_to_string.h +include/colmap/util/file.h include/colmap/util/logging.h include/colmap/util/misc.h include/colmap/util/opengl_utils.h @@ -309,6 +314,9 @@ share/applications/COLMAP.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/install.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/license.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/cost_functions.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/index.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/pycolmap/pycolmap.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css @@ -331,6 +339,7 @@ share/applications/COLMAP.desktop %%PORTDOCS%%%%DOCSDIR%%/_static/css/fonts/lato-normal.woff %%PORTDOCS%%%%DOCSDIR%%/_static/css/fonts/lato-normal.woff2 %%PORTDOCS%%%%DOCSDIR%%/_static/css/theme.css +%%PORTDOCS%%%%DOCSDIR%%/_static/custom.css %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js %%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js %%PORTDOCS%%%%DOCSDIR%%/_static/file.png @@ -363,6 +372,9 @@ share/applications/COLMAP.desktop %%PORTDOCS%%%%DOCSDIR%%/install.html %%PORTDOCS%%%%DOCSDIR%%/license.html %%PORTDOCS%%%%DOCSDIR%%/objects.inv +%%PORTDOCS%%%%DOCSDIR%%/pycolmap/cost_functions.html +%%PORTDOCS%%%%DOCSDIR%%/pycolmap/index.html +%%PORTDOCS%%%%DOCSDIR%%/pycolmap/pycolmap.html %%PORTDOCS%%%%DOCSDIR%%/search.html %%PORTDOCS%%%%DOCSDIR%%/searchindex.js %%PORTDOCS%%%%DOCSDIR%%/tutorial.html