View | Details | Raw Unified | Return to bug 234750 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 234750