ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

* update gdal to 3.10.0-4

Browse Source
This commit is contained in:
Alexander Baldeck 2025-01-05 23:21:13 +01:00
parent fc223e6d5c
commit 1d0c96c485
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdal/.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = gdal
pkgdesc = A translator library for raster and vector geospatial data formats
pkgver = 3.10.0
pkgrel = 2
pkgrel = 4
url = https://gdal.org/
changelog = gdal.changelog
arch = x86_64
@ -57,7 +57,9 @@ pkgbase = gdal
makedepends = zstd
makedepends = libaec
source = https://download.osgeo.org/gdal/3.10.0/gdal-3.10.0.tar.xz
source = fix_build_with_poppler_24.12.patch
b2sums = edb4ad94ef22de0dbcffb64b0009b7f771d8a6a7288457e414518c741c375097bf5f6d892d108ef134f8be2af8c3ded9ba9b41119f31204322b993142c3ed7d1
b2sums = 2ff96109e8e16a96b6acdf3c7396c909025ad479a6c140eeda3f082e759f8dcdab43242c9687717bc85adb0b0c1fd6d0b6224a064d45e261e491cd436260118b
pkgname = gdal
depends = proj

15
gdal/PKGBUILD
View File

@ -7,7 +7,7 @@
pkgbase=gdal
pkgname=(gdal python-gdal)
pkgver=3.10.0
pkgrel=2
pkgrel=4
pkgdesc="A translator library for raster and vector geospatial data formats"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url="https://gdal.org/"
@ -21,8 +21,17 @@ 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)
b2sums=('edb4ad94ef22de0dbcffb64b0009b7f771d8a6a7288457e414518c741c375097bf5f6d892d108ef134f8be2af8c3ded9ba9b41119f31204322b993142c3ed7d1')
source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
fix_build_with_poppler_24.12.patch)
b2sums=('edb4ad94ef22de0dbcffb64b0009b7f771d8a6a7288457e414518c741c375097bf5f6d892d108ef134f8be2af8c3ded9ba9b41119f31204322b993142c3ed7d1'
'2ff96109e8e16a96b6acdf3c7396c909025ad479a6c140eeda3f082e759f8dcdab43242c9687717bc85adb0b0c1fd6d0b6224a064d45e261e491cd436260118b')
prepare() {
cd $pkgbase-$pkgver
# Temporary patch to fix build with poppler 24.12
# See https://github.com/OSGeo/gdal/commit/19ba2562b506f628e0f023774fdb52ada656f95b
patch -Np1 < $srcdir/fix_build_with_poppler_24.12.patch
}
build() {
case "${CARCH}" in

28
gdal/fix_build_with_poppler_24.12.patch Normal file
View File

@ -0,0 +1,28 @@
From 19ba2562b506f628e0f023774fdb52ada656f95b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 9 Dec 2024 18:18:31 +0100
Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc
13.3)
Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
---
frmts/pdf/pdfsdk_headers_poppler.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/frmts/pdf/pdfsdk_headers_poppler.h b/frmts/pdf/pdfsdk_headers_poppler.h
index 00cc4067fe5b..d2a3a449d124 100644
--- a/frmts/pdf/pdfsdk_headers_poppler.h
+++ b/frmts/pdf/pdfsdk_headers_poppler.h
@@ -19,6 +19,11 @@
#ifdef HAVE_POPPLER
+// The "#define private public" hacks we do below do not play well with the
+// sstream header.
+// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
+#include <sstream>
+
/* Horrible hack because there's a conflict between struct FlateDecode of */
/* include/poppler/Stream.h and the FlateDecode() function of */
/* pdfium/core/include/fpdfapi/fpdf_parser.h. */