summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2019-01-17 21:27:33 +0100
committerbartus2019-01-17 21:27:33 +0100
commit25db22cf040c00119fb47200a8593ef2a60ee0cc (patch)
treee3ab61afdb193ba2df7e9ff30de5da8730524380
parentd1766da4dd04c90df7118c0e87befa2f82740e43 (diff)
downloadaur-25db22cf040c00119fb47200a8593ef2a60ee0cc.tar.gz
fix constexpr not working agains CGAL
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--constexpr.patch30
3 files changed, 38 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66642aee7a5..c95d56903ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.9.1.r434.g04569d08
+ pkgver = 2.10.1.r33.gf84d3cd4
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -26,7 +26,9 @@ pkgbase = cloudcompare-git
depends = pdal
optdepends = pcl
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
+ source = constexpr.patch
md5sums = SKIP
+ md5sums = 46bbc5406f18045433ad2bead593294c
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index 0386c528d28..c9130abc15b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.9.1.r434.g04569d08
+pkgver=2.10.1.r33.gf84d3cd4
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -13,12 +13,15 @@ depends=('qt5-base' 'qt5-tools' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cg
makedepends=('git' 'cmake' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
optdepends=('pcl')
source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
+ "constexpr.patch"
)
-md5sums=('SKIP')
+md5sums=('SKIP'
+ '46bbc5406f18045433ad2bead593294c')
prepare() {
cd ${srcdir}/${name}
git submodule update --init --recursive
+ git apply ${srcdir}/constexpr.patch
}
pkgver() {
diff --git a/constexpr.patch b/constexpr.patch
new file mode 100644
index 00000000000..81ea4b770b6
--- /dev/null
+++ b/constexpr.patch
@@ -0,0 +1,30 @@
+diff --git a/CC/include/CCConst.h b/CC/include/CCConst.h
+index 8ab70a93..33808059 100644
+--- a/CC/include/CCConst.h
++++ b/CC/include/CCConst.h
+@@ -40,10 +40,10 @@ constexpr double M_PI_2 = (M_PI/2.0);
+ 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/ccColorTypes.h b/libs/qCC_db/ccColorTypes.h
+index f70025cb..3e3a3b79 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 white (MAX, MAX, MAX);
+- constexpr Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
++ const Rgb lightGrey (static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8), static_cast<ColorCompType>(MAX*0.8));
+ constexpr Rgb darkGrey (MAX / 2, MAX / 2, MAX / 2);
+ constexpr Rgb red (MAX, 0, 0);
+ constexpr Rgb green (0, MAX, 0);