--- Makefile (revision 489587) +++ Makefile (working copy) @@ -2,9 +2,7 @@ PORTNAME= cloudcompare DISTVERSIONPREFIX= v -DISTVERSION= 2.9.1-288 -DISTVERSIONSUFFIX= -gb4d51361 -PORTREVISION= 7 +DISTVERSION= 2.10 CATEGORIES= graphics MAINTAINER= neel@neelc.org @@ -19,8 +17,7 @@ USE_GITHUB= yes GH_ACCOUNT= CloudCompare GH_PROJECT= ${GH_ACCOUNT} -GH_TAGNAME= 5d41227deb30c445ccbaa2d789a4363b57948a5d -USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build +USE_QT= concurrent core gui opengl printsupport widgets buildtools_build qmake_build svg linguisttools USE_LDCONFIG= yes OPTIONS_DEFINE= DXFLIB GAMEPAD GDAL PDAL SHAPELIB PLUGINS --- distinfo (revision 489587) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523597948 -SHA256 (CloudCompare-CloudCompare-v2.9.1-288-gb4d51361-5d41227deb30c445ccbaa2d789a4363b57948a5d_GH0.tar.gz) = 17a473be2706a0146b0652c59ed170c0496eea67e62d5555b5fec67828ef8f13 -SIZE (CloudCompare-CloudCompare-v2.9.1-288-gb4d51361-5d41227deb30c445ccbaa2d789a4363b57948a5d_GH0.tar.gz) = 35032942 +TIMESTAMP = 1546885922 +SHA256 (CloudCompare-CloudCompare-v2.10_GH0.tar.gz) = 835047603e3fd260f90c97bb813a9273d5f3a78a47b4b446dd65cbf04a37cf19 +SIZE (CloudCompare-CloudCompare-v2.10_GH0.tar.gz) = 35307711 --- files/patch-CMakeExternalLibs.cmake (revision 489587) +++ files/patch-CMakeExternalLibs.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- CMakeExternalLibs.cmake.orig 2018-03-16 21:26:02 UTC -+++ CMakeExternalLibs.cmake -@@ -66,7 +66,7 @@ endif() - # ------------------------------------------------------------------------------ - # OpenMP - # ------------------------------------------------------------------------------ --find_package(OpenMP QUIET) -+#find_package(OpenMP QUIET) # Broken on FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 - if (OPENMP_FOUND) - message("OpenMP found") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") --- files/patch-cmake_CMakeExternalLibs.cmake (nonexistent) +++ files/patch-cmake_CMakeExternalLibs.cmake (working copy) @@ -0,0 +1,11 @@ +--- cmake/CMakeExternalLibs.cmake.orig 2019-01-07 13:42:34.210570000 -0500 ++++ cmake/CMakeExternalLibs.cmake 2019-01-07 13:45:18.201885000 -0500 +@@ -67,7 +67,7 @@ + # ------------------------------------------------------------------------------ + # OpenMP + # ------------------------------------------------------------------------------ +-find_package(OpenMP QUIET) ++find_package(OpenMP QUIET) # Broken on FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 + if (OPENMP_FOUND) + message("OpenMP found") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") --- files/patch-common_ccPluginManager.cpp (nonexistent) +++ files/patch-common_ccPluginManager.cpp (working copy) @@ -0,0 +1,11 @@ +--- common/ccPluginManager.cpp.orig 2019-01-06 17:02:13.000000000 -0500 ++++ common/ccPluginManager.cpp 2019-01-07 14:12:33.433157000 -0500 +@@ -177,7 +177,7 @@ + "*.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. --- files/patch-plugins_core_qFacets_CMakeLists.txt (nonexistent) +++ files/patch-plugins_core_qFacets_CMakeLists.txt (working copy) @@ -0,0 +1,21 @@ +--- ./plugins/core/qFacets/CMakeLists.txt.orig 2019-01-07 13:50:00.290346000 -0500 ++++ ./plugins/core/qFacets/CMakeLists.txt 2019-01-07 13:50:27.770300000 -0500 +@@ -4,7 +4,7 @@ + + # CloudCompare 'FACETS' plugin + if (INSTALL_QFACETS_PLUGIN) +- if (NOT SHAPELIB_SOURCE_DIR) ++ if (NOT OPTION_USE_SHAPE_LIB) + message( SEND_ERROR "ShapeLib is required to compile this plugin (enable OPTION_USE_SHAPE_LIB)" ) + endif() + +@@ -31,7 +31,7 @@ + target_link_libraries( ${PROJECT_NAME} QCC_IO_LIB ) + + #add shapelib support +- target_link_libraries( ${PROJECT_NAME} SHAPELIB ) +- include_directories( ${SHAPELIB_SOURCE_DIR} ) ++ target_link_libraries( ${PROJECT_NAME} shp ) ++ #include_directories( ${SHAPELIB_SOURCE_DIR} ) + set_property( TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS CC_SHP_SUPPORT ) + endif() --- files/patch-plugins_core_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (nonexistent) +++ files/patch-plugins_core_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (working copy) @@ -0,0 +1,11 @@ +--- ./plugins/core/qPCL/PclUtils/filters/MLSSmoothingUpsampling.cpp.orig 2019-01-06 17:02:13.000000000 -0500 ++++ ./plugins/core/qPCL/PclUtils/filters/MLSSmoothingUpsampling.cpp 2019-01-07 13:52:41.029660000 -0500 +@@ -51,7 +51,7 @@ + { + typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); + +-#ifdef _OPENMP ++#if 0 && defined(_OPENMP) // disabled: the only place where omp_xx is used directly + //create the smoothing object + pcl::MovingLeastSquaresOMP< PointInT, PointOutT > smoother; + int n_threads = omp_get_max_threads(); --- files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (nonexistent) +++ files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (working copy) @@ -0,0 +1,10 @@ +--- ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h.orig 2019-01-07 13:54:30.016129000 -0500 ++++ ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h 2019-01-07 13:55:05.855728000 -0500 +@@ -1,6 +1,6 @@ + #ifndef GfxTL__FLATCOPYVECTOR_HEADER__ + #define GfxTL__FLATCOPYVECTOR_HEADER__ +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #else + #include --- files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h (nonexistent) +++ files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h (working copy) @@ -0,0 +1,11 @@ +--- ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h.orig 2019-01-07 13:56:42.017699000 -0500 ++++ ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h 2019-01-07 13:57:21.280897000 -0500 +@@ -14,7 +14,7 @@ + #include + #include + #include +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #else + #include --- files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (nonexistent) +++ files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (working copy) @@ -0,0 +1,11 @@ +--- ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2019-01-07 13:59:17.670295000 -0500 ++++ ./plugins/core/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h 2019-01-07 13:59:38.242600000 -0500 +@@ -1,7 +1,7 @@ + #ifndef MiscLib__ALIGNEDALLOCATOR_HEADER__ + #define MiscLib__ALIGNEDALLOCATOR_HEADER__ + #include +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #else + #include --- files/patch-plugins_qFacets_CMakeLists.txt (revision 489587) +++ files/patch-plugins_qFacets_CMakeLists.txt (nonexistent) @@ -1,21 +0,0 @@ ---- plugins/qFacets/CMakeLists.txt.orig 2018-03-16 21:26:02 UTC -+++ plugins/qFacets/CMakeLists.txt -@@ -4,7 +4,7 @@ option( INSTALL_QFACETS_PLUGIN "Check to - - # CloudCompare 'FACETS' plugin - if (INSTALL_QFACETS_PLUGIN) -- if (NOT SHAPELIB_SOURCE_DIR) -+ if (NOT OPTION_USE_SHAPE_LIB) - message( SEND_ERROR "ShapeLib is required to compile this plugin (enable OPTION_USE_SHAPE_LIB)" ) - endif() - -@@ -27,7 +27,7 @@ if (INSTALL_QFACETS_PLUGIN) - target_link_libraries( ${PROJECT_NAME} QCC_IO_LIB ) - - #add shapelib support -- target_link_libraries( ${PROJECT_NAME} SHAPELIB ) -- include_directories( ${SHAPELIB_SOURCE_DIR} ) -+ target_link_libraries( ${PROJECT_NAME} shp ) -+ #include_directories( ${SHAPELIB_SOURCE_DIR} ) - set_property( TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS CC_SHP_SUPPORT ) - endif() --- files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (revision 489587) +++ files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- plugins/qPCL/PclUtils/filters/MLSSmoothingUpsampling.cpp.orig 2018-04-14 06:09:41 UTC -+++ plugins/qPCL/PclUtils/filters/MLSSmoothingUpsampling.cpp -@@ -51,7 +51,7 @@ int smooth_mls(const typename pcl::Point - { - typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); - --#ifdef _OPENMP -+#if 0 && defined(_OPENMP) // disabled: the only place where omp_xx is used directly - //create the smoothing object - pcl::MovingLeastSquaresOMP< PointInT, PointOutT > smoother; - int n_threads = omp_get_max_threads(); --- files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (revision 489587) +++ files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (nonexistent) @@ -1,10 +0,0 @@ ---- plugins/qRANSAC_SD/RANSAC_SD_orig/GfxTL/FlatCopyVector.h.orig 2018-04-14 01:45:59 UTC -+++ plugins/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 --- files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h (revision 489587) +++ files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h (nonexistent) @@ -1,11 +0,0 @@ ---- plugins/qRANSAC_SD/RANSAC_SD_orig/GfxTL/KdTree.h.orig 2018-04-14 01:47:30 UTC -+++ plugins/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 --- files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (revision 489587) +++ files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (nonexistent) @@ -1,11 +0,0 @@ ---- plugins/qRANSAC_SD/RANSAC_SD_orig/MiscLib/AlignedAllocator.h.orig 2018-04-14 01:44:24 UTC -+++ plugins/qRANSAC_SD/RANSAC_SD_orig/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 --- pkg-plist (revision 489587) +++ pkg-plist (working copy) @@ -3,35 +3,36 @@ lib/cloudcompare/libCC_CORE_LIB.so lib/cloudcompare/libQCC_DB_LIB.so lib/cloudcompare/libQCC_IO_LIB.so -%%PLUGINS%%lib/cloudcompare/plugins/libQANIMATION_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQBLUR_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQBROOM_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQCOMPASS_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQCSF_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQCSV_MATRIX_IO_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQDUMMY_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQEDL_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQFACETS_PLUGIN_DLL.so -%%PLUGINS%%lib/cloudcompare/plugins/libQHPR_PLUGIN.so -%%PLUGINS%%lib/cloudcompare/plugins/libQM3C2_PLUGIN_DLL.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_PLUGIN.so +lib/cloudcompare/plugins/libQANIMATION_PLUGIN.so +lib/cloudcompare/plugins/libQBROOM_PLUGIN.so +lib/cloudcompare/plugins/libQCOMPASS_PLUGIN.so +lib/cloudcompare/plugins/libQCSF_PLUGIN.so +lib/cloudcompare/plugins/libQCSV_MATRIX_IO_PLUGIN.so +lib/cloudcompare/plugins/libQEDL_PLUGIN.so +lib/cloudcompare/plugins/libQFACETS_PLUGIN_DLL.so +lib/cloudcompare/plugins/libQHPR_PLUGIN.so +lib/cloudcompare/plugins/libQM3C2_PLUGIN_DLL.so +lib/cloudcompare/plugins/libQPCV_PLUGIN.so +lib/cloudcompare/plugins/libQPHOTOSCAN_IO_PLUGIN.so +lib/cloudcompare/plugins/libQRANSAC_SD_PLUGIN.so +lib/cloudcompare/plugins/libQSRA_PLUGIN.so +lib/cloudcompare/plugins/libQSSAO_PLUGIN.so share/applications/ccViewer.desktop share/applications/cloudcompare.desktop %%DATADIR%%/CHANGELOG.md %%DATADIR%%/global_shift_list_template.txt %%DATADIR%%/license.txt -%%PLUGINS%%%%DATADIR%%/shaders/Bilateral/bilateral.frag -%%PLUGINS%%%%DATADIR%%/shaders/Bilateral/bilateral.vert -%%PLUGINS%%%%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%%/shaders/Bilateral/bilateral.frag +%%DATADIR%%/shaders/Bilateral/bilateral.vert +%%DATADIR%%/shaders/ColorRamp/color_ramp.frag +%%DATADIR%%/shaders/EDL/edl_mix.frag +%%DATADIR%%/shaders/EDL/edl_mix.vert +%%DATADIR%%/shaders/EDL/edl_shade.frag +%%DATADIR%%/shaders/EDL/edl_shade.vert +%%DATADIR%%/shaders/SSAO/ssao.frag +%%DATADIR%%/shaders/SSAO/ssao.vert +%%DATADIR%%/translations/CloudCompare_fr.qm +%%DATADIR%%/translations/CloudCompare_pt.qm +%%DATADIR%%/translations/CloudCompare_ru.qm share/pixmaps/ccViewer.png share/pixmaps/cloudcompare.png