gis/pdal: Updated for version 2.6.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 32 insertions, 11 deletions

diff --git a/gis/pdal/README b/gis/pdal/README
index 913d9fdbf11d..c6547a6c9c8b 100644
--- a/gis/pdal/README
+++ b/gis/pdal/README
@@ -16,7 +16,7 @@ dependencies that are not available here.
 If their dependencies (autodetected) are installed, the script enables 
 by default the build of the supported plugins. You can disable each of 
 them by passing to the slackwbuild its environment variable set as 
-"no" (for example I3S=no ./pdal.SlackBuild). 
+"no" (for example E57=no ./pdal.SlackBuild).
 
 Plugins enabled by default if their dependencies are installed (see 
 README.SBo to know what feature they extend):
@@ -24,7 +24,7 @@ README.SBo to know what feature they extend):
 - E57: requires xerces-c
 - OSG: requires OpenSceneGraph
 
-HDF, I3S, ICEBRIDGE do not require optional deps
+HDF, ICEBRIDGE do not require optional deps
 
 Other optional dependencies (autodetected) that improve the 
 functionality of PDAL are jsocpp and laszip. The installation of 
diff --git a/gis/pdal/README.SBo b/gis/pdal/README.SBo
index a52a64da401c..902061516296 100644
--- a/gis/pdal/README.SBo
+++ b/gis/pdal/README.SBo
@@ -2,6 +2,5 @@ Features added by following plugins
 
 - E57: read and write data to and from e57 format
 - HDF: read data in the HDF format
-- I3S: read from a I3S server or from a SLPK file
 - ICEBRIDGE: read data in the Icebridge format
 - OSG: read and write OpenSceneGraph objects
diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild
index 571b257dc423..15b5286531f2 100644
--- a/gis/pdal/pdal.SlackBuild
+++ b/gis/pdal/pdal.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pdal
 SRCNAM=PDAL
-VERSION=${VERSION:-2.5.6}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -35,8 +35,6 @@ PKGTYPE=${PKGTYPE:-tgz}
 # *************************************************************************
 
 # Build of these plugin is enabled by default since they require netcdf and hdf5
-BUILDI3S="-DBUILD_PLUGIN_I3S=ON" ; \
-          [ "${I3S:-yes}" = "no" ] && BUILDI3S=""
 BUILDICEBRIDGE="-DBUILD_PLUGIN_ICEBRIDGE=ON" ; \
           [ "${ICEBRIDGE:-yes}" = "no" ] && BUILDICEBRIDGE=""
 BUILDHDF="-DBUILD_PLUGIN_HDF=ON" ; \
@@ -52,7 +50,7 @@ fi
 
 # *************************************************************************
 
-# Users that have a standard installation of proprietary MatLAB would enable 
+# Users that have a standard installation of proprietary MatLAB would enable
 # the build of Matlab plugin. This is disabled by default
 BUILDMATLAB="" ; [ "${MATLAB:-no}" = "yes" ] && \
                   BUILDMATLAB="-DBUILD_PLUGIN_MATLAB=ON"
@@ -103,6 +101,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# This patch prevents build failure caused by Libunwind
+# in pdal version 2.6.0 if is found in the system
+patch -p0 << 'EOF'
+--- ./cmake/unwind.cmake
++++ ./cmake/unwind.cmake
+@@ -4,5 +4,5 @@
+
+ set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html
+-find_package(Libunwind QUIET)
++find_package(Libunwind QUIET NO_MODULE)
+ set(FPHSA_NAME_MISMATCHED 0)
+
+
+EOF
+
 mkdir -p build
 cd build
   cmake \
@@ -115,7 +128,8 @@ cd build
     -DBUILD_PGPOINTCLOUD_TESTS=OFF \
     -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
     -DWITH_COMPLETION=ON \
-    $BUILDI3S \
+    -DWITH_BACKTRACE=OFF \
+    -DWITH_TESTS=FALSE \
     $BUILDICEBRIDGE \
     $BUILDE57 \
     $BUILDOSG \
@@ -129,6 +143,14 @@ cd ..
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Remove empty directories and fix permissions (issues found by sbopkglint)
+rmdir $PKG/usr/include/pdal/filters/private/csf
+rmdir $PKG/usr/include/pdal/filters/private/miniball
+chmod 644 $PKG/usr/include/pdal/*.hpp
+chmod 644 $PKG/usr/include/pdal/*/*.hpp
+chmod 644 $PKG/usr/include/pdal/*/*/*.hpp
+chmod 644 $PKG/usr/include/pdal/*/*/*/*.hpp
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS.txt CITATION LICENSE.txt README.md RELEASENOTES.txt \
diff --git a/gis/pdal/pdal.info b/gis/pdal/pdal.info
index 4f23f24dec08..e253341e7770 100644
--- a/gis/pdal/pdal.info
+++ b/gis/pdal/pdal.info
@@ -1,8 +1,8 @@
 PRGNAM="pdal"
-VERSION="2.5.6"
+VERSION="2.6.0"
 HOMEPAGE="https://pdal.io"
-DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.5.6/PDAL-2.5.6.tar.gz"
-MD5SUM="fde46596cb1ae779a09cbb762ffec1d8"
+DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.6.0/PDAL-2.6.0.tar.gz"
+MD5SUM="06d22eb8831c83766ceead3e5803a822"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal hdf5 libgeotiff netcdf postgresql"