diff --git a/gdal-2.1.1.tar.xz b/gdal-2.1.1.tar.xz deleted file mode 100644 index d1408a1..0000000 --- a/gdal-2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92 -size 7688376 diff --git a/gdal-2.1.2.tar.xz b/gdal-2.1.2.tar.xz new file mode 100644 index 0000000..3301257 --- /dev/null +++ b/gdal-2.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374 +size 7700260 diff --git a/gdal.changes b/gdal.changes index b6ee415..1a1c331 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 28 07:14:22 UTC 2016 - bruno@ioda-net.ch + +- New upstream bugfix release 2.1.2 + - https://trac.osgeo.org/gdal/wiki/Release/2.1.2-News +- Packaging changes + - remove netcdf-gcp-fix.patch (uptream) + ------------------------------------------------------------------- Mon Oct 17 19:00:00 UTC 2016 - Angelos Tzotsos diff --git a/gdal.spec b/gdal.spec index 4cfd83d..f882990 100644 --- a/gdal.spec +++ b/gdal.spec @@ -23,7 +23,7 @@ %define sourcename gdal Name: gdal -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT and BSD-3-Clause and SUSE-Public-Domain @@ -36,7 +36,6 @@ Patch1: GDALmake.opt.in.patch # Fix hard coded name of libproj library # But libproj.so is valid if libproj-devel is installed ? Patch2: gdal-libproj.patch -Patch3: netcdf-gcp-fix.patch BuildRequires: blas-devel BuildRequires: chrpath BuildRequires: curl-devel @@ -157,7 +156,6 @@ The GDAL python modules provide support to handle multiple GIS file formats. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p2 # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure diff --git a/netcdf-gcp-fix.patch b/netcdf-gcp-fix.patch deleted file mode 100644 index 2d2627c..0000000 --- a/netcdf-gcp-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -From fa7af0b95804fac670a88f602f9cbec922b4d054 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Fri, 30 Sep 2016 11:12:06 +0000 -Subject: [PATCH] HDF5: correct number of GCPs to avoid dummy trailing - (0,0)->(0,0,0) and remove +180 offset applied to GCP longitude. Add instead a - heuristics to determine if the product is crossing the antimeridian, and a - HDF5_SHIFT_GCPX_BY_180 config option to be able to override the heuristics - (fixes #6666) - -git-svn-id: https://svn.osgeo.org/gdal/branches/2.1@35557 f0d54148-0727-0410-94bb-9a71ac55c965 ---- - gdal/frmts/hdf5/hdf5imagedataset.cpp | 33 +++++++++++++++++++++++++++++++-- - 1 file changed, 31 insertions(+), 2 deletions(-) - -diff --git a/gdal/frmts/hdf5/hdf5imagedataset.cpp b/gdal/frmts/hdf5/hdf5imagedataset.cpp -index 120a04a..e6211c1 100644 ---- a/gdal/frmts/hdf5/hdf5imagedataset.cpp -+++ b/gdal/frmts/hdf5/hdf5imagedataset.cpp -@@ -825,7 +825,7 @@ CPLErr HDF5ImageDataset::CreateProjections() - /* -------------------------------------------------------------------- */ - /* Fill the GCPs list. */ - /* -------------------------------------------------------------------- */ -- nGCPCount = nRasterYSize/nDeltaLat * nRasterXSize/nDeltaLon; -+ nGCPCount = (nRasterYSize/nDeltaLat) * (nRasterXSize/nDeltaLon); - - pasGCPList = static_cast( - CPLCalloc( nGCPCount, sizeof( GDAL_GCP ) ) ); -@@ -835,12 +835,41 @@ CPLErr HDF5ImageDataset::CreateProjections() - - const int nYLimit = (static_cast(nRasterYSize)/nDeltaLat) * nDeltaLat; - const int nXLimit = (static_cast(nRasterXSize)/nDeltaLon) * nDeltaLon; -+ -+ // The original code in https://trac.osgeo.org/gdal/changeset/8066 -+ // always add +180 to the longitudes, but without justification -+ // I suspect this might be due to handling products crossing the -+ // antimeridian. Trying to do it just when needed through a heuristics. -+ bool bHasLonNearMinus180 = false; -+ bool bHasLonNearPlus180 = false; -+ bool bHasLonNearZero = false; -+ for( int j = 0; j < nYLimit; j+=nDeltaLat ) -+ { -+ for( int i = 0; i < nXLimit; i+=nDeltaLon ) -+ { -+ const int iGCP = j * nRasterXSize + i; -+ if( Longitude[iGCP] > 170 && Longitude[iGCP] <= 180 ) -+ bHasLonNearPlus180 = true; -+ if( Longitude[iGCP] < -170 && Longitude[iGCP] >= -180 ) -+ bHasLonNearMinus180 = true; -+ if( fabs(Longitude[iGCP]) < 90 ) -+ bHasLonNearZero = true; -+ } -+ } -+ const char* pszShiftGCP = -+ CPLGetConfigOption("HDF5_SHIFT_GCPX_BY_180", NULL); -+ const bool bAdd180 = (bHasLonNearPlus180 && bHasLonNearMinus180 && -+ !bHasLonNearZero && pszShiftGCP == NULL) || -+ (pszShiftGCP != NULL && CPLTestBool(pszShiftGCP)); -+ - for( int j = 0; j < nYLimit; j+=nDeltaLat ) - { - for( int i = 0; i < nXLimit; i+=nDeltaLon ) - { - const int iGCP = j * nRasterXSize + i; -- pasGCPList[k].dfGCPX = static_cast(Longitude[iGCP])+180.0; -+ pasGCPList[k].dfGCPX = static_cast(Longitude[iGCP]); -+ if( bAdd180 ) -+ pasGCPList[k].dfGCPX += 180.0; - pasGCPList[k].dfGCPY = static_cast(Latitude[iGCP]); - - pasGCPList[k].dfGCPPixel = i + 0.5;