summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-04-29 22:12:36 +0200
committerbartus2020-04-29 22:12:36 +0200
commit7a49ee490c01b8059237f5823c7939a7e3980ffc (patch)
tree10501e3c60425b3cb0bc5bd961a33c57b4860a1c
parentd344dd0858af7b0deb0a8fe54f0794e0b2e5dbc0 (diff)
downloadaur-7a49ee490c01b8059237f5823c7939a7e3980ffc.tar.gz
Drop unneeded patch.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--constexpr.patch54
3 files changed, 3 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2c6b3c81b5..2674a3f8aa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.10.2.r605.ge29c11df
+ pkgver = 2.10.2.r713.g6be7d31c
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -31,11 +31,9 @@ pkgbase = cloudcompare-git
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
source = CloudCompare.desktop
source = ccViewer.desktop
- source = constexpr.patch
md5sums = SKIP
md5sums = 379e09f6996b2b397429c0661c409bd0
md5sums = b6dcb0dee15cc67011166a2fc774c5ef
- md5sums = 456526b717c1b47d52990df8f06a04e0
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index 85aa77aeaf5..daae2ff2a6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
name=cloudcompare
#_fragment="#branch="
pkgname=${name}-git
-pkgver=2.10.2.r605.ge29c11df
+pkgver=2.10.2.r713.g6be7d31c
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
@@ -21,16 +21,13 @@ provides=('cloudcompare')
source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git${_fragment}"
CloudCompare.desktop
ccViewer.desktop
- constexpr.patch
)
md5sums=('SKIP'
'379e09f6996b2b397429c0661c409bd0'
- 'b6dcb0dee15cc67011166a2fc774c5ef'
- '456526b717c1b47d52990df8f06a04e0')
+ 'b6dcb0dee15cc67011166a2fc774c5ef')
prepare() {
git -C ${name} submodule update --init --recursive
- git -C ${name} apply -v "${srcdir}"/constexpr.patch
}
pkgver() {
diff --git a/constexpr.patch b/constexpr.patch
deleted file mode 100644
index 0e2daf5306c..00000000000
--- a/constexpr.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/ccCameraSensor.cpp b/libs/qCC_db/ccCameraSensor.cpp
-index 4bc29936..1713eceb 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);