From 0d022089036ce46b186e8793b84de64d4ba5f63f Mon Sep 17 00:00:00 2001 From: ArTourter Date: Fri, 8 Jul 2022 17:33:07 +0100 Subject: [PATCH] gis/gdal: Updated for version 3.5.1. - disable build testing by default - add flag to build testing components and run make test Signed-off-by: ArTourter Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- gis/gdal/README | 4 ++++ gis/gdal/gdal.SlackBuild | 8 +++++++- gis/gdal/gdal.info | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gis/gdal/README b/gis/gdal/README index 1c41944949..296eb8edf3 100644 --- a/gis/gdal/README +++ b/gis/gdal/README @@ -19,3 +19,7 @@ suitable GPU hardware to run). To build JAVA bindings, specify JAVA=yes (it requires a java JDK and ant). + +By default, the script does not build nor run the tests. You can use the +option TESTBUILD=YES to build and run the tests before the make install +part. diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index 73bf7dd379..f1bc0a03d3 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdal -VERSION=${VERSION:-3.5.0} +VERSION=${VERSION:-3.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,6 +70,10 @@ fi set -e +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DBUILD_TESTING=OFF' +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -115,9 +119,11 @@ mkdir build -DGDAL_USE_GEOTIFF_INTERNAL=ON \ -DGDAL_USE_TIFF_INTERNAL=ON \ $WITHLIST \ + $TESTBUILDFLAGS \ -DCMAKE_BUILD_TYPE=Release \ .. make + [[ $TESTBUILD == "YES" ]] && make test make install/strip DESTDIR=$PKG ) diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info index 19a3d1be34..dad7c3e41c 100644 --- a/gis/gdal/gdal.info +++ b/gis/gdal/gdal.info @@ -1,8 +1,8 @@ PRGNAM="gdal" -VERSION="3.5.0" +VERSION="3.5.1" HOMEPAGE="https://www.gdal.org/" -DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.5.0/gdal-3.5.0.tar.gz" -MD5SUM="1df31a62405e33eacceddf53a81fc136" +DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.5.1/gdal-3.5.1.tar.gz" +MD5SUM="90ec67df8648e36795937c07406815ea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="geos proj"