[packages/gdal] - fix inconsistent declarations that result in link failures on x32
baggins
baggins at pld-linux.org
Wed Oct 30 10:12:56 CET 2019
commit 99dd8e93a716760a8cc8a49bab40ae23dd8bed8e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Oct 30 10:11:15 2019 +0100
- fix inconsistent declarations that result in link failures on x32
decl.patch | 21 +++++++++++++++++++++
gdal.spec | 2 ++
2 files changed, 23 insertions(+)
---
diff --git a/gdal.spec b/gdal.spec
index ecf280e..a254348 100644
--- 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}
diff --git a/decl.patch b/decl.patch
new file mode 100644
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
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/99dd8e93a716760a8cc8a49bab40ae23dd8bed8e
More information about the pld-cvs-commit
mailing list