Update GDAL version, build to new system and changelog to gdals

3 files changed, 232 insertions, 100 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 38d3ca4b05cb..d63115257a25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,90 +1,122 @@
+# Maintainer: Martin Morlot <martinmorlot at gmail dot com>
 # Maintainer: Jaroslav Lichtblau <svetlemodry@archlinux.org>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
+# Contributor: # Contributor: Luigi Ranghetti <ggranga@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
-# Contributor: Luigi Ranghetti <ggranga@gmail.com>
 
 pkgbase=gdal-hdf4
 _pkgbase=gdal
 provides=('gdal')
 conflicts=('gdal')
-pkgname=('gdal-hdf4' 'python-gdal-hdf4')
-pkgver=3.4.0
-pkgrel=2.0
-pkgdesc="A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool). Based on gdal ArchLinux package version."
-arch=('x86_64')
+pkgname=(gdal-hdf4 python-gdal-hdf4)
+pkgver=3.5.1
+pkgrel=2
+pkgdesc="A translator library for raster and vector geospatial data formats"
+arch=(x86_64)
 url="https://gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'hdf4'
-         'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'mariadb-libs' 'postgresql-libs' 'xerces-c' 'json-c')
-makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-breathe' 'python-numpy' 'python-sphinx' 'boost')
-optdepends=('postgresql: postgresql database support'
-            'mariadb: mariadb database support'
-            'perl: perl binding support')
-options=('!emptydirs')
+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
+             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 hdf4)
+# armadillo brunsli lerc libkml rasterlite2 sfcgal tiledb
+# ogdi
 changelog=$pkgbase.changelog
