From ddfbc54eb4e37d600f6bcb5bb40cd5eed2932f4c Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 22 Jul 2020 15:15:22 +0200
Subject: [PATCH] Add gdal_jasper.patch

---
 gdal.spec         |  2 ++
 gdal_jasper.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 gdal_jasper.patch

diff --git a/gdal.spec b/gdal.spec
index 67a6f5f..d48efc2 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -74,6 +74,8 @@ Patch5:        gdal_sphinx.patch
 Patch6:        gdal_installapps.patch
 # Don't refer to PDF manual which is not built
 Patch7:        gdal_nopdf.patch
+# Adapt to jasper 2.0.17
+Patch8:        gdal_jasper.patch
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
diff --git a/gdal_jasper.patch b/gdal_jasper.patch
new file mode 100644
index 0000000..02fb603
--- /dev/null
+++ b/gdal_jasper.patch
@@ -0,0 +1,31 @@
+diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
+--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp	2020-07-07 13:46:27.000000000 +0200
++++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp	2020-07-22 12:26:50.419482813 +0200
+@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL
+ 
+ {
+     int         iFormat;
+-    char        *pszFormatName = nullptr;
++    const char        *pszFormatName = nullptr;
+ 
+     if (!Identify(poOpenInfo))
+         return nullptr;
+diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2020-07-07 13:46:27.000000000 +0200
++++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2020-07-22 13:29:02.017426423 +0200
+@@ -94,13 +94,13 @@ typedef struct {
+ * File stream object.
+ \******************************************************************************/
+ 
+-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
++static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
+ }
+ 
+-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, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));