Update GDAL version

2 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42622a07517f..aea120297671 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = gdal-hdf4
 	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.
-	pkgver = 3.0.4
-	pkgrel = 9.0
-	url = http://www.gdal.org/
+	pkgver = 3.3.1
+	pkgrel = 4.0
+	url = https://gdal.org/
 	changelog = gdal-hdf4.changelog
 	arch = x86_64
 	license = custom
@@ -10,7 +10,9 @@ pkgbase = gdal-hdf4
 	makedepends = swig
 	makedepends = chrpath
 	makedepends = doxygen
+	makedepends = python-breathe
 	makedepends = python-numpy
+	makedepends = python-sphinx
 	makedepends = boost
 	depends = curl
 	depends = geos
@@ -37,18 +39,17 @@ pkgbase = gdal-hdf4
 	provides = gdal
 	conflicts = gdal
 	options = !emptydirs
-	source = https://download.osgeo.org/gdal/3.0.4/gdal-3.0.4.tar.xz
+	source = https://download.osgeo.org/gdal/3.3.1/gdal-3.3.1.tar.xz
 	source = gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal
-	sha256sums = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+	sha256sums = 48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70
 	sha256sums = 2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed
 
 pkgname = gdal-hdf4
 
 pkgname = python-gdal-hdf4
 	pkgdesc = Python bindings for GDAL, with support to HDF4 format
-	depends = gdal-hdf4=3.0.4
+	depends = gdal-hdf4=3.3.1
 	depends = python-numpy
 	optdepends = 
 	provides = python-gdal
 	conflicts = python-gdal
-
diff --git a/PKGBUILD b/PKGBUILD
index 0b60c6d05e09..9b7410949215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,15 +9,15 @@ _pkgbase=gdal
 provides=('gdal')
 conflicts=('gdal')
 pkgname=('gdal-hdf4' 'python-gdal-hdf4')
-pkgver=3.0.4
-pkgrel=9.0
+pkgver=3.3.1
+pkgrel=4.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')
-url="http://www.gdal.org/"
+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-numpy' 'boost')
+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')
@@ -25,7 +25,7 @@ options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
         gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal)
-sha256sums=('5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277'
+sha256sums=('48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -53,7 +53,7 @@ build() {
   make man
 
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-  python3 setup.py build
+  python setup.py build
 }
 
 package_gdal-hdf4 () {
@@ -82,8 +82,8 @@ package_python-gdal-hdf4 () {
   optdepends=()
 
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-  python3 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+#   install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
 
   install -dm755 "${pkgdir}"/usr/share/licenses
   ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname