Update to 3.6.4

2 files changed, 34 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f737e8602d76..851900b9f1c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = gdal-libkml
+pkgbase = gdal-libkml-filegdb
 	pkgdesc = A translator library for raster and vector geospatial data formats
-	pkgver = 3.5.1
-	pkgrel = 3
+	pkgver = 3.6.4
+	pkgrel = 0
 	url = https://gdal.org/
 	changelog = gdal.changelog
 	arch = x86_64
@@ -26,6 +26,7 @@ pkgbase = gdal-libkml
 	makedepends = hdf5
 	makedepends = libjpeg-turbo
 	makedepends = json-c
+	makedepends = libjxl
 	makedepends = xz
 	makedepends = libxml2
 	makedepends = lz4
@@ -52,10 +53,12 @@ pkgbase = gdal-libkml
 	makedepends = zstd
 	makedepends = libkml-git
 	provides = gdal
-	source = https://download.osgeo.org/gdal/3.5.1/gdal-3.5.1.tar.xz
-	sha256sums = d12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6
+	source = https://download.osgeo.org/gdal/3.6.4/gdal-3.6.4.tar.xz
+	source = https://github.com/Esri/file-geodatabase-api/blob/master/FileGDB_API_1.5.1/FileGDB_API_1_5_1-64gcc51.tar.gz
+	sha256sums = 889894cfff348c04ac65b462f629d03efc53ea56cf04de7662fbe81a364e3df1
+	sha256sums = 1a1b5c417224e8a4dfd3f7c1f4d1911febf1de38e9b6f93a1e4523a9fce92a91
 
-pkgname = gdal-libkml
+pkgname = gdal-libkml-filegdb
 	depends = proj
 	depends = blosc
 	depends = crypto++
@@ -88,6 +91,7 @@ pkgname = gdal-libkml
 	optdepends = cfitsio: FITS support
 	optdepends = hdf5: HDF5 support
 	optdepends = libheif: HEIF support
+	optdepends = libjxl: JPEG XL support
 	optdepends = mariadb-libs: MySQL support
 	optdepends = netcdf: netCDF support
 	optdepends = openexr: EXR support
@@ -97,12 +101,12 @@ pkgname = gdal-libkml
 	optdepends = postgresql-libs: PostgreSQL support
 	optdepends = libwebp: WebP support
 	provides = gdal
-	provides = gdal-libkml
+	provides = gdal-libkml-filegdb
 	conflicts = gdal
 
-pkgname = python-gdal-libkml
+pkgname = python-gdal-libkml-filegdb
 	pkgdesc = Python bindings for GDAL
-	depends = gdal-libkml=3.5.1
+	depends = gdal-libkml-filegdb=3.6.4
 	depends = python-numpy
 	provides = python-gdal
 	conflicts = python-gdal
diff --git a/PKGBUILD b/PKGBUILD
index 85973d91f281..366dfb14d124 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
-pkgbase=gdal-libkml
-pkgname=(gdal-libkml python-gdal-libkml)
-pkgver=3.5.1
-pkgrel=3
+pkgbase=gdal-libkml-filegdb
+pkgname=(gdal-libkml-filegdb python-gdal-libkml-filegdb)
+pkgver=3.6.4
+pkgrel=0
 provides=('gdal')
 pkgdesc="A translator library for raster and vector geospatial data formats"
 arch=(x86_64)
@@ -15,19 +15,22 @@ url="https://gdal.org/"
 license=(custom)
 makedepends=(cmake opencl-headers python-setuptools python-numpy
              proj arrow blosc cfitsio curl crypto++ libdeflate expat libfreexl
-             libgeotiff geos giflib libheif hdf5 libjpeg-turbo json-c xz
+             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
 # ogdi
 changelog=gdal.changelog
-source=(https://download.osgeo.org/gdal/${pkgver}/gdal-${pkgver}.tar.xz)
-sha256sums=('d12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6')
+source=(https://download.osgeo.org/gdal/${pkgver}/gdal-${pkgver}.tar.xz https://github.com/Esri/file-geodatabase-api/blob/master/FileGDB_API_1.5.1/FileGDB_API_1_5_1-64gcc51.tar.gz)
+sha256sums=('889894cfff348c04ac65b462f629d03efc53ea56cf04de7662fbe81a364e3df1'
+            '1a1b5c417224e8a4dfd3f7c1f4d1911febf1de38e9b6f93a1e4523a9fce92a91')
 
 build() {
+  tar xzvf FileGDB_API_1_5_1-64gcc51.tar.gz
   cmake -B build -S gdal-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_STANDARD=17 \
     -DENABLE_IPO=ON \
     -DBUILD_PYTHON_BINDINGS=ON \
     -DGDAL_ENABLE_PLUGINS=ON \
@@ -47,6 +50,7 @@ build() {
     -DGDAL_USE_ICONV=ON \
     -DGDAL_USE_JPEG=ON \
     -DGDAL_USE_JSONC=ON \
+    -DGDAL_USE_JXL=ON \
     -DGDAL_USE_LIBLZMA=ON \
     -DGDAL_USE_LIBXML2=ON \
     -DGDAL_USE_LZ4=ON \
@@ -70,12 +74,15 @@ build() {
     -DGDAL_USE_XERCESC=ON \
     -DGDAL_USE_ZLIB=ON \
     -DGDAL_USE_ZSTD=ON \
-    -DGDAL_USE_LIBKML=ON
-  make -C build
+    -DGDAL_USE_LIBKML=ON \
+    -DGDAL_USE_FileGDB=ON \
+    -DFileGDB_INCLUDE_DIR=FileGDB_API-64gcc51/include \
+    -DFileGDB_LIBRARY=FileGDB_API-64gcc51/lib/libFileGDBAPI.so && \
+  make -C build -j $(nproc)
 }
 
-package_gdal-libkml () {
-  provides+=('gdal-libkml')
+package_gdal-libkml-filegdb () {
+  provides+=('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
@@ -84,6 +91,7 @@ package_gdal-libkml () {
               'cfitsio: FITS support'
               'hdf5: HDF5 support'
               'libheif: HEIF support'
+              'libjxl: JPEG XL support'
               'mariadb-libs: MySQL support'
               'netcdf: netCDF support'
               'openexr: EXR support'
@@ -101,9 +109,9 @@ package_gdal-libkml () {
   mv "${pkgdir}"/usr/lib/python* lib
 }
 
-package_python-gdal-libkml () {
+package_python-gdal-libkml-filegdb () {
   pkgdesc="Python bindings for GDAL"
-  depends=("gdal-libkml=$pkgver" 'python-numpy')
+  depends=("gdal-libkml-filegdb=$pkgver" 'python-numpy')
   provides=('python-gdal')
   conflicts=('python-gdal')