summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-12-09 14:39:38 +0100
committerbartus2021-12-09 14:39:38 +0100
commit9c52327db87940d5a75aeb395f88ef004d3fb62e (patch)
tree6a9570534c9319d5d06ef7ce05514e0a8a42c734
parent516d2d184e3ed0bdd6239b9931352ef2f9c52d90 (diff)
downloadaur-9c52327db87940d5a75aeb395f88ef004d3fb62e.tar.gz
Fix pcl:>vtk missing openmp, pcl:>qhull force shared
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 187981b72f6a..41d47a60ec92 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.r1012.g74d3f082
+ pkgver = 2.10.2.r1025.g08b7ae9a
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
@@ -33,6 +33,7 @@ pkgbase = cloudcompare-git
depends = opencascade
depends = opencv
depends = gdal
+ depends = openmp
provides = cloudcompare
conflicts = cloudcompare
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index a974b95d96c6..0e24753c1778 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,15 @@ name=cloudcompare
#_fragment="#branch="
options=('!strip') # strip would also remove plugins, for some reason
pkgname=${name}-git
-pkgver=2.10.2.r1012.g74d3f082
+pkgver=2.10.2.r1025.g08b7ae9a
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
url="http://www.danielgm.net/cc/"
license=('GPL2')
depends=('cgal' 'fbx-sdk' 'ffmpeg' 'glew' 'glu' 'mesa' 'mpir' 'pcl-git' 'pdal' 'qt5-base' 'qt5-tools' 'qt5-svg' 'qt5-websockets' 'shapelib' 'tbb' 'opencascade' 'opencv' 'gdal')
+#fix pcl:>vtk:>vtkm:>openmp missing deps
+depends+=(openmp)
makedepends=('clang' 'cmake' 'doxygen' 'git' 'laz-perf' 'libharu' 'ninja' 'proj' 'python')
conflicts=('cloudcompare')
provides=('cloudcompare')
@@ -51,6 +53,7 @@ build() {
# shellcheck disable=SC2191
CMAKE_FLAGS=(
-Wno-dev
+ -DPCL_QHULL_REQUIRED_TYPE=SHARED
-DCMAKE_CXX_STANDARD=14
-DCMAKE_CXX_FLAGS="$CXXFLAGS -fpermissive -DSUPPORT_TOPO_STREAM_OPERATORS -Wno-deprecated-declarations"
-DCMAKE_INSTALL_PREFIX=/usr