summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2017-06-03 18:06:46 +0200
committerbartus2017-06-03 18:06:46 +0200
commit3a5f5fcc4ad2335d2fbcfef31c59326ee1fb623a (patch)
treee98141d167106a4478c13e93161af7c466ca92dd
parent80b06888373312c9745e9c0c0a4d7e916bfae1ba (diff)
downloadaur-3a5f5fcc4ad2335d2fbcfef31c59326ee1fb623a.tar.gz
fix cgal cmake script
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--cgal.patch14
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0aa75f3a2bb..66b0daaf2d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.8.0.r140.gedb8d44b
- pkgrel = 2
+ pkgver = 2.8.0.r154.gddb95c1d
+ pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
arch = x86_64
@@ -20,7 +20,9 @@ pkgbase = cloudcompare-git
optdepends = pcl
optdepends = liblas
source = cloudcompare::git+https://github.com/CloudCompare/CloudCompare.git
+ source = cgal.patch
md5sums = SKIP
+ md5sums = c731a6b09c7a54ecc8ba67f4557e2b0c
pkgname = cloudcompare-git
diff --git a/PKGBUILD b/PKGBUILD
index c49977fc5a8..54886a6d896 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
name=cloudcompare
pkgname=${name}-git
-pkgver=2.8.0.r140.gedb8d44b
-pkgrel=2
+pkgver=2.8.0.r154.gddb95c1d
+pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
url="http://www.danielgm.net/cc/"
@@ -12,12 +12,15 @@ license=('GPL2')
depends=('qt5-base' 'glu' 'mesa' 'vxl' 'ffmpeg' 'cgal')
makedepends=('git' 'cmake' 'pcl' 'doxygen' 'liblas')
optdepends=('pcl' 'liblas')
-source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git")
-md5sums=('SKIP')
+source=("${name}::git+https://github.com/CloudCompare/CloudCompare.git"
+ "cgal.patch")
+md5sums=('SKIP'
+ 'c731a6b09c7a54ecc8ba67f4557e2b0c')
prepare() {
cd ${srcdir}/${name}
git submodule update --init --recursive
+ patch -Np1 -i ../cgal.patch
}
pkgver() {
diff --git a/cgal.patch b/cgal.patch
new file mode 100644
index 00000000000..6815361d0e8
--- /dev/null
+++ b/cgal.patch
@@ -0,0 +1,14 @@
+diff --git a/CC/CGALSupport.cmake b/CC/CGALSupport.cmake
+index 2e7c5e64..826dbdfb 100644
+--- a/CC/CGALSupport.cmake
++++ b/CC/CGALSupport.cmake
+@@ -5,9 +5,6 @@
+ FIND_PACKAGE( CGAL QUIET COMPONENTS Core ) # implies findGMP
+
+ if (CGAL_FOUND)
+- if(${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION} LESS 4.3)
+- message(SEND_ERROR "CC Lib requires at least CGAL 4.3")
+- endif()
+
+ # We need to get rid of CGAL CXX flags
+ set(CGAL_DONT_OVERRIDE_CMAKE_FLAGS ON CACHE INTERNAL "override CGAL flags" FORCE)