From ab6b0194170e9f2a83b70827e8a50715e1358cc3 Mon Sep 17 00:00:00 2001 From: David Beauchamp Date: Wed, 24 Jul 2024 13:41:38 -0400 Subject: [PATCH] extra/gdal to 3.9.1-1 --- extra/gdal/.SRCINFO | 14 +++++--------- extra/gdal/PKGBUILD | 17 ++++------------- extra/gdal/gdal.changelog | 4 ++-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/extra/gdal/.SRCINFO b/extra/gdal/.SRCINFO index 5a5ad4d8b..016d53214 100644 --- a/extra/gdal/.SRCINFO +++ b/extra/gdal/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = gdal pkgdesc = A translator library for raster and vector geospatial data formats - pkgver = 3.9.0 - pkgrel = 4 + pkgver = 3.9.1 + pkgrel = 1 url = https://gdal.org/ changelog = gdal.changelog arch = x86_64 @@ -52,12 +52,8 @@ pkgbase = gdal makedepends = zlib makedepends = zstd makedepends = libaec - source = https://download.osgeo.org/gdal/3.9.0/gdal-3.9.0.tar.xz - source = https://github.com/OSGeo/gdal/commit/7b526b12.patch - source = https://github.com/OSGeo/gdal/commit/f80f32bf.patch - b2sums = 5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0 - b2sums = 801eb649c20ef81d7590888589d4049eab4505fac6efbe1718d8bc9e01a35390b9d8cad090c3421ff90d769fe3f5aec4d1641409ecc5a434ba68c4c5d30eec85 - b2sums = 44efbd94544eea4c82373631d3068b61d6fa5b0f2851c4a87b16d3edb4edd98f331483be58c17e012ecc5aee140da1c6f74d5a5ea766fd1d7316e0ad9e288b0e + source = https://download.osgeo.org/gdal/3.9.1/gdal-3.9.1.tar.xz + b2sums = a9c5c20b1bc704a331ea54f1575f655197075dde75fa6144cff43763d57d64b9bd6e3c7a40bedb919567b45185688b206a3cc13278d0605c5be0b895b403bbab pkgname = gdal depends = proj @@ -104,5 +100,5 @@ pkgname = gdal pkgname = python-gdal pkgdesc = Python bindings for GDAL - depends = gdal=3.9.0 + depends = gdal=3.9.1 depends = python-numpy diff --git a/extra/gdal/PKGBUILD b/extra/gdal/PKGBUILD index 6946df89f..f1f9cb769 100644 --- a/extra/gdal/PKGBUILD +++ b/extra/gdal/PKGBUILD @@ -10,8 +10,8 @@ pkgbase=gdal pkgname=(gdal python-gdal) -pkgver=3.9.0 -pkgrel=4 +pkgver=3.9.1 +pkgrel=1 pkgdesc="A translator library for raster and vector geospatial data formats" arch=(x86_64) url="https://gdal.org/" @@ -25,17 +25,8 @@ makedepends=(cmake opencl-headers python-setuptools python-numpy # armadillo basisu brunsli lerc libkml qb3 rasterlite2 sfcgal tiledb # ogdi changelog=$pkgbase.changelog -source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz - https://github.com/OSGeo/gdal/commit/7b526b12.patch - https://github.com/OSGeo/gdal/commit/f80f32bf.patch) -b2sums=('5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0' - '801eb649c20ef81d7590888589d4049eab4505fac6efbe1718d8bc9e01a35390b9d8cad090c3421ff90d769fe3f5aec4d1641409ecc5a434ba68c4c5d30eec85' - '44efbd94544eea4c82373631d3068b61d6fa5b0f2851c4a87b16d3edb4edd98f331483be58c17e012ecc5aee140da1c6f74d5a5ea766fd1d7316e0ad9e288b0e') - -prepare() { - patch -d $pkgbase-$pkgver -p1 < 7b526b12.patch # Fix build with C++20 - patch -d $pkgbase-$pkgver -p1 < f80f32bf.patch -} +source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz) +b2sums=('a9c5c20b1bc704a331ea54f1575f655197075dde75fa6144cff43763d57d64b9bd6e3c7a40bedb919567b45185688b206a3cc13278d0605c5be0b895b403bbab') build() { cmake -B build -S $pkgbase-$pkgver \ diff --git a/extra/gdal/gdal.changelog b/extra/gdal/gdal.changelog index 1e9b44d9a..3386d76f6 100644 --- a/extra/gdal/gdal.changelog +++ b/extra/gdal/gdal.changelog @@ -20,7 +20,7 @@ 2021-05-08 Jaroslav Lichtblau * gdal 3.2.3-1 -2020-01-30 Evangelos Foutras +2020-01-30 Evangelos Foutras * gdal 3.0.4-1 2020-01-25 Jaroslav Lichtblau @@ -102,7 +102,7 @@ 2014-12-22 Jaroslav Lichtblau * gdal 1.11.1-5 FS#43193 fix -2014-12-20 Evangelos Foutras +2014-12-20 Evangelos Foutras * gdal 1.11.1-4 poppler 0.29.0 rebuild 2014-11-25 Jaroslav Lichtblau