diff --git a/graphics/openmvs/Makefile b/graphics/openmvs/Makefile index 527cf3b6c2b9..1f95f379416c 100644 --- a/graphics/openmvs/Makefile +++ b/graphics/openmvs/Makefile @@ -1,43 +1,46 @@ PORTNAME= openmvs DISTVERSIONPREFIX= v -DISTVERSION= 2.0.1 -PORTREVISION= 2 +DISTVERSION= 2.1.0 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Open Multi-View Stereo reconstruction library WWW= https://github.com/cdcseacave/openMVS LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= use of undeclared identifier '__builtin_ia32_emms' # https://github.com/cdcseacave/openMVS/issues/847 BUILD_DEPENDS= cgal>0:math/cgal \ ${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \ 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 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 .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DOpenMVS_USE_SSE:BOOL=OFF .endif .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 @@ -1,103 +1,105 @@ include/OpenMVS/Common/AABB.h include/OpenMVS/Common/AABB.inl include/OpenMVS/Common/AutoEstimator.h include/OpenMVS/Common/AutoPtr.h include/OpenMVS/Common/Common.h include/OpenMVS/Common/Config.h include/OpenMVS/Common/ConfigTable.h include/OpenMVS/Common/CriticalSection.h include/OpenMVS/Common/EventQueue.h include/OpenMVS/Common/FastDelegate.h include/OpenMVS/Common/FastDelegateBind.h include/OpenMVS/Common/FastDelegateCPP11.h include/OpenMVS/Common/File.h include/OpenMVS/Common/Filters.h include/OpenMVS/Common/HTMLDoc.h include/OpenMVS/Common/HalfFloat.h include/OpenMVS/Common/Hash.h include/OpenMVS/Common/LinkLib.h include/OpenMVS/Common/List.h include/OpenMVS/Common/Log.h include/OpenMVS/Common/MemFile.h include/OpenMVS/Common/OBB.h include/OpenMVS/Common/OBB.inl include/OpenMVS/Common/Octree.h include/OpenMVS/Common/Octree.inl include/OpenMVS/Common/Plane.h include/OpenMVS/Common/Plane.inl include/OpenMVS/Common/Queue.h include/OpenMVS/Common/Random.h include/OpenMVS/Common/Ray.h include/OpenMVS/Common/Ray.inl include/OpenMVS/Common/Rotation.h include/OpenMVS/Common/Rotation.inl include/OpenMVS/Common/SML.h include/OpenMVS/Common/Sampler.inl include/OpenMVS/Common/Semaphore.h include/OpenMVS/Common/SharedPtr.h include/OpenMVS/Common/Sphere.h include/OpenMVS/Common/Sphere.inl include/OpenMVS/Common/Streams.h include/OpenMVS/Common/Strings.h include/OpenMVS/Common/Thread.h include/OpenMVS/Common/Timer.h include/OpenMVS/Common/Types.h include/OpenMVS/Common/Types.inl include/OpenMVS/Common/Util.h include/OpenMVS/Common/Util.inl include/OpenMVS/Common/UtilCUDA.h include/OpenMVS/ConfigLocal.h include/OpenMVS/IO/Common.h include/OpenMVS/IO/Image.h include/OpenMVS/IO/ImageBMP.h include/OpenMVS/IO/ImageDDS.h include/OpenMVS/IO/ImageJPG.h include/OpenMVS/IO/ImagePNG.h include/OpenMVS/IO/ImageSCI.h include/OpenMVS/IO/ImageTGA.h include/OpenMVS/IO/ImageTIFF.h include/OpenMVS/IO/OBJ.h include/OpenMVS/IO/PLY.h include/OpenMVS/IO/TinyXML2.h include/OpenMVS/IO/tiny_gltf.h include/OpenMVS/MVS.h include/OpenMVS/MVS/Camera.h include/OpenMVS/MVS/Common.h include/OpenMVS/MVS/DepthMap.h include/OpenMVS/MVS/Image.h include/OpenMVS/MVS/Interface.h include/OpenMVS/MVS/Mesh.h include/OpenMVS/MVS/PatchMatchCUDA.h include/OpenMVS/MVS/PatchMatchCUDA.inl include/OpenMVS/MVS/Platform.h include/OpenMVS/MVS/PointCloud.h include/OpenMVS/MVS/RectsBinPack.h include/OpenMVS/MVS/Scene.h include/OpenMVS/MVS/SceneDensify.h include/OpenMVS/MVS/SemiGlobalMatcher.h 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 include/OpenMVS/Math/TRWS/minimize.inl include/OpenMVS/Math/TRWS/ordering.inl include/OpenMVS/Math/TRWS/treeProbabilities.inl include/OpenMVS/Math/TRWS/typeBinary.h include/OpenMVS/Math/TRWS/typeBinaryFast.h include/OpenMVS/Math/TRWS/typeGeneral.h include/OpenMVS/Math/TRWS/typePotts.h include/OpenMVS/Math/TRWS/typeTruncatedLinear.h include/OpenMVS/Math/TRWS/typeTruncatedLinear2D.h include/OpenMVS/Math/TRWS/typeTruncatedQuadratic.h include/OpenMVS/Math/TRWS/typeTruncatedQuadratic2D.h lib/OpenMVS/libCommon.so lib/OpenMVS/libIO.so lib/OpenMVS/libMVS.so lib/OpenMVS/libMath.so lib/cmake/OpenMVS/OpenMVSConfig.cmake lib/cmake/OpenMVS/OpenMVSConfigVersion.cmake lib/cmake/OpenMVS/OpenMVSTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenMVS/OpenMVSTargets.cmake