Date: Wed, 9 Jan 2019 12:40:06 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489775 - in head/graphics/cloudcompare: . files Message-ID: <201901091240.x09Ce68i013448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Jan 9 12:40:05 2019 New Revision: 489775 URL: https://svnweb.freebsd.org/changeset/ports/489775 Log: graphics/cloudcompare: update to 2.10 PR: 234750 Submitted by: Neel Chauhan <neel@neelc.org> (maintainer) Added: head/graphics/cloudcompare/files/patch-cmake_CMakeExternalLibs.cmake (contents, props changed) - copied, changed from r489774, head/graphics/cloudcompare/files/patch-CMakeExternalLibs.cmake head/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp (contents, props changed) head/graphics/cloudcompare/files/patch-plugins_core_qFacets_CMakeLists.txt (contents, props changed) - copied, changed from r489774, head/graphics/cloudcompare/files/patch-plugins_qFacets_CMakeLists.txt head/graphics/cloudcompare/files/patch-plugins_core_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (contents, props changed) - copied, changed from r489774, head/graphics/cloudcompare/files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (contents, props changed) - copied, changed from r489774, head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h (contents, props changed) head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (contents, props changed) - copied, changed from r489774, head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Deleted: head/graphics/cloudcompare/files/patch-CMakeExternalLibs.cmake head/graphics/cloudcompare/files/patch-plugins_qFacets_CMakeLists.txt head/graphics/cloudcompare/files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Modified: head/graphics/cloudcompare/Makefile (contents, props changed) head/graphics/cloudcompare/distinfo (contents, props changed) head/graphics/cloudcompare/pkg-plist (contents, props changed) Modified: head/graphics/cloudcompare/Makefile ============================================================================== --- head/graphics/cloudcompare/Makefile Wed Jan 9 12:33:30 2019 (r489774) +++ head/graphics/cloudcompare/Makefile Wed Jan 9 12:40:05 2019 (r489775) @@ -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 @@ USES= cmake localbase:ldflags qt:5 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 Modified: head/graphics/cloudcompare/distinfo ============================================================================== --- head/graphics/cloudcompare/distinfo Wed Jan 9 12:33:30 2019 (r489774) +++ head/graphics/cloudcompare/distinfo Wed Jan 9 12:40:05 2019 (r489775) @@ -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 Copied and modified: head/graphics/cloudcompare/files/patch-cmake_CMakeExternalLibs.cmake (from r489774, head/graphics/cloudcompare/files/patch-CMakeExternalLibs.cmake) ============================================================================== --- head/graphics/cloudcompare/files/patch-CMakeExternalLibs.cmake Wed Jan 9 12:33:30 2019 (r489774, copy source) +++ head/graphics/cloudcompare/files/patch-cmake_CMakeExternalLibs.cmake Wed Jan 9 12:40:05 2019 (r489775) @@ -1,11 +1,11 @@ ---- CMakeExternalLibs.cmake.orig 2018-03-16 21:26:02 UTC -+++ CMakeExternalLibs.cmake -@@ -66,7 +66,7 @@ endif() +--- 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 ++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}") Added: head/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cloudcompare/files/patch-common_ccPluginManager.cpp Wed Jan 9 12:40:05 2019 (r489775) @@ -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. Copied and modified: head/graphics/cloudcompare/files/patch-plugins_core_qFacets_CMakeLists.txt (from r489774, head/graphics/cloudcompare/files/patch-plugins_qFacets_CMakeLists.txt) ============================================================================== --- head/graphics/cloudcompare/files/patch-plugins_qFacets_CMakeLists.txt Wed Jan 9 12:33:30 2019 (r489774, copy source) +++ head/graphics/cloudcompare/files/patch-plugins_core_qFacets_CMakeLists.txt Wed Jan 9 12:40:05 2019 (r489775) @@ -1,6 +1,6 @@ ---- 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 +--- ./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) @@ -9,7 +9,7 @@ message( SEND_ERROR "ShapeLib is required to compile this plugin (enable OPTION_USE_SHAPE_LIB)" ) endif() -@@ -27,7 +27,7 @@ if (INSTALL_QFACETS_PLUGIN) +@@ -31,7 +31,7 @@ target_link_libraries( ${PROJECT_NAME} QCC_IO_LIB ) #add shapelib support Copied and modified: head/graphics/cloudcompare/files/patch-plugins_core_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp (from r489774, head/graphics/cloudcompare/files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp) ============================================================================== --- head/graphics/cloudcompare/files/patch-plugins_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp Wed Jan 9 12:33:30 2019 (r489774, copy source) +++ head/graphics/cloudcompare/files/patch-plugins_core_qPCL_PclUtils_filters_MLSSmoothingUpsampling.cpp Wed Jan 9 12:40:05 2019 (r489775) @@ -1,6 +1,6 @@ ---- 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 +--- ./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<PointInT>::Ptr tree (new pcl::search::KdTree<PointInT>); Copied and modified: head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h (from r489774, head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h) ============================================================================== --- head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h Wed Jan 9 12:33:30 2019 (r489774, copy source) +++ head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_FlatCopyVector.h Wed Jan 9 12:40:05 2019 (r489775) @@ -1,5 +1,5 @@ ---- 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 +--- ./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__ Added: head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_GfxTL_KdTree.h Wed Jan 9 12:40:05 2019 (r489775) @@ -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 <algorithm> + #include <memory> + #include <deque> +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> + #else + #include <stdlib.h> Copied and modified: head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h (from r489774, head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h) ============================================================================== --- head/graphics/cloudcompare/files/patch-plugins_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Wed Jan 9 12:33:30 2019 (r489774, copy source) +++ head/graphics/cloudcompare/files/patch-plugins_core_qRANSAC__SD_RANSAC__SD__orig_MiscLib_AlignedAllocator.h Wed Jan 9 12:40:05 2019 (r489775) @@ -1,5 +1,5 @@ ---- 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 +--- ./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__ Modified: head/graphics/cloudcompare/pkg-plist ============================================================================== --- head/graphics/cloudcompare/pkg-plist Wed Jan 9 12:33:30 2019 (r489774) +++ head/graphics/cloudcompare/pkg-plist Wed Jan 9 12:40:05 2019 (r489775) @@ -3,35 +3,36 @@ bin/ccViewer 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901091240.x09Ce68i013448>