Updating gdal-ecw and fixing build issue

3 files changed, 12 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66f289e51897..4071aa28efe9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gdal-ecw
 	pkgdesc = A translator library for raster geospatial data formats, with support to ECW format. Based on gdal-hdf4 AUR package.
 	pkgver = 3.0.4
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.gdal.org/
 	changelog = gdal-ecw.changelog
 	arch = x86_64
@@ -45,7 +45,7 @@ pkgbase = gdal-ecw
 	sha256sums = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
 	sha256sums = dc8ccbc9a672a8489a1660fa66804d74c3015c47b44e2d41e17f8609249279df
 	sha256sums = 2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed
-	sha256sums = 021190817ae924f08d252be5a9c441f555a2000e61fc6fbbd5386273c2646aba
+	sha256sums = e0e07aecffea83fd8b926d7e2c460b31c028826766f68947f96bf2d2ecb3bb7b
 
 pkgname = gdal-ecw
 
diff --git a/PKGBUILD b/PKGBUILD
index 6785d7bbb26b..31d89c4116e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ provides=('gdal=3.0.4')
 conflicts=('gdal')
 pkgname=('gdal-ecw' 'python-gdal-ecw')
 pkgver=3.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A translator library for raster geospatial data formats, with support to ECW format. Based on gdal-hdf4 AUR package."
 arch=('x86_64')
 url="http://www.gdal.org/"
@@ -35,7 +35,8 @@ source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.t
 sha256sums=('5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277'
             'dc8ccbc9a672a8489a1660fa66804d74c3015c47b44e2d41e17f8609249279df'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed'
-            '021190817ae924f08d252be5a9c441f555a2000e61fc6fbbd5386273c2646aba')
+            'e0e07aecffea83fd8b926d7e2c460b31c028826766f68947f96bf2d2ecb3bb7b'
+)
 
 prepare() {
   cd "${srcdir}"/$_pkgbase-$pkgver
@@ -66,9 +67,13 @@ build() {
 #   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
 
+  echo "Compiling..."
   make -j$(nproc)
+
+  echo "Compiling man pages..."
   make man
 
+  echo "Building python3 bindings..."
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
   python3 setup.py build
 }
diff --git a/jpeg2000-issue-vendor.patch b/jpeg2000-issue-vendor.patch
index 1ab671341b45..d44f5b686aa6 100644
--- a/jpeg2000-issue-vendor.patch
+++ b/jpeg2000-issue-vendor.patch
@@ -40,9 +40,10 @@ unchanged:
  }
  
 +#ifndef PRIjas_seqent
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
+-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, int cnt)
 +#else
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
 +#endif
  {
      jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);