gis/pdal: Updated for version 2.6.1.

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

3 files changed, 21 insertions, 32 deletions

diff --git a/gis/pdal/README b/gis/pdal/README
index aa823290c0..95f8695aa2 100644
--- a/gis/pdal/README
+++ b/gis/pdal/README
@@ -7,18 +7,18 @@ with multi-dimensional emitted-pulse scanning systems. While PDAL is
 not explicitly limited to working with LiDAR data formats, its initial
 rollout is focused in that area.
 
-PDAL includes several plugins needed for some extended features or to 
-write/read data in specific formats. The build of these plugins 
-requires optional dependencies included in Slackware 15.0 or available 
-as packages from Slackbuilds.org. Other plugins need third parts 
-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 E57=no ./pdal.SlackBuild). 
-
-Plugins enabled by default if their dependencies are installed (see 
+PDAL includes several plugins needed for some extended features or to
+write/read data in specific formats. The build of these plugins
+requires optional dependencies included in Slackware 15.0 or available
+as packages from Slackbuilds.org. Other plugins need third parts
+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 E57=no ./pdal.SlackBuild).
+
+Plugins enabled by default if their dependencies are installed (see
 README.SBo to know what feature they extend):
 
 - E57: requires xerces-c
diff --git a/gis/pdal/pdal.SlackBuild b/gis/pdal/pdal.SlackBuild
index 5e668ed616..6f72a44600 100644
--- a/gis/pdal/pdal.SlackBuild
+++ b/gis/pdal/pdal.SlackBuild
@@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pdal
 SRCNAM=PDAL
-VERSION=${VERSION:-2.6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -104,21 +104,6 @@ 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 \
@@ -155,6 +140,10 @@ chmod 644 $PKG/usr/include/pdal/*/*.hpp
 chmod 644 $PKG/usr/include/pdal/*/*/*.hpp
 chmod 644 $PKG/usr/include/pdal/*/*/*/*.hpp
 
+# Fix path of bash-completion
+mv $PKG/usr/share/share/* $PKG/usr/share
+rmdir $PKG/usr/share/share
+
 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 e253341e77..518660dab6 100644
--- a/gis/pdal/pdal.info
+++ b/gis/pdal/pdal.info
@@ -1,8 +1,8 @@
 PRGNAM="pdal"
-VERSION="2.6.0"
+VERSION="2.6.1"
 HOMEPAGE="https://pdal.io"
-DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.6.0/PDAL-2.6.0.tar.gz"
-MD5SUM="06d22eb8831c83766ceead3e5803a822"
+DOWNLOAD="https://github.com/PDAL/PDAL/archive/2.6.1/PDAL-2.6.1.tar.gz"
+MD5SUM="32d98957349ae788a89fd05e4c3ad598"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal hdf5 libgeotiff netcdf postgresql"