diff options
| author | Bradley J Chambers <brad.chambers@gmail.com> | 2017-10-13 14:26:21 -0400 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-10-20 10:52:33 +0000 |
| commit | 3b8623835339fe055c9b05321382a611da199ce9 (patch) | |
| tree | e1d53460a5cfca3ab19d2d1f1baf79e120e67040 /testing/pdal | |
| parent | 64b3295965bcc0ad872f7346e3a3c2b47f8f7c22 (diff) | |
| download | aports-3b8623835339fe055c9b05321382a611da199ce9.tar.bz2 aports-3b8623835339fe055c9b05321382a611da199ce9.tar.xz | |
testing/pdal: bump version to 1.6.0
Diffstat (limited to 'testing/pdal')
| -rw-r--r-- | testing/pdal/10-backtrace-guards.patch | 79 | ||||
| -rw-r--r-- | testing/pdal/APKBUILD | 10 |
2 files changed, 4 insertions, 85 deletions
diff --git a/testing/pdal/10-backtrace-guards.patch b/testing/pdal/10-backtrace-guards.patch deleted file mode 100644 index 4b737b939c..0000000000 --- a/testing/pdal/10-backtrace-guards.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a91cee1..4e38769 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -146,6 +146,8 @@ endif() - - set(pdal_defines_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pdal_defines.h.in") - set(pdal_defines_h "${CMAKE_CURRENT_BINARY_DIR}/include/pdal/pdal_defines.h") -+include(CheckIncludeFiles) -+check_include_files(execinfo.h PDAL_HAVE_EXECINFO_H) - configure_file(${pdal_defines_h_in} ${pdal_defines_h}) - - #------------------------------------------------------------------------------ -diff --git a/apps/pdal.cpp b/apps/pdal.cpp -index 3193196..548ea4f 100644 ---- a/apps/pdal.cpp -+++ b/apps/pdal.cpp -@@ -355,6 +355,7 @@ int App::execute(StringList& cmdArgs, LogPtr& log) - log->setLevel(LogLevel::Debug); - PluginManager::setLog(log); - #ifndef _WIN32 -+#ifdef PDAL_HAVE_EXECINFO_H - if (m_debug) - { - signal(SIGSEGV, [](int sig) -@@ -368,6 +369,7 @@ int App::execute(StringList& cmdArgs, LogPtr& log) - }); - } - #endif -+#endif - - m_command = Utils::tolower(m_command); - if (!m_command.empty()) -diff --git a/pdal/util/Utils.cpp b/pdal/util/Utils.cpp -index c2a9489..d0675c4 100644 ---- a/pdal/util/Utils.cpp -+++ b/pdal/util/Utils.cpp -@@ -44,7 +44,9 @@ - #include <cxxabi.h> - #include <sys/ioctl.h> - #include <sys/wait.h> // WIFEXITED, WEXITSTATUS -+#ifdef PDAL_HAVE_EXECINFO_H - #include <execinfo.h> // backtrace -+#endif - #include <dlfcn.h> // dladdr - #endif - -@@ -605,6 +607,7 @@ std::vector<std::string> Utils::backtrace() - { - std::vector<std::string> lines; - #ifndef WIN32 -+#ifdef PDAL_HAVE_EXECINFO_H - const int MAX_STACK_SIZE(100); - void* buffer[MAX_STACK_SIZE]; - std::vector<std::string> prefixes; -@@ -657,6 +660,7 @@ std::vector<std::string> Utils::backtrace() - } - } - #endif -+#endif - return lines; - } - -diff --git a/pdal_defines.h.in b/pdal_defines.h.in -index 77dca12..15e3932 100644 ---- a/pdal_defines.h.in -+++ b/pdal_defines.h.in -@@ -34,6 +34,11 @@ - #cmakedefine PDAL_ARBITER_ENABLED - - /* -+ * availability of execinfo.h -+ */ -+#cmakedefine PDAL_HAVE_EXECINFO_H -+ -+/* - * Debug or Release build? - */ - #define PDAL_BUILD_TYPE "@PDAL_BUILD_TYPE@" diff --git a/testing/pdal/APKBUILD b/testing/pdal/APKBUILD index 9bd3b7aff1..165d3f98a3 100644 --- a/testing/pdal/APKBUILD +++ b/testing/pdal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: Bradley J Chambers <brad.chambers@gmail.com> pkgname=pdal -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="PDAL" url="https://github.com/pdal/pdal" @@ -11,9 +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" install="" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/pdal/$pkgname/archive/$pkgver.tar.gz - 10-backtrace-guards.patch" -builddir="$srcdir/PDAL-$pkgver" +source="$pkgname-$pkgver.tar.gz::http://download.osgeo.org/$pkgname/PDAL-$pkgver-src.tar.gz" +builddir="$srcdir/PDAL-$pkgver-src" build() { cd "$builddir" @@ -46,5 +45,4 @@ dev() { rm -r "$subpkgdir"/usr/lib } -sha512sums="666c7f45fbe22d2d7a913b2ffa171a9727cdcd41856f52035ab0b4aec26c5569098710276f1144802d07bbc9e2656209ce1b2ff363a036c8c2d13ef2771c0657 pdal-1.5.0.tar.gz -ef852ee36e6135d9812e41831417f97c67eada703f9d6252b690935359f70288ec56b34fdc2846f36ce9c9ee1276dae1bf17af7839d9ed11083b63b8a118cf7c 10-backtrace-guards.patch" +sha512sums="2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32 pdal-1.6.0.tar.gz" |