From nobody Wed Nov 30 11:48:03 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 4NMcsJ0Tmmz4jjyL; Wed, 30 Nov 2022 11:48:04 +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 4NMcsJ02KSz3J7k; Wed, 30 Nov 2022 11:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669808884; 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=IxJgfy2Ht9/XUbYUZdjLKmcGUUuddAxmsuFDmlfNbMs=; b=K6urYF5xeKzqBFiu40yBb5Wwg/AdfKhu/afrgMJnLavd9pHNIKVMu/BUMFA5vTZKEJYqqi KbeopEBdt9BLO/QBO/3nPUt5HaXDkAsWzhnpG1bgovA5yauraMe2HRrEKwada2nRGUTVg6 2YFawpoVvesC6qa64OPlZSCgGlmDJWjTwSgF84HWzqTWhTaRTNWJj+y18whXbmwE0HQJAg nfJeto5/GWTMboaJTMX0xI/YJaSFPccERvFPXhofC5fEFi+8yKpx6lQDfL5wMiekNQ/pOs 4uV6BpxO6oO12y6af/NtyzDcWii4yDSQvaCRuDWRFKgJ6ae5Rf4GdCkhNf1ShQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669808884; 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=IxJgfy2Ht9/XUbYUZdjLKmcGUUuddAxmsuFDmlfNbMs=; b=oNDosvGfN97YJTompxlFCRn+1zV2P9BHunA1ihFZVGqoCDAHIBrb7zFpzCdG9hn/1hMQa0 fV/uwBpeyXEgpKaB4olMkAnGwucRQICqmScXiCdfSzlBCHyZOF2fVlMjgEAxVBEtR75Z6d tqN9tTGKLQoEinUUguoK9610RicDiX+xs3w7cLangcV+p4vRcG3QU28uXJyRaK6Or4QQOl LuHNpOMlxdG3wMoPBIl2E2j63y4jrxLtWDL3WiLpjW9WhE2vE21KxHG5bI3I8dztsi8Q6D Fv4T20IxZlBctOWfiQO0AsytNypvFyXhXtUjJpGjXOa9epZoKn+7yFY0eXBZAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669808884; a=rsa-sha256; cv=none; b=YrfaMpe2TMuU3CgH4Zc+6PcEJyMqnqFD6DUr7qhlH2keiN30yyJl/Oak4d8EclifbJq1+6 TkWRpWY+0xwBSbHQI3RHppakDrqOIIS6/9oLa41O9y3GyCycE3gi3kXy8tBWEcntVbTlRk qlKBv+f4i7MWHZdcMe4SBnFawDlFJC9zFhrm3DQmoVVXi5imVxgjpKcqR6GYoPYX1yMO5g 6Gnrjww9vNzlrY7WFYKzgUUqKneQ3WNB0D62qyXbtTNAldHjbeCLssAsQW5xkchRtl3Ci1 9EEtUe99lySy1Dv33hxgYkijplQEPfEDDBE75K0cL3w21ZI7KM8q4fjk6Vp4nw== 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 4NMcsH6DxJzvK4; Wed, 30 Nov 2022 11:48:03 +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 2AUBm3WK091391; Wed, 30 Nov 2022 11:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUBm3HX091390; Wed, 30 Nov 2022 11:48:03 GMT (envelope-from git) Date: Wed, 30 Nov 2022 11:48:03 GMT Message-Id: <202211301148.2AUBm3HX091390@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: c2a3859c0750 - main - graphics/openmvs: Update 2.0.1 -> 2.1.0 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2a3859c075092dd3fb2606ca4755476f91559c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2a3859c075092dd3fb2606ca4755476f91559c5 commit c2a3859c075092dd3fb2606ca4755476f91559c5 Author: Yuri Victorovich AuthorDate: 2022-11-30 11:47:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-30 11:47:59 +0000 graphics/openmvs: Update 2.0.1 -> 2.1.0 Reported by: portscout --- graphics/openmvs/Makefile | 9 ++++++--- graphics/openmvs/distinfo | 6 +++--- graphics/openmvs/files/patch-libs_Common_Config.h | 13 ------------- graphics/openmvs/files/patch-libs_MVS_DepthMap.cpp | 16 ++++++++++++++++ graphics/openmvs/pkg-plist | 2 ++ 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/graphics/openmvs/Makefile b/graphics/openmvs/Makefile index 527cf3b6c2b9..1f95f379416c 100644 --- a/graphics/openmvs/Makefile +++ b/graphics/openmvs/Makefile @@ -1,7 +1,6 @@ PORTNAME= openmvs DISTVERSIONPREFIX= v -DISTVERSION= 2.0.1 -PORTREVISION= 2 +DISTVERSION= 2.1.0 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -18,13 +17,15 @@ BUILD_DEPENDS= cgal>0:math/cgal \ vcglib>0:devel/vcglib LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libceres.so:math/ceres-solver \ + libgflags.so:devel/gflags \ + libglog.so:devel/glog \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libopencv_core.so:graphics/opencv \ libpng16.so:graphics/png \ libtiff.so:graphics/tiff -USES= cmake compiler:c++17-lang eigen:3 jpeg +USES= cmake:testing compiler:c++17-lang eigen:3 jpeg USE_GITHUB= yes GH_ACCOUNT= cdcseacave @@ -32,7 +33,9 @@ GH_PROJECT= openMVS CMAKE_ON= BUILD_SHARED_LIBS OpenMVS_USE_CERES CMAKE_OFF= OpenMVS_BUILD_TOOLS # tools can't be built because of https://github.com/cdcseacave/openMVS/issues/846 +CMAKE_OFF+= OpenMVS_ENABLE_TESTS CMAKE_ARGS= -DVCG_ROOT=${LOCALBASE}/include/vcglib +CMAKE_TESTING_ON= OpenMVS_ENABLE_TESTS # tests fail to configure, see https://github.com/cdcseacave/openMVS/issues/911 .include diff --git a/graphics/openmvs/distinfo b/graphics/openmvs/distinfo index f1cd535257a8..ed7281b7e5c1 100644 --- a/graphics/openmvs/distinfo +++ b/graphics/openmvs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657645144 -SHA256 (cdcseacave-openMVS-v2.0.1_GH0.tar.gz) = 0dcbf4e0c2f797cf74e72ca4f853d27e86dc3cce64b6764b6daf93025caceaea -SIZE (cdcseacave-openMVS-v2.0.1_GH0.tar.gz) = 813850 +TIMESTAMP = 1669798300 +SHA256 (cdcseacave-openMVS-v2.1.0_GH0.tar.gz) = c09f5741abeae8b3f9da91ded943ab10aafa60567b68e6f7bec81014e1375901 +SIZE (cdcseacave-openMVS-v2.1.0_GH0.tar.gz) = 2136278 diff --git a/graphics/openmvs/files/patch-libs_Common_Config.h b/graphics/openmvs/files/patch-libs_Common_Config.h deleted file mode 100644 index 571b88947aad..000000000000 --- a/graphics/openmvs/files/patch-libs_Common_Config.h +++ /dev/null @@ -1,13 +0,0 @@ ---- libs/Common/Config.h.orig 2022-07-26 08:34:06 UTC -+++ libs/Common/Config.h -@@ -144,7 +144,9 @@ - #endif - - --#if defined(__arm__) || defined (__arm64__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARMT) -+#if defined(__powerpc__) -+#define _PLATFFORM_PPC 1 -+#elif defined(__arm__) || defined (__arm64__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARMT) - #define _PLATFORM_ARM 1 - #else - #define _PLATFORM_X86 1 diff --git a/graphics/openmvs/files/patch-libs_MVS_DepthMap.cpp b/graphics/openmvs/files/patch-libs_MVS_DepthMap.cpp new file mode 100644 index 000000000000..21c143ad6a94 --- /dev/null +++ b/graphics/openmvs/files/patch-libs_MVS_DepthMap.cpp @@ -0,0 +1,16 @@ +- workarounf for https://github.com/cdcseacave/openMVS/issues/910 + +--- libs/MVS/DepthMap.cpp.orig 2022-11-30 10:06:45 UTC ++++ libs/MVS/DepthMap.cpp +@@ -2036,9 +2036,9 @@ bool MVS::ImportDepthDataRaw(const String& fileName, S + // read image file name + STATIC_ASSERT(sizeof(String::value_type) == sizeof(char)); + uint16_t nFileNameSize; +- fread(&nFileNameSize, sizeof(uint16_t), 1, f); ++ fread((void*)&nFileNameSize, sizeof(uint16_t), 1, f); + imageFileName.resize(nFileNameSize); +- fread(imageFileName.data(), sizeof(char), nFileNameSize, f); ++ fread((void*)imageFileName.data(), sizeof(char), nFileNameSize, f); + + // read neighbor IDs + STATIC_ASSERT(sizeof(uint32_t) == sizeof(IIndex)); diff --git a/graphics/openmvs/pkg-plist b/graphics/openmvs/pkg-plist index 90e4d9df28e8..04aa70e11d36 100644 --- a/graphics/openmvs/pkg-plist +++ b/graphics/openmvs/pkg-plist @@ -79,6 +79,8 @@ include/OpenMVS/Math/Common.h include/OpenMVS/Math/IBFS/IBFS.h include/OpenMVS/Math/LBP.h include/OpenMVS/Math/LMFit/lmmin.h +include/OpenMVS/Math/RobustNorms.h +include/OpenMVS/Math/SimilarityTransform.h include/OpenMVS/Math/TRWS/MRFEnergy.h include/OpenMVS/Math/TRWS/MRFEnergy.inl include/OpenMVS/Math/TRWS/instances.h