Update to 3.2.2
This commit is contained in:
Sandro Mani
parent
df8e45a77b
commit
d3da6379a7
|
|
@ -57,3 +57,5 @@ gdalautotest-1.7.0.tar.gz
|
|||
/gdal-3.2.0-fedora.tar.xz
|
||||
/gdal-3.2.1-fedora.tar.xz
|
||||
/gdalautotest-3.2.1.tar.gz
|
||||
/gdalautotest-3.2.2.tar.gz
|
||||
/gdal-3.2.2-fedora.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,22 +1,6 @@
|
|||
From cbf272602f382bbe9a70b85c7041eced1b6fe806 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 22 Feb 2021 18:00:56 -0500
|
||||
Subject: [PATCH 1/2] configure: Also save LDFLAGS when checking compilability.
|
||||
|
||||
There may be corresponding flags in the environment between CFLAGS and
|
||||
LDFLAGS. If CFLAGS is overwritten, then LDFLAGS should be as well, or it
|
||||
may cause compile tests to fail erroneously.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
gdal/m4/geos.m4 | 3 +++
|
||||
gdal/m4/sfcgal.m4 | 3 +++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git gdal/m4/geos.m4 gdal/m4/geos.m4
|
||||
index eb5cb19e09..dc31e7466d 100644
|
||||
--- gdal/m4/geos.m4
|
||||
+++ gdal/m4/geos.m4
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/m4/geos.m4 gdal-3.2.2-fedora-new/m4/geos.m4
|
||||
--- gdal-3.2.2-fedora/m4/geos.m4 2021-03-05 12:39:54.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/m4/geos.m4 2021-03-24 13:44:41.905428811 +0100
|
||||
@@ -129,6 +129,8 @@ AC_DEFUN([GEOS_INIT],[
|
||||
LIBS=${GEOS_LIBS}
|
||||
ax_save_CFLAGS="${CFLAGS}"
|
||||
|
|
@ -34,10 +18,9 @@ index eb5cb19e09..dc31e7466d 100644
|
|||
|
||||
fi
|
||||
|
||||
diff --git gdal/m4/sfcgal.m4 gdal/m4/sfcgal.m4
|
||||
index 4dcebb7301..993b7521d6 100644
|
||||
--- gdal/m4/sfcgal.m4
|
||||
+++ gdal/m4/sfcgal.m4
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/m4/sfcgal.m4 gdal-3.2.2-fedora-new/m4/sfcgal.m4
|
||||
--- gdal-3.2.2-fedora/m4/sfcgal.m4 2021-03-05 12:39:52.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/m4/sfcgal.m4 2021-03-24 13:44:41.905428811 +0100
|
||||
@@ -128,6 +128,8 @@ AC_DEFUN([SFCGAL_INIT],[
|
||||
LIBS=${SFCGAL_LIBS}
|
||||
ax_save_CFLAGS="${CFLAGS}"
|
||||
|
|
@ -55,6 +38,3 @@ index 4dcebb7301..993b7521d6 100644
|
|||
|
||||
fi
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,6 @@
|
|||
From b795a67c570e021ea5e092c878c02996ed67f732 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 22 Feb 2021 20:29:40 -0500
|
||||
Subject: [PATCH 2/2] configure: Ensure --with-geos/sfcgal fail if unavailable.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
gdal/m4/geos.m4 | 19 +++++++++++++++++--
|
||||
gdal/m4/sfcgal.m4 | 18 ++++++++++++++++--
|
||||
2 files changed, 33 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git gdal/m4/geos.m4 gdal/m4/geos.m4
|
||||
index dc31e7466d..1c68503974 100644
|
||||
--- gdal/m4/geos.m4
|
||||
+++ gdal/m4/geos.m4
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/m4/geos.m4 gdal-3.2.2-fedora-new/m4/geos.m4
|
||||
--- gdal-3.2.2-fedora/m4/geos.m4 2021-03-24 13:44:42.101428816 +0100
|
||||
+++ gdal-3.2.2-fedora-new/m4/geos.m4 2021-03-24 13:44:42.103428816 +0100
|
||||
@@ -59,7 +59,9 @@ AC_DEFUN([GEOS_INIT],[
|
||||
elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
|
||||
|
||||
|
|
@ -53,10 +41,9 @@ index dc31e7466d..1c68503974 100644
|
|||
fi
|
||||
])
|
||||
|
||||
diff --git gdal/m4/sfcgal.m4 gdal/m4/sfcgal.m4
|
||||
index 993b7521d6..2384f0f0dc 100644
|
||||
--- gdal/m4/sfcgal.m4
|
||||
+++ gdal/m4/sfcgal.m4
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/m4/sfcgal.m4 gdal-3.2.2-fedora-new/m4/sfcgal.m4
|
||||
--- gdal-3.2.2-fedora/m4/sfcgal.m4 2021-03-24 13:44:42.101428816 +0100
|
||||
+++ gdal-3.2.2-fedora-new/m4/sfcgal.m4 2021-03-24 13:44:42.103428816 +0100
|
||||
@@ -58,7 +58,9 @@ AC_DEFUN([SFCGAL_INIT],[
|
||||
elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
|
||||
|
||||
|
|
@ -95,6 +82,3 @@ index 993b7521d6..2384f0f0dc 100644
|
|||
+
|
||||
fi
|
||||
])
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/swig/java/java.opt gdal-3.2.1-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.2.1-fedora/swig/java/java.opt 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/swig/java/java.opt 2021-01-04 21:49:35.504249023 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/swig/java/java.opt gdal-3.2.2-fedora-new/swig/java/java.opt
|
||||
--- gdal-3.2.2-fedora/swig/java/java.opt 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/swig/java/java.opt 2021-03-24 13:44:40.268428769 +0100
|
||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
||||
JAVAC=$(JAVA_HOME)/bin/javac
|
||||
JAVA=$(JAVA_HOME)/bin/java
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2020-12-29 13:19:32.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-01-04 21:49:36.914247237 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
|
||||
--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-03-05 12:39:39.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-03-24 13:44:41.499428801 +0100
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <limits>
|
||||
#include <math.h>
|
||||
|
|
@ -9,9 +9,9 @@ diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cad
|
|||
|
||||
//------------------------------------------------------------------------------
|
||||
// CADVector
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-12-29 13:19:31.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-01-04 21:49:36.913247238 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-03-05 12:39:38.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-03-24 13:44:41.499428801 +0100
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
|
|
@ -20,9 +20,9 @@ diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg
|
|||
|
||||
#if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
|
||||
// gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/third_party/LercLib/Lerc2.h gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h
|
||||
--- gdal-3.2.1-fedora/third_party/LercLib/Lerc2.h 2020-12-29 13:20:02.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h 2021-01-04 21:49:36.914247237 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/third_party/LercLib/Lerc2.h gdal-3.2.2-fedora-new/third_party/LercLib/Lerc2.h
|
||||
--- gdal-3.2.2-fedora/third_party/LercLib/Lerc2.h 2021-03-05 12:38:57.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/third_party/LercLib/Lerc2.h 2021-03-24 13:44:41.500428801 +0100
|
||||
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
|
||||
#include <limits>
|
||||
#include <string>
|
||||
|
|
|
|||
31
gdal.spec
31
gdal.spec
|
|
@ -8,7 +8,7 @@
|
|||
#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO
|
||||
|
||||
# Tests can be of a different version
|
||||
%global testversion 3.2.1
|
||||
%global testversion 3.2.2
|
||||
%global run_tests 1
|
||||
|
||||
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
%endif
|
||||
|
||||
Name: gdal
|
||||
Version: 3.2.1
|
||||
Release: 10%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
||||
Version: 3.2.2
|
||||
Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
|
||||
Summary: GIS file format library
|
||||
License: MIT
|
||||
URL: http://www.gdal.org
|
||||
|
|
@ -77,12 +77,10 @@ Patch7: gdal_nopdf.patch
|
|||
Patch8: %{name}-gcc11.patch
|
||||
# Drop -diag-disable compile flag
|
||||
Patch9: gdal_no-diag-disable.patch
|
||||
# Increase some testing tolerances for new Proj.
|
||||
Patch10: gdalautotest-increase-tolerances.patch
|
||||
# Fix GEOS and SFCGAL checks:
|
||||
# https://github.com/OSGeo/gdal/pull/3476
|
||||
Patch11: 0001-configure-Also-save-LDFLAGS-when-checking-compilabil.patch
|
||||
Patch12: 0002-configure-Ensure-with-geos-sfcgal-fail-if-unavailabl.patch
|
||||
Patch10: 0001-configure-Also-save-LDFLAGS-when-checking-compilabil.patch
|
||||
Patch11: 0002-configure-Ensure-with-geos-sfcgal-fail-if-unavailabl.patch
|
||||
|
||||
|
||||
BuildRequires: gcc
|
||||
|
|
@ -546,10 +544,7 @@ done
|
|||
%endif
|
||||
|
||||
pushd %{name}autotest-%{testversion}
|
||||
#TODO: Nötig?
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
|
||||
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc
|
||||
|
||||
export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
|
||||
|
||||
# Enable these tests on demand
|
||||
|
|
@ -557,7 +552,7 @@ pushd %{name}autotest-%{testversion}
|
|||
#export GDAL_DOWNLOAD_TEST_DATA=1
|
||||
|
||||
# Some tests are currently skipped:
|
||||
# - FIXME: `test_fits_vector` because it's crashing.
|
||||
# - `test_fits_vector` because it's crashing.
|
||||
# - `test_http*`, `test_jp2openjpeg_45`, `*multithreaded_download*`,
|
||||
# `*multithreaded_upload*`, and `test_vsis3_no_sign_request`, which
|
||||
# try to connect externally.
|
||||
|
|
@ -570,17 +565,10 @@ pushd %{name}autotest-%{testversion}
|
|||
# - `test_osr_ct_options_area_of_interest` returns the wrong value, but
|
||||
# it's skipped on macOS by upstream for mysteriously failing as well,
|
||||
# so do the same here.
|
||||
|
||||
# FIXME: Tests hang on these arches
|
||||
%ifnarch i686 armv7hl
|
||||
%{pytest} -k 'not test_fits_vector and not test_http and not test_jp2openjpeg_45 and not multithreaded_download and not multithreaded_upload and not test_vsis3_no_sign_request and not test_eedai_GOOGLE_APPLICATION_CREDENTIALS and not test_osr_erm_1 and not test_ers_4 and not test_ers_8 and not test_ers_10 and not test_jpeg2000_8 and not test_jpeg2000_11 and not test_osr_ct_options_area_of_interest' || :
|
||||
%endif
|
||||
# - `test_ndf_1` because it hangs on i686 and armv7hl
|
||||
%{pytest} -k 'not test_fits_vector and not test_http and not test_jp2openjpeg_45 and not multithreaded_download and not multithreaded_upload and not test_vsis3_no_sign_request and not test_eedai_GOOGLE_APPLICATION_CREDENTIALS and not test_osr_erm_1 and not test_ers_4 and not test_ers_8 and not test_ers_10 and not test_jpeg2000_8 and not test_jpeg2000_11 and not test_osr_ct_options_area_of_interest and not test_ndf_1' || :
|
||||
popd
|
||||
%endif
|
||||
#%%{run_tests}
|
||||
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
|
||||
%files
|
||||
|
|
@ -695,6 +683,9 @@ popd
|
|||
#Or as before, using ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Mar 24 2021 Sandro Mani <manisandro@gmail.com> - 3.2.2-1
|
||||
- Update to 3.2.2
|
||||
|
||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.2.1-10
|
||||
- Rebuild (proj)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/apps/GNUmakefile gdal-3.2.1-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/apps/GNUmakefile 2020-12-29 13:15:46.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/apps/GNUmakefile 2021-01-04 21:49:36.444247832 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/apps/GNUmakefile gdal-3.2.2-fedora-new/apps/GNUmakefile
|
||||
--- gdal-3.2.2-fedora/apps/GNUmakefile 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/apps/GNUmakefile 2021-03-24 13:44:41.091428790 +0100
|
||||
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
|
||||
|
||||
install: default
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile 2021-01-04 21:49:35.992248405 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/frmts/iso8211/GNUmakefile gdal-3.2.2-fedora-new/frmts/iso8211/GNUmakefile
|
||||
--- gdal-3.2.2-fedora/frmts/iso8211/GNUmakefile 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/frmts/iso8211/GNUmakefile 2021-03-24 13:44:40.686428780 +0100
|
||||
@@ -23,8 +23,7 @@ dist-clean: clean
|
||||
rm -rf $(DISTDIR)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN gdal-3.2.1-fedora/configure.ac gdal-3.2.1-fedora-new/configure.ac
|
||||
--- gdal-3.2.1-fedora/configure.ac 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/configure.ac 2021-01-27 13:32:20.815040243 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/configure.ac gdal-3.2.2-fedora-new/configure.ac
|
||||
--- gdal-3.2.2-fedora/configure.ac 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/configure.ac 2021-03-24 13:44:41.701428806 +0100
|
||||
@@ -61,7 +61,7 @@ dnl warning #2304: non-explicit construc
|
||||
dnl warning #3280: declaration hides member
|
||||
dnl remark #11074: Inlining inhibited by limit max-size
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/doc/source/index.rst gdal-3.2.1-fedora-new/doc/source/index.rst
|
||||
--- gdal-3.2.1-fedora/doc/source/index.rst 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/doc/source/index.rst 2021-01-04 21:49:36.681247532 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/doc/source/index.rst gdal-3.2.2-fedora-new/doc/source/index.rst
|
||||
--- gdal-3.2.2-fedora/doc/source/index.rst 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/doc/source/index.rst 2021-03-24 13:44:41.294428795 +0100
|
||||
@@ -4,8 +4,6 @@ GDAL
|
||||
|
||||
.. include:: ./about_no_title.rst
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/doc/Makefile gdal-3.2.1-fedora-new/doc/Makefile
|
||||
--- gdal-3.2.1-fedora/doc/Makefile 2020-12-29 13:15:46.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/doc/Makefile 2021-01-04 21:49:36.218248119 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/doc/Makefile gdal-3.2.2-fedora-new/doc/Makefile
|
||||
--- gdal-3.2.2-fedora/doc/Makefile 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/doc/Makefile 2021-03-24 13:44:40.886428785 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/frmts/dods/GNUmakefile gdal-3.2.2-fedora-new/frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.2-fedora/frmts/dods/GNUmakefile 2021-03-05 12:38:35.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/frmts/dods/GNUmakefile 2021-03-24 13:44:40.477428774 +0100
|
||||
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
|
||||
|
||||
OBJ = dodsdataset2.o
|
||||
|
|
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/dods/GNUmakefile gdal-3.2.1-
|
|||
|
||||
default: $(OBJ:.o=.$(OBJ_EXT))
|
||||
|
||||
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
|
||||
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
|
||||
diff -rupN --no-dereference gdal-3.2.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
||||
--- gdal-3.2.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-03-05 12:38:36.000000000 +0100
|
||||
+++ gdal-3.2.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-03-24 13:44:40.477428774 +0100
|
||||
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
|
||||
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
|
||||
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
diff -uPNr gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/alg/warp.py gdal-3.2.1-fedora/gdalautotest-3.2.1/alg/warp.py
|
||||
--- gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/alg/warp.py 2020-12-29 07:16:07.000000000 -0500
|
||||
+++ gdal-3.2.1-fedora/gdalautotest-3.2.1/alg/warp.py 2021-02-07 04:57:31.866254137 -0500
|
||||
@@ -1628,9 +1628,9 @@
|
||||
for option in ('-wo USE_GENERAL_CASE=TRUE', ''):
|
||||
# First checksum is proj 4.8, second proj 4.9.2
|
||||
for alg_name, expected_cs in (('near', [3781, 3843]),
|
||||
- ('cubic', [3942, 4133]),
|
||||
- ('cubicspline', [3874, 4076]),
|
||||
- ('bilinear', [4019, 3991])):
|
||||
+ ('cubic', [3942, 4133, 3955]),
|
||||
+ ('cubicspline', [3874, 4076, 3885]),
|
||||
+ ('bilinear', [4019, 3991, 4021])):
|
||||
dst_ds.GetRasterBand(1).Fill(0)
|
||||
dst_ds.GetRasterBand(2).Fill(0)
|
||||
gdal.Warp(dst_ds, src_ds,
|
||||
diff -uPNr gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/gcore/transformer.py gdal-3.2.1-fedora/gdalautotest-3.2.1/gcore/transformer.py
|
||||
--- gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/gcore/transformer.py 2020-12-29 07:15:48.000000000 -0500
|
||||
+++ gdal-3.2.1-fedora/gdalautotest-3.2.1/gcore/transformer.py 2021-02-07 04:38:46.980284425 -0500
|
||||
@@ -785,11 +785,11 @@
|
||||
tr = gdal.Transformer(ds, None, ['METHOD=RPC', 'RPC_HEIGHT_SCALE=2', 'RPC_DEM=/vsimem/dem.tif', 'RPC_DEM_SRS=EPSG:32652+5773'])
|
||||
|
||||
(success, pnt) = tr.TransformPoint(0, 0.5, 0.5, 0)
|
||||
- assert success and pnt[0] == pytest.approx(125.64813723085801, abs=0.000001) and pnt[1] == pytest.approx(39.869345977927146, abs=0.000001), \
|
||||
+ assert success and pnt[0] == pytest.approx(125.64813723085801, abs=1e-4) and pnt[1] == pytest.approx(39.869345977927146, abs=1e-3), \
|
||||
'got wrong forward transform result.'
|
||||
|
||||
(success, pnt) = tr.TransformPoint(1, pnt[0], pnt[1], pnt[2])
|
||||
assert success and pnt[0] == pytest.approx(0.5, abs=0.05) and pnt[1] == pytest.approx(0.5, abs=0.05), \
|
||||
'got wrong reverse transform result.'
|
||||
|
||||
- gdal.Unlink('/vsimem/dem.tif')
|
||||
\ No newline at end of file
|
||||
+ gdal.Unlink('/vsimem/dem.tif')
|
||||
diff -uPNr gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/gdrivers/jp2openjpeg.py gdal-3.2.1-fedora/gdalautotest-3.2.1/gdrivers/jp2openjpeg.py
|
||||
--- gdal-3.2.1-fedora/gdalautotest-3.2.1.orig/gdrivers/jp2openjpeg.py 2021-02-07 04:42:44.757957113 -0500
|
||||
+++ gdal-3.2.1-fedora/gdalautotest-3.2.1/gdrivers/jp2openjpeg.py 2021-02-07 04:27:49.783685518 -0500
|
||||
@@ -597,7 +597,7 @@
|
||||
assert ds.GetRasterBand(2).GetColorInterpretation() == gdal.GCI_GreenBand
|
||||
assert ds.GetRasterBand(3).GetColorInterpretation() == gdal.GCI_BlueBand
|
||||
assert ds.GetRasterBand(4).GetColorInterpretation() == gdal.GCI_AlphaBand
|
||||
- assert ds.GetRasterBand(1).Checksum() in [11457, 11450, 11498]
|
||||
+ assert ds.GetRasterBand(1).Checksum() in [11457, 11450, 11498, 11502]
|
||||
ds = None
|
||||
gdal.Unlink('/vsimem/jp2openjpeg_22.jp2')
|
||||
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdal-3.2.1-fedora.tar.xz) = bdc0f25c0bec5f9de48ae3ba53c75e2b19da39338d35dcb714948dded4cc5df9f9b951687d8b40205a37f83fbeb20d65d3fd2bcb60e4a5000a115487a01775b2
|
||||
SHA512 (gdalautotest-3.2.1.tar.gz) = 2cfa364b596bda8e0609fd31da8802f662ef0a3da09ba3a1e9444a855d2271a0d9f2191f4352aae5919d747f355a0573509f8ee5e117aa65bc605eb10d4d2ed8
|
||||
SHA512 (gdalautotest-3.2.2.tar.gz) = 324326f590fcd508e99f4ed5396a0d61065449f44894e2844e464650097c353eaf3c14074afa862c8d0784569e29545d4050ea65ded95cd02e5bb02deed80dc4
|
||||
SHA512 (gdal-3.2.2-fedora.tar.xz) = 3c3d84c77d93ab6943497571a4e6c1bea4a0b74f897f602abcdd59dda5e0799305d8b9444425593631f2d3852722568740237890c0af72ce3b8533367e04ab00
|
||||
|
|
|
|||
Loading…
Reference in New Issue