From 21cf53fd11cd244b4e8b8fceb35ceeada9b8ee4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matos?= Date: Wed, 6 Jan 2021 09:26:59 +0000 Subject: [PATCH 1/3] rebuild for armadillo 10 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 7e045c8..30a1568 100644 --- a/gdal.spec +++ b/gdal.spec @@ -46,7 +46,7 @@ Name: gdal Version: 3.0.4 -Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -686,6 +686,9 @@ popd #Or as before, using ldconfig %changelog +* Wed Jan 6 09:26:27 WET 2021 José Matos - 3.0.4-3 +- rebuild for armadillo 10 + * Tue Mar 03 2020 Sandro Mani - 3.0.4-2 - Fix libtool wrappers installed for gdal utilities instead of actual binaries From 299be18f74dbf4437edf53ac42fe38fbee009da6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 15 Jan 2021 11:46:36 +0100 Subject: [PATCH 2/3] Fix build against jasper 2.0.22 --- 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 30a1568..d7ca507 100644 --- a/gdal.spec +++ b/gdal.spec @@ -71,6 +71,8 @@ Patch3: gdal_tirpcinc.patch Patch4: gdal_iso8211.patch # Fix makefiles installing libtool wrappers instead of actual executables Patch5: gdal_installapps.patch +# Fix build against 2.0.22 +Patch6: gdal_jasper.patch BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/gdal_jasper.patch b/gdal_jasper.patch new file mode 100644 index 0000000..d56c6ba --- /dev/null +++ b/gdal_jasper.patch @@ -0,0 +1,31 @@ +diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp +--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp 2020-01-28 11:17:22.000000000 +0100 ++++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp 2021-01-15 11:45:46.293701348 +0100 +@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL + + { + int iFormat; +- char *pszFormatName = nullptr; ++ const char *pszFormatName = nullptr; + + if (!Identify(poOpenInfo)) + return nullptr; +diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp +--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-01-28 11:17:22.000000000 +0100 ++++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2021-01-15 11:45:46.294701417 +0100 +@@ -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(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(VSIFWriteL(buf, 1, cnt, fileobj->fp)); From e1b3cd4abd92b133277d4c4cf84b1012b9965925 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 15 Jan 2021 19:43:50 +0100 Subject: [PATCH 3/3] Update gdal_jasper.patch --- gdal_jasper.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdal_jasper.patch b/gdal_jasper.patch index d56c6ba..deb5098 100644 --- a/gdal_jasper.patch +++ b/gdal_jasper.patch @@ -25,7 +25,7 @@ diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cp } -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) ++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) { jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); return static_cast(VSIFWriteL(buf, 1, cnt, fileobj->fp));