rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.1.4

This commit is contained in:
Sandro Mani 2020-11-02 12:32:58 +01:00
parent 90905d440c
commit 4b2f3f618e
11 changed files with 36 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -51,3 +51,5 @@ gdalautotest-1.7.0.tar.gz
/gdalautotest-3.1.2.tar.gz
/gdal-3.1.3-fedora.tar.xz
/gdalautotest-3.1.3.tar.gz
/gdal-3.1.4-fedora.tar.xz
/gdalautotest-3.1.4.tar.gz

6
gdal-1.9.0-java.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/swig/java/java.opt gdal-3.1.3-fedora-new/swig/java/java.opt
--- gdal-3.1.3-fedora/swig/java/java.opt 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/swig/java/java.opt 2020-10-16 21:26:30.860885421 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/swig/java/java.opt gdal-3.1.4-fedora-new/swig/java/java.opt
--- gdal-3.1.4-fedora/swig/java/java.opt 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/swig/java/java.opt 2020-11-02 11:56:48.341314610 +0100
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

7
gdal-gcc11.patch
View File

@ -1,7 +1,6 @@
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
index b500df8..4c51316 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.1.4-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-10-20 11:50:59.000000000 +0200
+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-11-02 11:56:49.997342382 +0100
@@ -38,6 +38,7 @@
#include <iostream>
#include <memory>

16
gdal.spec
View File

@ -9,7 +9,7 @@
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
# Tests can be of a different version
%global testversion 3.1.3
%global testversion 3.1.4
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -45,8 +45,8 @@
%endif
Name: gdal
Version: 3.1.3
Release: 3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Version: 3.1.4
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Summary: GIS file format library
License: MIT
URL: http://www.gdal.org
@ -74,11 +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.21
# See https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334
Patch8: gdal_jasper.patch
# Fix issues caught by gcc-11
Patch9: %{name}-gcc11.patch
Patch8: %{name}-gcc11.patch
BuildRequires: gcc
@ -694,7 +691,10 @@ popd
#Or as before, using ldconfig
%changelog
* Tue Oct 28 2020 Jeff Law <law@redhat.com> - 3.1.3-3
* Mon Nov 02 2020 Sandro Mani <manisandro@gmail.com> - 3.1.4-1
- Update to 3.1.4
* Wed Oct 28 2020 Jeff Law <law@redhat.com> - 3.1.3-3
- Fix missing #include for gcc-11
* Fri Oct 16 21:25:24 CEST 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-2

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/apps/GNUmakefile gdal-3.1.3-fedora-new/apps/GNUmakefile
--- gdal-3.1.3-fedora/apps/GNUmakefile 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/apps/GNUmakefile 2020-10-16 21:26:31.671884275 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/apps/GNUmakefile gdal-3.1.4-fedora-new/apps/GNUmakefile
--- gdal-3.1.4-fedora/apps/GNUmakefile 2020-10-20 11:47:09.000000000 +0200
+++ gdal-3.1.4-fedora-new/apps/GNUmakefile 2020-11-02 11:56:49.446333140 +0100
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default

6
gdal_iso8211.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/iso8211/GNUmakefile gdal-3.1.3-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.3-fedora/frmts/iso8211/GNUmakefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/iso8211/GNUmakefile 2020-10-16 21:26:31.274884836 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.1.4-fedora/frmts/iso8211/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/frmts/iso8211/GNUmakefile 2020-11-02 11:56:48.896323916 +0100
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

47
gdal_jasper.patch
View File

@ -1,47 +0,0 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
--- gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000dataset.cpp 2020-09-01 10:39:25.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp 2020-10-16 21:26:32.069883712 +0200
@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
for ( iBand = 0; iBand < nBands; iBand++ )
{
JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
{
CPLError(CE_Failure, CPLE_AppDefined,
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
--- gdal-3.1.3-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-09-01 10:39:25.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-10-16 21:26:32.069883712 +0200
@@ -94,22 +94,24 @@ typedef struct {
* File stream object.
\******************************************************************************/
+#if defined(PRIjas_seqent)
// PRIjas_seqent macro is defined since Jasper 2.0.17
-
-#ifndef PRIjas_seqent
-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-#else
static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
+#else
+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
#endif
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
}
-#ifndef PRIjas_seqent
-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-#else
+#if defined(JAS_INCLUDE_JP2_CODEC)
+// Jasper 2.0.21
+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
+#elif defined(PRIjas_seqent)
static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+#else
+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
#endif
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);

6
gdal_nopdf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/doc/source/index.rst gdal-3.1.3-fedora-new/doc/source/index.rst
--- gdal-3.1.3-fedora/doc/source/index.rst 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/doc/source/index.rst 2020-10-16 21:26:31.871883992 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/doc/source/index.rst gdal-3.1.4-fedora-new/doc/source/index.rst
--- gdal-3.1.4-fedora/doc/source/index.rst 2020-10-20 11:47:09.000000000 +0200
+++ gdal-3.1.4-fedora-new/doc/source/index.rst 2020-11-02 11:56:49.720337736 +0100
@@ -9,8 +9,6 @@ GDAL
.. include:: ./about_no_title.rst

6
gdal_sphinx.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/doc/Makefile gdal-3.1.3-fedora-new/doc/Makefile
--- gdal-3.1.3-fedora/doc/Makefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/doc/Makefile 2020-10-16 21:26:31.476884551 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/doc/Makefile gdal-3.1.4-fedora-new/doc/Makefile
--- gdal-3.1.4-fedora/doc/Makefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/doc/Makefile 2020-11-02 11:56:49.173328561 +0100
@@ -2,7 +2,7 @@
#

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/dods/GNUmakefile gdal-3.1.3-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.3-fedora/frmts/dods/GNUmakefile 2020-09-01 10:36:30.000000000 +0200
+++ gdal-3.1.3-fedora-new/frmts/dods/GNUmakefile 2020-10-16 21:26:31.068885127 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.1.4-fedora/frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.1.3-fedora/frmts/dods/GNUmakefile gdal-3.1.3-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.1.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.3-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-09-01 10:36:31.000000000 +0200
+++ gdal-3.1.3-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-16 21:26:31.068885127 +0200
diff -rupN --no-dereference gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.1.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-20 11:47:08.000000000 +0200
+++ gdal-3.1.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-02 11:56:48.643319674 +0100
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.1.3-fedora.tar.xz) = dcf576439bd07f0cb51bed4f8a61650cc91d03ec47cdbe091ac9a2713cc6fac3e45a66b4ed6b5e636fc0988de49eb87e466a3654c34d498552c8923377dc7f39
SHA512 (gdalautotest-3.1.3.tar.gz) = 7e259c72cf0c7eec275e0562d1823277ec2272d4d4552995aee38c310faa3514c532579f076c3097150ab8268b2865d75ec8ee7aca32f1ced3efe78147ac4943
SHA512 (gdal-3.1.4-fedora.tar.xz) = 191e52c9d01a349a2036fb82f10aad8f2945b1bc0c10e04d568d10644e0b64e503efc38c38f73ab9a80d0ece39ae625b64531eededb91af7b7ea95ad3dcc4105
SHA512 (gdalautotest-3.1.4.tar.gz) = 656215632d37fd9dba377ef28d44dce47bcda6cd3ce8eeddf48c22d810f906e805664b2980d04f07ae4653fc3b385a7ee321e0fe7d69f9c2d83d2b271367161c