aboutsummaryrefslogtreecommitdiffstats
path: root/testing/pdal
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-04-09 13:46:10 +0000
committerTimo Teräs <timo.teras@iki.fi>2018-04-09 13:46:20 +0000
commit9ba754538caf6e9c5285b8df514745541a23ebc1 (patch)
treeae4b09de169ea417857bb68d843f1cc1b7b67506 /testing/pdal
parent219eb1680f056251274050dd5a8aa8b54c260719 (diff)
downloadaports-9ba754538caf6e9c5285b8df514745541a23ebc1.tar.bz2
aports-9ba754538caf6e9c5285b8df514745541a23ebc1.tar.xz
testing/pdal: fix build on 32-bit archs
Diffstat (limited to 'testing/pdal')
-rw-r--r--testing/pdal/APKBUILD8
-rw-r--r--testing/pdal/fix-shactx-bitlen.patch11
2 files changed, 16 insertions, 3 deletions
diff --git a/testing/pdal/APKBUILD b/testing/pdal/APKBUILD
index cb5c9aab67..cda02405ec 100644
--- a/testing/pdal/APKBUILD
+++ b/testing/pdal/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bradley J Chambers <brad.chambers@gmail.com>
pkgname=pdal
pkgver=1.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="PDAL is a C++ BSD library for translating and manipulating point cloud data."
url="https://github.com/pdal/pdal"
arch="x86 x86_64"
@@ -11,7 +11,8 @@ depends="nitro python py-numpy"
makedepends="cmake eigen-dev hexer-dev nitro-dev gdal-dev geos-dev laz-perf-dev libgeotiff-dev libxml2-dev python-dev py-numpy-dev jsoncpp-dev hdf5-dev proj4-dev cpd-dev fgt-dev sqlite-dev postgresql-dev curl-dev laszip-dev libspatialite-dev linux-headers libexecinfo-dev"
install=""
subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::http://download.osgeo.org/$pkgname/PDAL-$pkgver-src.tar.gz"
+source="$pkgname-$pkgver.tar.gz::http://download.osgeo.org/$pkgname/PDAL-$pkgver-src.tar.gz
+ fix-shactx-bitlen.patch"
builddir="$srcdir/PDAL-$pkgver-src"
build() {
@@ -45,4 +46,5 @@ dev() {
rm -r "$subpkgdir"/usr/lib
}
-sha512sums="e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 pdal-1.7.1.tar.gz"
+sha512sums="e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 pdal-1.7.1.tar.gz
+2919f107d39c4c9127595ef7106af086c26346e69820efd11bbe104b32cb0288defb9e4052fa64e2a2a23e15677e9aa035b563d8903bdd8f8008c50110119689 fix-shactx-bitlen.patch"
diff --git a/testing/pdal/fix-shactx-bitlen.patch b/testing/pdal/fix-shactx-bitlen.patch
new file mode 100644
index 0000000000..7f43503fa1
--- /dev/null
+++ b/testing/pdal/fix-shactx-bitlen.patch
@@ -0,0 +1,11 @@
+--- PDAL-1.7.1-src.orig/vendor/arbiter/arbiter.cpp
++++ PDAL-1.7.1-src/vendor/arbiter/arbiter.cpp
+@@ -4120,7 +4120,7 @@
+
+ uint8_t data[64];
+ uint32_t datalen;
+- std::size_t bitlen;
++ unsigned long long bitlen;
+ uint32_t state[8];
+ };
+