Update to 3.8.0, add libaec dep & fix python build

2 files changed, 26 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3fe89687def..8cb1a1432fd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gdal-libkml-filegdb
 	pkgdesc = A translator library for raster and vector geospatial data formats (with libkml and filegdb support)
-	pkgver = 3.7.3
+	pkgver = 3.8.0
 	pkgrel = 1
 	url = https://gdal.org/
 	changelog = gdal.changelog
@@ -51,10 +51,15 @@ pkgbase = gdal-libkml-filegdb
 	makedepends = xerces-c
 	makedepends = zlib
 	makedepends = zstd
+	makedepends = libaec
 	makedepends = libkml-git
 	provides = gdal
-	source = https://download.osgeo.org/gdal/3.7.3/gdal-3.7.3.tar.xz
-	b2sums = 743ce2d8027fb228630a2951af2de8ac7fb5fa0b32124d58fb545ac61fdf5240f17ae85cfdcab51ea5e1b4e2311b55af4c7bbdfe82c6ed5ea180a5c8b254ccfd
+	source = https://download.osgeo.org/gdal/3.8.0/gdal-3.8.0.tar.xz
+	source = https://github.com/OSGeo/gdal/commit/cbed9fc9.patch
+	source = https://github.com/OSGeo/gdal/commit/ec33f6d6.patch
+	b2sums = 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d
+	b2sums = e75eb8edb5507450ded3bca618a03a283ba49791df416b0a7732f859d93124704e8508fcd11271bbbeef299d05d3ad2df9e03bd805580445407cb6b8c003a98e
+	b2sums = 5c0abcfcfbb0ca2a96156abb4c7daaf4860fa30d553228172eb8def8b2f95e93bae9217974fba9621dcf9921e906a5ada9b710b1c0b29e7e580191a0a56a76e2
 
 pkgname = gdal-libkml-filegdb
 	depends = proj
@@ -84,6 +89,7 @@ pkgname = gdal-libkml-filegdb
 	depends = xerces-c
 	depends = zlib
 	depends = zstd
+	depends = libaec
 	depends = libkml-git
 	depends = filegdb-api
 	optdepends = arrow: Arrow/Parquet support
@@ -105,7 +111,7 @@ pkgname = gdal-libkml-filegdb
 
 pkgname = python-gdal-libkml-filegdb
 	pkgdesc = Python bindings for GDAL
-	depends = gdal-libkml-filegdb=3.7.3
+	depends = gdal-libkml-filegdb=3.8.0
 	depends = python-numpy
 	provides = python-gdal
 	conflicts = python-gdal
diff --git a/PKGBUILD b/PKGBUILD
index 4cba1ac0f08c..b5f59b7478a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=gdal-libkml-filegdb
 pkgname=(gdal-libkml-filegdb python-gdal-libkml-filegdb)
-pkgver=3.7.3
+pkgver=3.8.0
 pkgrel=1
 provides=('gdal')
 pkgdesc="A translator library for raster and vector geospatial data formats (with libkml and filegdb support)"
@@ -18,18 +18,25 @@ makedepends=(cmake opencl-headers python-setuptools python-numpy
              libgeotiff geos giflib libheif hdf5 libjpeg-turbo json-c libjxl xz
              libxml2 lz4 mariadb-libs netcdf unixodbc ocl-icd openexr openjpeg2
              openssl pcre2 libpng podofo poppler postgresql-libs qhull
-             libspatialite sqlite swig libtiff libwebp xerces-c zlib zstd libkml-git)
-# armadillo brunsli lerc libkml rasterlite2 sfcgal tiledb
+             libspatialite sqlite swig libtiff libwebp xerces-c zlib zstd libaec libkml-git)
+# armadillo brunsli lerc libkml qb3 rasterlite2 sfcgal tiledb
 # ogdi
 changelog=gdal.changelog
-source=(https://download.osgeo.org/gdal/${pkgver}/gdal-${pkgver}.tar.xz) 
-b2sums=('743ce2d8027fb228630a2951af2de8ac7fb5fa0b32124d58fb545ac61fdf5240f17ae85cfdcab51ea5e1b4e2311b55af4c7bbdfe82c6ed5ea180a5c8b254ccfd')
+source=(https://download.osgeo.org/gdal/${pkgver}/gdal-${pkgver}.tar.xz
+        https://github.com/OSGeo/gdal/commit/cbed9fc9.patch
+        https://github.com/OSGeo/gdal/commit/ec33f6d6.patch)
+b2sums=('646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d'
+        'e75eb8edb5507450ded3bca618a03a283ba49791df416b0a7732f859d93124704e8508fcd11271bbbeef299d05d3ad2df9e03bd805580445407cb6b8c003a98e'
+        '5c0abcfcfbb0ca2a96156abb4c7daaf4860fa30d553228172eb8def8b2f95e93bae9217974fba9621dcf9921e906a5ada9b710b1c0b29e7e580191a0a56a76e2')
 
-# prepare() {
-#
-# }
+prepare() {
+  # Fix build with libxml2 2.12
+  patch -d gdal-$pkgver -p1 < cbed9fc9.patch
+  patch -d gdal-$pkgver -p1 < ec33f6d6.patch
+}
 
 build() {
+  export PATH="$(pwd)/build/apps:$PATH"
   cmake -B build -S gdal-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_CXX_STANDARD=17 \
@@ -88,7 +95,7 @@ package_gdal-libkml-filegdb () {
   conflicts=('gdal')
   depends=(proj blosc crypto++ curl libdeflate expat libfreexl geos libgeotiff
            giflib libjpeg-turbo json-c xz libxml2 lz4 unixodbc ocl-icd openssl
-           pcre2 libpng qhull libspatialite sqlite libtiff xerces-c zlib zstd libkml-git filegdb-api)
+           pcre2 libpng qhull libspatialite sqlite libtiff xerces-c zlib zstd libaec libkml-git filegdb-api)
   optdepends=('arrow: Arrow/Parquet support'
               'cfitsio: FITS support'
               'hdf5: HDF5 support'