diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile index c6173262d012..a63536160d04 100644 --- a/graphics/cloudcompare/Makefile +++ b/graphics/cloudcompare/Makefile @@ -1,87 +1,89 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v -DISTVERSION= 2.11.3 +DISTVERSION= 2.12.0 CATEGORIES= graphics MAINTAINER= nc@FreeBSD.org COMMENT= 3D point cloud processing software LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi USES= cmake compiler:c++11-lang localbase:ldflags qt:5 USE_GITHUB= yes GH_ACCOUNT= CloudCompare GH_PROJECT= ${GH_ACCOUNT} +GH_TUPLE= CloudCompare:CCCoreLib:b81e0ba:CloudCompare/libs/qCC_db/extern/CCCoreLib + USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build svg linguisttools_build USE_LDCONFIG= yes # PDAL support disabled ATM # plugins/core/IO/qPDALIO/src/LASFilter.cpp:1360:24: error: no member named 'incompatibleSrs' in 'pdal::LasHeader' OPTIONS_DEFINE= DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB OPTIONS_DEFAULT=DXFLIB GAMEPAD GDAL PLUGINS SHAPELIB OPTIONS_SUB= yes DXFLIB_DESC= Enable AutoCAD DXF file support GAMEPAD_DESC= Enable Qt gamepad support GDAL_DESC= Enable raster file support PDAL_DESC= Enable point cloud data support SHAPELIB_DESC= Enable shape file support DXFLIB_CMAKE_BOOL= OPTION_USE_DXF_LIB GAMEPAD_USE= QT=gamepad GAMEPAD_CMAKE_BOOL= OPTION_SUPPORT_GAMEPADS GDAL_CMAKE_BOOL= OPTION_USE_GDAL GDAL_CMAKE_ON= -DGDAL_INCLUDE_DIR=${PREFIX}/include \ -DGDAL_LIBRARY=${PREFIX}/lib/libgdal.so GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal PDAL_CMAKE_BOOL= PLUGIN_IO_QPDAL PDAL_CMAKE_ON= -DJSON_ROOT_DIR=${PREFIX}/include/jsoncpp PDAL_LIB_DEPENDS= libpdal_base.so:math/pdal SHAPELIB_CMAKE_BOOL= OPTION_USE_SHAPE_LIB SHAPELIB_LIB_DEPENDS= libshp.so:devel/shapelib PLUGINS_USES= eigen:3 gl jpeg xorg PLUGINS_CMAKE_BOOL= PLUGIN_STANDARD_QANIMATION \ PLUGIN_STANDARD_QBROOM \ PLUGIN_STANDARD_QCOMPASS \ PLUGIN_STANDARD_QCSF \ PLUGIN_IO_QCSV_MATRIX \ PLUGIN_GL_QEDL \ PLUGIN_STANDARD_QFACETS \ PLUGIN_STANDARD_QHPR \ PLUGIN_STANDARD_QM3C2 \ PLUGIN_STANDARD_QPCV \ PLUGIN_IO_QPHOTOSCAN \ PLUGIN_STANDARD_QRANSAC_SD \ PLUGIN_STANDARD_QSRA \ PLUGIN_GL_QSSAO # plugins requiring rare external libs are left out, TODO maybe add some of them? PLUGINS_CMAKE_ON= -DEIGEN_ROOT_DIR:BOOL=${LOCALBASE}/include/eigen3 PLUGINS_CXXFLAGS= ${PLUGINS_CXXFLAGS_${CHOSEN_COMPILER_TYPE}} PLUGINS_CXXFLAGS_clang= -Wno-narrowing PLUGINS_CXXFLAGS+= -DEIGEN_DONT_PARALLELIZE # OpenMP is broken in cmake: see bug#223678 PLUGINS_USE= XORG=ice,sm,x11,xext,xt GL=gl,glu PLUGINS_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ libflann_cpp.so:math/flann \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libvtkCommonCore-9.1.so:math/vtk9 PLUGINS_IMPLIES= SHAPELIB pre-configure: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' ${WRKSRC}/snap/gui/ccViewer.desktop ${WRKSRC}/snap/gui/cloudcompare.desktop post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/snap/gui/ccViewer.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/snap/gui/cloudcompare.png ${STAGEDIR}${PREFIX}/share/pixmaps .include diff --git a/graphics/cloudcompare/distinfo b/graphics/cloudcompare/distinfo index 8adf928da222..1bdbd0c155e9 100644 --- a/graphics/cloudcompare/distinfo +++ b/graphics/cloudcompare/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1644590655 -SHA256 (CloudCompare-CloudCompare-v2.11.3_GH0.tar.gz) = b41cebd5e4832a8b7aa1f019d97bcc208be9f7e15cd056ff2a1a1fe4c369fc21 -SIZE (CloudCompare-CloudCompare-v2.11.3_GH0.tar.gz) = 35108749 +TIMESTAMP = 1648960375 +SHA256 (CloudCompare-CloudCompare-v2.12.0_GH0.tar.gz) = 214ef88c454c41dc8d0b758f5b02b021b469b4d4d0ee5de753b0552127249a53 +SIZE (CloudCompare-CloudCompare-v2.12.0_GH0.tar.gz) = 35582467 +SHA256 (CloudCompare-CCCoreLib-b81e0ba_GH0.tar.gz) = 88a3f8c5bfa7a713b1da51aa6806beac7d3086bfd8b4db17efa2720cee077c90 +SIZE (CloudCompare-CCCoreLib-b81e0ba_GH0.tar.gz) = 235020 diff --git a/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp b/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp deleted file mode 100644 index 2842e76ffff6..000000000000 --- a/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- common/ccPluginManager.cpp.orig 2020-09-08 09:36:07 UTC -+++ common/ccPluginManager.cpp -@@ -273,7 +273,7 @@ void ccPluginManager::loadFromPathsAndAddToList() - "*.dylib" - #elif defined(Q_OS_WIN) - "*.dll" --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - "*.so" - #else - #error Need to specify the dynamic library extension for this OS. diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h deleted file mode 100644 index 17f438423878..000000000000 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h -@@ -1,6 +1,6 @@ - #ifndef GfxTL__FLATCOPYVECTOR_HEADER__ - #define GfxTL__FLATCOPYVECTOR_HEADER__ --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #else - #include diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h deleted file mode 100644 index ec259b53f6d0..000000000000 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h -@@ -14,7 +14,7 @@ - #include - #include - #include --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - #include - #else - #include diff --git a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h similarity index 68% rename from graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h rename to graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h index 2536668bccd8..283e9407a327 100644 --- a/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h +++ b/graphics/cloudcompare/files/patch-plugins_core_Standard_qRANSAC__SD_extern_RANSAC__SD_MiscLib_AlignedAllocator.h @@ -1,19 +1,19 @@ ---- plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2020-09-08 09:36:07 UTC -+++ plugins/core/Standard/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h +--- plugins/core/Standard/qRANSAC_SD/extern/RANSAC_SD/MiscLib/AlignedAllocator.h.orig 2022-04-03 04:17:08 UTC ++++ plugins/core/Standard/qRANSAC_SD/extern/RANSAC_SD/MiscLib/AlignedAllocator.h @@ -1,7 +1,7 @@ #ifndef MiscLib__ALIGNEDALLOCATOR_HEADER__ #define MiscLib__ALIGNEDALLOCATOR_HEADER__ #include -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(__FreeBSD__) #include #else #include @@ -9,6 +9,7 @@ #if defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || defined(_M_X64) #include +#include #endif #ifdef _mm_malloc diff --git a/graphics/cloudcompare/pkg-plist b/graphics/cloudcompare/pkg-plist index 2b7288c00269..0b79090fffa7 100644 --- a/graphics/cloudcompare/pkg-plist +++ b/graphics/cloudcompare/pkg-plist @@ -1,41 +1,48 @@ bin/CloudCompare bin/ccViewer -lib/cloudcompare/libCC_CORE_LIB.so +lib/cloudcompare/libCCAppCommon.so +lib/cloudcompare/libCCCoreLib.so +lib/cloudcompare/libCCPluginAPI.so +lib/cloudcompare/libCC_FBO_LIB.so lib/cloudcompare/libQCC_DB_LIB.so +lib/cloudcompare/libQCC_GL_LIB.so lib/cloudcompare/libQCC_IO_LIB.so %%PLUGINS%%lib/cloudcompare/plugins/libQANIMATION_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQBROOM_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQCOMPASS_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQCORE_IO_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQCSF_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQCSV_MATRIX_IO_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQEDL_GL_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQFACETS_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQHPR_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQM3C2_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQPCV_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQPHOTOSCAN_IO_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQRANSAC_SD_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQSRA_PLUGIN.so %%PLUGINS%%lib/cloudcompare/plugins/libQSSAO_GL_PLUGIN.so share/applications/ccViewer.desktop share/applications/cloudcompare.desktop %%DATADIR%%/CHANGELOG.md %%DATADIR%%/global_shift_list_template.txt %%DATADIR%%/license.txt %%DATADIR%%/shaders/Bilateral/bilateral.frag %%DATADIR%%/shaders/Bilateral/bilateral.vert %%DATADIR%%/shaders/ColorRamp/color_ramp.frag %%PLUGINS%%%%DATADIR%%/shaders/EDL/edl_mix.frag %%PLUGINS%%%%DATADIR%%/shaders/EDL/edl_mix.vert %%PLUGINS%%%%DATADIR%%/shaders/EDL/edl_shade.frag %%PLUGINS%%%%DATADIR%%/shaders/EDL/edl_shade.vert %%PLUGINS%%%%DATADIR%%/shaders/SSAO/ssao.frag %%PLUGINS%%%%DATADIR%%/shaders/SSAO/ssao.vert +%%DATADIR%%/translations/CloudCompare_de.qm %%DATADIR%%/translations/CloudCompare_es_AR.qm %%DATADIR%%/translations/CloudCompare_fr.qm %%DATADIR%%/translations/CloudCompare_ja.qm +%%DATADIR%%/translations/CloudCompare_kr.qm %%DATADIR%%/translations/CloudCompare_pt.qm %%DATADIR%%/translations/CloudCompare_ru.qm +%%DATADIR%%/translations/CloudCompare_zh.qm share/pixmaps/ccViewer.png share/pixmaps/cloudcompare.png