-source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
-        gdal-perl-vendor.patch::https://raw.githubusercontent.com/archlinux/svntogit-community/packages/gdal/trunk/gdal-perl-vendor.patch)
-sha256sums=('ac7bd2bb9436f3fc38bc7309704672980f82d64b4d57627d27849259b8f71d5c'
-            '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
-
-prepare() {
-  cd "${srcdir}"/$_pkgbase-$pkgver
-
-# Fix mandir
-  sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
-
-# Fix Perl bindings installation path
-  patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch
-}
+source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz)
+sha256sums=('d12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6')
 
 build() {
-  cd "${srcdir}"/$_pkgbase-$pkgver
-
-  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 --with-geotiff \
-              --with-mysql --with-curl --with-hdf5 --with-hdf4=/opt/hdf4 --with-perl --with-geos \
-              --with-png --with-poppler --with-spatialite --with-openjpeg
-
-# workaround for bug #13646
-#   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
-#   sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-
-  make
-  make man
-
-  cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-  python setup.py build
+  cmake -B build -S $_pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_IPO=ON \
+    -DBUILD_PYTHON_BINDINGS=ON \
+    -DGDAL_ENABLE_PLUGINS=ON \
+    -DGDAL_USE_ARROW=ON \
+    -DGDAL_USE_BLOSC=ON \
+    -DGDAL_USE_CFITSIO=ON \
+    -DGDAL_USE_CURL=ON \
+    -DGDAL_USE_CRYPTOPP=ON \
+    -DGDAL_USE_DEFLATE=ON \
+    -DGDAL_USE_EXPAT=ON \
+    -DGDAL_USE_FREEXL=ON \
+    -DGDAL_USE_GEOTIFF=ON \
+    -DGDAL_USE_GEOS=ON \
+    -DGDAL_USE_GIF=ON \
+    -DGDAL_USE_HEIF=ON \
+    -DGDAL_USE_HDF5=ON \
+    -DGDAL_USE_HDF4=ON \
+    -DHDF4_INCLUDE_DIR=/opt/hdf4/include \
+    -DHDF4_df_LIBRARY_RELEASE=/opt/hdf4/lib/libdf.so \
+    -DHDF4_mfhdf_LIBRARY_RELEASE=/opt/hdf4/lib/libmfhdf.so \
+    -DGDAL_USE_ICONV=ON \
+    -DGDAL_USE_JPEG=ON \
+    -DGDAL_USE_JSONC=ON \
+    -DGDAL_USE_LIBLZMA=ON \
+    -DGDAL_USE_LIBXML2=ON \
+    -DGDAL_USE_LZ4=ON \
+    -DGDAL_USE_MYSQL=ON \
+    -DGDAL_USE_NETCDF=ON \
+    -DGDAL_USE_ODBC=ON \
+    -DGDAL_USE_OPENCL=ON \
+    -DGDAL_USE_OPENEXR=ON \
+    -DGDAL_USE_OPENJPEG=ON \
+    -DGDAL_USE_OPENSSL=ON \
+    -DGDAL_USE_PARQUET=ON \
+    -DGDAL_USE_PCRE2=ON \
+    -DGDAL_USE_PNG=ON \
+    -DGDAL_USE_POPPLER=ON \
+    -DGDAL_USE_POSTGRESQL=ON \
+    -DGDAL_USE_QHULL=ON \
+    -DGDAL_USE_SPATIALITE=ON \
+    -DGDAL_USE_SQLITE3=ON \
+    -DGDAL_USE_TIFF=ON \
+    -DGDAL_USE_WEBP=ON \
+    -DGDAL_USE_XERCESC=ON \
+    -DGDAL_USE_ZLIB=ON \
+    -DGDAL_USE_ZSTD=ON
+  make -C build
 }
 
 package_gdal-hdf4 () {
-  cd "${srcdir}"/$_pkgbase-$pkgver
-
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" install-man
-
-# install license
-  install -Dm644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/$_pkgbase/LICENSE
-
-# Remove RPATH
-  eval local $(perl -V:vendorarch)
-  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OSR/OSR.so
-  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OGR/OGR.so
-  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/GDAL.so
-  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/Const/Const.so
-  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GNM/GNM.so
+  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
+           hdf4)
+  optdepends=('arrow: Arrow/Parquet support'
+              'cfitsio: FITS support'
+              'hdf5: HDF5 support'
+              'libheif: HEIF support'
+              'mariadb-libs: MySQL support'
+              'netcdf: netCDF support'
+              'openexr: EXR support'
+              'openjpeg2: JP2 support'
+              'podofo: PDF support'
+              'poppler: PDF support'
+              'postgresql-libs: PostgreSQL support'
+              'libwebp: WebP support')
+
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm644 ${_pkgbase}-${pkgver}/LICENSE.TXT -t "${pkgdir}"/usr/share/licenses/$_pkgbase/
+  # Move python stuff
+  mkdir {bin,lib}
+  mv "${pkgdir}"/usr/bin/*py bin
+  mv "${pkgdir}"/usr/lib/python* lib
 }
 
 package_python-gdal-hdf4 () {
-  pkgdesc="Python bindings for GDAL, with support to HDF4 format"
-  provides=("python-gdal")
-  conflicts=("python-gdal")
-  depends=("gdal-hdf4=$pkgver" 'python-numpy')
-  optdepends=()
-
-  cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-#   install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
+  pkgdesc="Python bindings for GDAL"
+  depends=("gdal=$pkgver" 'python-numpy')
 
+  install -d "${pkgdir}"/usr/{bin,lib}
+  mv bin/* "${pkgdir}"/usr/bin
+  mv lib/* "${pkgdir}"/usr/lib
   install -dm755 "${pkgdir}"/usr/share/licenses
-  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
+  ln -s $pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
+  # byte-compile python modules since the CMake build does not do it.
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  python -m compileall -o 0 -o 1 -o 2 --hardlink-dupes -s "${pkgdir}" "${pkgdir}"${site_packages}
 }
diff --git a/gdal-hdf4.changelog b/gdal-hdf4.changelog
index e69de29bb2d1..61fe9027ab5a 100644
--- a/gdal-hdf4.changelog
+++ b/gdal-hdf4.changelog
@@ -0,0 +1,132 @@
+2021-07-22 Bruno Pagani <archange@archlinux.org>
+	* gdal 3.3.1-1
+	* update url
+	* netcdf 4.8.0 rebuild
+	* hdf5 1.12.1 rebuild
+    
+2021-06-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 3.3.0-1
+
+2021-05-08 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 3.2.3-1
+
+2020-01-30 Evangelos Foutras <evangelos@foutrelis.com>
+	* gdal 3.0.4-1
+
+2020-01-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 3.0.3-1
+
+2019-11-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 3.0.2-1
+
+2019-06-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 3.0.0-1
+
+2019-02-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.4.0-1
+
+2018-09-30 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.3.2-1
+
+2018-07-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.3.1-1
+
+2018-05-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.3.0-1
+
+2018-04-09 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.2.4-1
+
+2017-11-26 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.2.3-1
+
+2017-10-21 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.2.2-1
+
+2017-08-06 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.2.1-1
+
+2017-07-10 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.2.0-1
+	* hdf5 1.10.1 rebuild
+
+2017-01-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.1.2-1
+
+2016-08-02 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.1.1-1 glew 2.0.0 / poppler 0.46.0 rebuilds rebuild
+
+2016-06-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.1.0-2 cfitsio 3.390 rebuild
+
+2016-05-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.1.0-1
+
+2016-04-12 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.0.2-5
+	* hdf5 1.10.0 rebuild
+
+2016-02-08 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.0.2-1
+
+2016-01-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.0.0-7
+	* postgresql-libs 9.5 rebuild
+	* openjpeg2 added as dependency
+
+2015-10-06 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.0.1-2 FS#46581 fix
+
+2015-06-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 2.0.0-1
+
+2015-03-01 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.2-2 poppler 0.31.0 rebuild
+
+2015-02-23 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.2-1
+
+2015-01-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.1-6 poppler 0.30.0 rebuild
+
+2014-12-22 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.1-5 FS#43193 fix
+
+2014-12-20 Evangelos Foutras <evangelos@foutrelis.com>
+	* gdal 1.11.1-4 poppler 0.29.0 rebuild
+
+2014-11-25 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.1-3 hdf5 1.8.14 rebuild
+
+2014-10-03 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.1-1
+
+2014-07-28 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.0-4 libspatialite soname rebuild
+
+2014-05-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.0-2 giflib soname rebuild
+
+2014-04-27 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.11.0-1
+
+2013-11-11 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.10.1-1
+
+2013-09-29 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.10.0-4 FS#36328 fix
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.10.0-1
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* gdal 1.8.0-1
+
+2010-11-20 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* Update to major release 1.7.3
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* FS#19946 fixed in 1.7.2-2
+
+2010-05-05 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* Update to major release 1.7.2
diff --git a/poppler-21.10.0.patch b/poppler-21.10.0.patch
deleted file mode 100644
index 208bec000f26..000000000000
--- a/poppler-21.10.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 26 Sep 2021 22:49:52 +0200
-Subject: [PATCH] Fix build against Poppler master
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
-index 9c4c28a6572..50a8154c756 100644
---- a/gdal/frmts/pdf/pdfdataset.cpp
-+++ b/gdal/frmts/pdf/pdfdataset.cpp
-@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- #ifdef HAVE_POPPLER
-   if (bUseLib.test(PDFLIB_POPPLER))
-   {
--    GooString* poMetadata = poCatalogPoppler->readMetadata();
-+    auto poMetadata = poCatalogPoppler->readMetadata();
-     if (poMetadata)
-     {
- #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-             const char * const apszMDList[2] = { pszContent, nullptr };
-             poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
-         }
-+#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
-         delete poMetadata;
-+#endif
-     }
- 
-     /* Read Info object */