Fix build with jasper 2.0. Release 9

diff --git a/gdal-uchar.patch b/gdal-uchar.patch
new file mode 100644 (file)
index 0000000..db56b9c
--- /dev/null
+++ b/gdal-uchar.patch
@@ -0,0 +1,12 @@
+diff -up gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp.uchar~ gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+--- gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp.uchar~       2016-12-01 09:14:51.768247534 -0700
++++ gdal-2.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp      2016-12-01 09:15:14.503375681 -0700
+@@ -209,7 +209,7 @@ static void JPEG2000_VSIL_jas_stream_ini
+                       /* The buffer must be large enough to accommodate maximum\r
+                         putback. */\r
+                       assert(bufsize > JAS_STREAM_MAXPUTBACK);\r
+-                      stream->bufbase_ = JAS_CAST(uchar *, buf);\r
++                      stream->bufbase_ = JAS_CAST(unsigned char *, buf);\r
+                       stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;\r
+               }\r
+       } else {\r

diff --git a/gdal.spec b/gdal.spec
index cdd37e6165925922b33cd61659857814dcfa6f9c..74b87a96a0c1ea0a91ce142cda00b712a590668f 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -50,7 +50,7 @@ Summary:      Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
 Version:       2.0.2
-Release:       8
+Release:       9
 License:       BSD-like
 Group:         Libraries
 Source0:       http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
@@ -66,6 +66,7 @@ Patch9:               %{name}-dds.patch
 Patch11:       %{name}-armadillo.patch
 Patch12:       %{name}-rasdaman.patch
 Patch13:       %{name}-pluginsdir.patch
+Patch14:       %{name}-uchar.patch
 URL:           http://www.gdal.org/
 %{?with_php:BuildRequires:     %{php_name}-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel >= 1.0}
@@ -293,6 +294,7 @@ osr.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # need to regenerate (old ones don't support perl 5.10 or php 5.5)
 %{__rm} swig/{perl,php}/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}