diff options
author | ArTourter <artourter@gmail.com> | 2024-05-25 00:09:32 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-06-08 16:24:16 +0700 |
commit | d204574e6bd6191b33bc7ef5918381d5a187575e (patch) | |
tree | 85d10794046cd91032a354a7161120c13034a2fd /gis | |
parent | 6ed1a3227b0b292eae6e4b2e084e213f452dd79b (diff) |
gis/gdal: Updated for version 3.9.0.
Shared library .so-version bump.
Signed-off-by: ArTourter <artourter@gmail.com>
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'gis')
-rw-r--r-- | gis/gdal/gdal.SlackBuild | 7 | ||||
-rw-r--r-- | gis/gdal/gdal.info | 8 | ||||
-rw-r--r-- | gis/gdal/poppler.patch | 23 |
3 files changed, 6 insertions, 32 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index c18ddc7e6676..8622ebd9828d 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdal -VERSION=${VERSION:-3.8.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -96,9 +96,6 @@ if [ ${JAVA:-no} = "no" ]; then WITHLIST+=" -DBUILD_JAVA_BINDINGS:BOOL=OFF" fi -# Patch for newer poppler -patch -p1 < $CWD/poppler.patch - mkdir build ( cd build diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info index 70e6cd04c357..4052e2344dc1 100644 --- a/gis/gdal/gdal.info +++ b/gis/gdal/gdal.info @@ -1,10 +1,10 @@ PRGNAM="gdal" -VERSION="3.8.5" +VERSION="3.9.0" HOMEPAGE="https://www.gdal.org/" -DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz" -MD5SUM="1e192b50698c11c8a3c5c223343cb86d" +DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.9.0/gdal-3.9.0.tar.gz" +MD5SUM="d3780907608f381a4f662cb1480c7f97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="xerces-c libkml netcdf libspatialite podofo libgeotiff" +REQUIRES="xerces-c libkml netcdf libspatialite podofo libgeotiff python3-numpy" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" diff --git a/gis/gdal/poppler.patch b/gis/gdal/poppler.patch deleted file mode 100644 index 837a50f6b825..000000000000 --- a/gis/gdal/poppler.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Thu, 4 Apr 2024 17:48:33 +0200 -Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet) - ---- - frmts/pdf/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt -index 9b9a1898a730..bcb19c3aa24c 100644 ---- a/frmts/pdf/CMakeLists.txt -+++ b/frmts/pdf/CMakeLists.txt -@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER) - if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+") - string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR}) - endif () -+ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05") -+ target_compile_features(gdal_PDF PRIVATE cxx_std_20) -+ endif () - target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR} - -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR}) - endif () |