- fix inconsistent declarations that result in link failures on x32

diff --git a/decl.patch b/decl.patch
new file mode 100644 (file)
index 0000000..56cc315
--- /dev/null
+++ b/decl.patch
@@ -0,0 +1,21 @@
+--- gdal-3.0.1/gcore/rasterio.cpp~     2019-06-28 12:58:14.000000000 +0200
++++ gdal-3.0.1/gcore/rasterio.cpp      2019-10-30 10:08:18.083471282 +0100
+@@ -2872,15 +2872,15 @@
+ 
+ void GDALUnrolledCopy_GByte_2_1_SSSE3( GByte* CPL_RESTRICT pDest,
+                                              const GByte* CPL_RESTRICT pSrc,
+-                                             GPtrDiff_t nIters );
++                                             GInt64 nIters );
+ 
+ void GDALUnrolledCopy_GByte_3_1_SSSE3( GByte* CPL_RESTRICT pDest,
+                                              const GByte* CPL_RESTRICT pSrc,
+-                                             GPtrDiff_t nIters );
++                                             GInt64 nIters );
+ 
+ void GDALUnrolledCopy_GByte_4_1_SSSE3( GByte* CPL_RESTRICT pDest,
+                                              const GByte* CPL_RESTRICT pSrc,
+-                                             GPtrDiff_t nIters );
++                                             GInt64 nIters );
+ #endif
+ 
+ 

diff --git a/gdal.spec b/gdal.spec
index ecf280e9bff3c16183eab1ac2df1b6a17f61f633..a2543485ab5001656508061dd68fd94c05c3f222 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -62,6 +62,7 @@ Patch3:               %{name}-rasdaman.patch
 Patch4:                %{name}-pluginsdir.patch
 Patch5:                libx32.patch
 Patch6:                poppler-0.82.patch
+Patch7:                decl.patch
 URL:           http://www.gdal.org/
 # 1.x or 2.x supported
 BuildRequires: CharLS-devel
@@ -273,6 +274,7 @@ Moduł Pythona GDAL.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p2
+%patch7 -p1
 
 # need to regenerate (old ones don't support perl 5.10)
 %{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}