Update to GDAL 2.2.1

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b55705efc47..0ddea14b1ec3 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,8 +36,8 @@ pkgbase = gdal-hdf4
 	provides = gdal
 	conflicts = gdal
 	options = !emptydirs
-	source = http://download.osgeo.org/gdal/2.2.1/gdal-2.2.1.tar.xz
-	sha256sums = 927098d54083ac919a497f787b835b099e9a194f2e5444dbff901f7426b86066
+	source = http://download.osgeo.org/gdal/2.1.1/gdal-2.1.1.tar.xz
+	sha256sums = 87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92
 
 pkgname = gdal-hdf4
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d0b3f01c514..82f9bb9a9ab6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,6 +48,9 @@ build() {
               --with-mysql --with-python=/usr/bin/python2 --with-curl --with-hdf4 --with-hdf5 --with-perl --with-geos \
               --with-png --with-poppler --with-spatialite --with-openjpeg
 
+# bug: http://osgeo-org.1560.x6.nabble.com/gdal-dev-jpeg2000-jasper-error-compiling-gdal-2-1-from-git-release-branch-td5299100.html
+  sed -i -e 's@uchar@unsigned char@' frmts/jpeg2000/jpeg2000_vsil_io.cpp
+
 # 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