Pop version to 2.11.0

Some patching to work with cgal:
* gcc:fast-math conflicts with floating
  operations in constexpr.

3 files changed, 73 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6eec3fb19e5b..910c704c753a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cloudcompare
 	pkgdesc = A 3D point cloud (and triangular mesh) processing software
-	pkgver = 2.10.3
-	pkgrel = 2
+	pkgver = 2.11.0
+	pkgrel = 1
 	url = http://www.danielgm.net/cc/
 	arch = i686
 	arch = x86_64
@@ -26,10 +26,12 @@ pkgbase = cloudcompare
 	depends = qt5-svg
 	depends = vxl
 	optdepends = pcl
-	source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git#tag=v2.10.3
+	source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git#tag=v2.11.0
+	source = constexpr.patch
 	source = CloudCompare.desktop
 	source = ccViewer.desktop
 	md5sums = SKIP
+	md5sums = 7b254561200ba7d51817e4860f589426
 	md5sums = 379e09f6996b2b397429c0661c409bd0
 	md5sums = b6dcb0dee15cc67011166a2fc774c5ef
 
diff --git a/PKGBUILD b/PKGBUILD
index 2dab109b83d5..60d24651e08f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@
 
 name=cloudcompare
 pkgname=${name}
-_fragment="#tag=v2.10.3"
-pkgver=2.10.3
-pkgrel=2
+_fragment="#tag=v2.11.0"
+pkgver="${_fragment###tag=v}"
+pkgrel=1
 pkgdesc="A 3D point cloud (and triangular mesh) processing software"
 arch=('i686' 'x86_64')
 url="http://www.danielgm.net/cc/"
@@ -17,14 +17,17 @@ depends=('cgal' 'ffmpeg' 'glew' 'glu' 'mesa' 'pdal' 'qt5-base' 'qt5-tools' 'qt5-
 makedepends=('cmake' 'doxygen' 'git' 'laz-perf' 'libharu' 'ninja' 'pcl' 'proj' 'python')
 optdepends=('pcl')
 source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git${_fragment}"
+        constexpr.patch
         CloudCompare.desktop
         ccViewer.desktop)
 md5sums=('SKIP'
+         '7b254561200ba7d51817e4860f589426'
          '379e09f6996b2b397429c0661c409bd0'
          'b6dcb0dee15cc67011166a2fc774c5ef')
 
 prepare() {
   git -C "${srcdir}/${name}" submodule update --init --recursive
+  git -C "${srcdir}/${name}" apply -v "${srcdir}"/*patch
 }
 
 pkgver() {
diff --git a/constexpr.patch b/constexpr.patch
new file mode 100644
index 000000000000..5bdd4c6f2c0d
--- /dev/null
+++ b/constexpr.patch
@@ -0,0 +1,62 @@
+diff --git a/CC/include/CCConst.h b/CC/include/CCConst.h
+index 8ab70a93..085e3cae 100644
+--- a/CC/include/CCConst.h
++++ b/CC/include/CCConst.h
+@@ -33,17 +33,17 @@ constexpr double M_PI = 3.14159265358979323846;
+ 
+ //! Pi/2
+ #ifndef M_PI_2
+-constexpr double M_PI_2 = (M_PI/2.0);
++const double M_PI_2 = (M_PI/2.0);
+ #endif
+ 
+ //! Square root of 3
+ constexpr double SQRT_3 = 1.7320508075688772935274463415059;
+ 
+ //! Conversion factor from radians to degrees
+-constexpr double CC_RAD_TO_DEG = (180.0/M_PI);
++const double CC_RAD_TO_DEG = (180.0/M_PI);
+ 
+ //! Conversion factor from degrees to radians
+-constexpr double CC_DEG_TO_RAD = (M_PI/180.0);
++const double CC_DEG_TO_RAD = (M_PI/180.0);
+ 
+ //! Numerical threshold for considering a value as "zero"
+ constexpr double ZERO_TOLERANCE = static_cast<double>(FLT_EPSILON);
+diff --git a/libs/qCC_db/ccCameraSensor.cpp b/libs/qCC_db/ccCameraSensor.cpp
+index e19b9804..f244c28a 100644
+--- a/libs/qCC_db/ccCameraSensor.cpp
++++ b/libs/qCC_db/ccCameraSensor.cpp
+@@ -53,8 +53,8 @@ void ccCameraSensor::IntrinsicParameters::GetKinectDefaults(IntrinsicParameters&
+ 	//default Kinect parameters from:
+ 	// "Accuracy and Resolution of Kinect Depth Data for Indoor Mapping Applications"
+ 	// Kourosh Khoshelham and Sander Oude Elberink
+-	constexpr float focal_mm		= static_cast<float>(5.45 * 1.0e-3);	// focal length (real distance in meter)
+-	constexpr float pixelSize_mm	= static_cast<float>(9.3 * 1.0e-6);		// pixel size (real distance in meter)
++	const float focal_mm		= static_cast<float>(5.45 * 1.0e-3);	// focal length (real distance in meter)
++	const float pixelSize_mm	= static_cast<float>(9.3 * 1.0e-6);		// pixel size (real distance in meter)
+ 	
+ 	params.vertFocal_pix      = ConvertFocalMMToPix(focal_mm, pixelSize_mm);
+ 	params.pixelSize_mm[0]    = pixelSize_mm;
+diff --git a/libs/qCC_db/ccColorTypes.h b/libs/qCC_db/ccColorTypes.h
+index d456f3e8..8433cea2 100644
+--- a/libs/qCC_db/ccColorTypes.h
++++ b/libs/qCC_db/ccColorTypes.h
+@@ -119,7 +119,7 @@ namespace ccColor
+ 
+ 	// Predefined colors (default type)
+ 	constexpr Rgb whiteRGB					(MAX, MAX, MAX);
+-	constexpr Rgb lightGreyRGB				(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
++	const Rgb lightGreyRGB				(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
+ 	constexpr Rgb darkGreyRGB				(MAX / 2, MAX / 2, MAX / 2);
+ 	constexpr Rgb redRGB					(MAX, 0, 0);
+ 	constexpr Rgb greenRGB					(0, MAX, 0);
+@@ -133,7 +133,7 @@ namespace ccColor
+ 
+ 	// Predefined colors (default type)
+ 	constexpr Rgba white					(MAX, MAX, MAX, MAX);
+-	constexpr Rgba lightGrey				(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), MAX);
++	const Rgba lightGrey				(static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), MAX);
+ 	constexpr Rgba darkGrey					(MAX / 2, MAX / 2, MAX / 2, MAX);
+ 	constexpr Rgba red						(MAX, 0, 0, MAX);
+ 	constexpr Rgba green					(0, MAX, 0, MAX);