SHA256
1
0
forked from pool/gdal

Accepting request 692204 from home:bruno_friedmann:branches:Application:Geo

- Update to version 2.4.1 (52 bugfix release)
  Full changelog https://trac.osgeo.org/gdal/wiki/Release/2.4.1-News
- Packaging:
  + Remove merged upstream patch
    add-support-for-poppler-0.72.0-and-0.73.0.patch
    Poppler-revision-version-management.patch
  + Add pkg-config-libpq.patch upstream issue#1412 pr#1418 wip
    use pkg-config for libpq
  + Secure libproj detection with tail -n1
  + Remove trailing space in changes

OBS-URL: https://build.opensuse.org/request/show/692204
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=88
This commit is contained in:
Dirk Stoecker 2019-04-08 14:08:57 +00:00 committed by Git OBS Bridge
parent 85a3d5155a
commit 512b36bea1
9 changed files with 245 additions and 1390 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,74 +0,0 @@
From d295d0ebc3b41092ad072790c704c772098da210 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 17 Jan 2019 22:52:36 +0100
Subject: [PATCH] PDF: add support for 0.72.0 and 0.73.0 (fixes #1207, fixes
#1208)
---
gdal/frmts/pdf/pdfdataset.cpp | 8 ++++++++
gdal/frmts/pdf/pdfobject.cpp | 5 +++++
gdal/frmts/pdf/pdfsdk_headers.h | 4 ++++
3 files changed, 17 insertions(+)
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 27c9b552431..2eff2189fad 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -3416,7 +3416,11 @@ void PDFDataset::FindLayersPoppler()
#endif
if( ocg != nullptr && ocg->getName() != nullptr )
{
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ const char* pszLayerName = (const char*)ocg->getName()->c_str();
+#else
const char* pszLayerName = (const char*)ocg->getName()->getCString();
+#endif
AddLayer(pszLayerName);
oLayerOCGMapPoppler[pszLayerName] = ocg;
}
@@ -4740,7 +4744,11 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
GooString* poMetadata = poCatalogPoppler->readMetadata();
if (poMetadata)
{
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ const char* pszContent = poMetadata->c_str();
+#else
const char* pszContent = poMetadata->getCString();
+#endif
if (pszContent != nullptr &&
STARTS_WITH(pszContent, "<?xpacket begin="))
{
diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
index cc87a8ec258..bcd093e9310 100644
--- a/gdal/frmts/pdf/pdfobject.cpp
+++ b/gdal/frmts/pdf/pdfobject.cpp
@@ -1061,8 +1061,13 @@ const CPLString& GDALPDFObjectPoppler::GetString()
#else
GooString* gooString = m_po->getString();
#endif
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
+ static_cast<int>(gooString->getLength())));
+#else
return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
static_cast<int>(gooString->getLength())));
+#endif
}
else
return (osStr = "");
diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h
index 9150b0f4102..41e48ae91d6 100644
--- a/gdal/frmts/pdf/pdfsdk_headers.h
+++ b/gdal/frmts/pdf/pdfsdk_headers.h
@@ -50,7 +50,11 @@
#pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
#endif
+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 73)
#include <goo/gtypes.h>
+#else
+typedef unsigned char Guchar;
+#endif
#include <goo/GooList.h>
/* begin of poppler xpdf includes */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27
size 8874628

View File

@ -1 +0,0 @@
794096364a50df4bc7c5b710d997b6b4 gdal-2.4.0.tar.xz

3
gdal-2.4.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad
size 8887164

1
gdal-2.4.1.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
ff98500aab063da563acade884518dfa gdal-2.4.1.tar.xz

View File

@ -1,7 +1,20 @@
-------------------------------------------------------------------
Thu Apr 4 16:11:05 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to version 2.4.1 (52 bugfix release)
Full changelog https://trac.osgeo.org/gdal/wiki/Release/2.4.1-News
- Packaging:
+ Remove merged upstream patch
add-support-for-poppler-0.72.0-and-0.73.0.patch
Poppler-revision-version-management.patch
+ Add pkg-config-libpq.patch upstream issue#1412 pr#1418 wip
use pkg-config for libpq
+ Secure libproj detection with tail -n1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 7 11:02:01 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch> Thu Mar 7 11:02:01 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Fix boo#1128276 by providing correct Obsolete - Fix boo#1128276 by providing correct Obsolete
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 23 01:35:04 UTC 2019 - John Vandenberg <jayvdb@gmail.com> Sat Feb 23 01:35:04 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
@ -26,26 +39,26 @@ Mon Dec 24 09:59:19 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
EEDAI: read-only driver for Google Earth Engine Data API EEDAI: read-only driver for Google Earth Engine Data API
IGNFHeightASCIIGrid: read-only driver to read IGN-France height correction ASCII grids IGNFHeightASCIIGrid: read-only driver to read IGN-France height correction ASCII grids
NGW: NextGIS Web read-only driver NGW: NextGIS Web read-only driver
NTv1: read-only driver for NTv1 datum shift grids NTv1: read-only driver for NTv1 datum shift grids
- New OGR drivers: - New OGR drivers:
EEDA: read-only driver for Google Earth Engine Data API EEDA: read-only driver for Google Earth Engine Data API
GeoJSONSeq: read/creation support of new-line or record-separator separated GeoJSON features (#378) GeoJSONSeq: read/creation support of new-line or record-separator separated GeoJSON features (#378)
NGW: NextGIS Web read-write driver NGW: NextGIS Web read-write driver
- Improved drivers: - Improved drivers:
BAG: add read support for variable-resolution grids, and write support for single-resolution grids BAG: add read support for variable-resolution grids, and write support for single-resolution grids
GTiff driver: add Lerc and WebP codecs GTiff driver: add Lerc and WebP codecs
PostgisRaster?: add support for out-db rasters PostgisRaster?: add support for out-db rasters
RMF RMF
MSSQLSpatial MSSQLSpatial
- RFC 72: Make GDAL Python autotest suite use pytest framework - RFC 72: Make GDAL Python autotest suite use pytest framework
- Add /vsihdfs/ virtual file system handler for Hadoop File System (via libhdfs) - Add /vsihdfs/ virtual file system handler for Hadoop File System (via libhdfs)
- Add /vsiwebhdfs/ read-write virtual file system for Web Hadoop File System REST API - Add /vsiwebhdfs/ read-write virtual file system for Web Hadoop File System REST API
- gdal_contour rewriting: speed optimizations and capability to compute polygon isosurfaces. - gdal_contour rewriting: speed optimizations and capability to compute polygon isosurfaces.
- Remove PHP and Ruby bindings. - Remove PHP and Ruby bindings.
- Continued code linting in C++, Python scripts, Shell scripts and autotest - Continued code linting in C++, Python scripts, Shell scripts and autotest
* Backward compatibility issues * Backward compatibility issues
- The value of COMPRESSION_ZSTD used for ZStd-in-TIFF compression has been changed. - The value of COMPRESSION_ZSTD used for ZStd-in-TIFF compression has been changed.
ZStd-compressed TIFF files produced by GDAL 2.3.0 will not be readable ZStd-compressed TIFF files produced by GDAL 2.3.0 will not be readable
* Full changelog: https://trac.osgeo.org/gdal/wiki/Release/2.4.0-News * Full changelog: https://trac.osgeo.org/gdal/wiki/Release/2.4.0-News
- Add md5 checksum - Add md5 checksum
- Refresh patch: - Refresh patch:
@ -61,10 +74,10 @@ Mon Dec 24 09:17:43 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
Sat Sep 29 13:11:22 UTC 2018 - Bruno Friedmann <bruno@ioda-net.ch> Sat Sep 29 13:11:22 UTC 2018 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to new bugfix 2.3.2 version - Update to new bugfix 2.3.2 version
See details https://trac.osgeo.org/gdal/wiki/Release/2.3.2-News See details https://trac.osgeo.org/gdal/wiki/Release/2.3.2-News
This adds 65 bug fixes on top of 2.3.1. This adds 65 bug fixes on top of 2.3.1.
The C and C++ API and ABI are unchanged. The C and C++ API and ABI are unchanged.
- Packaging: - Packaging:
+ spec-cleaner -m -i URL and Requires order changes + spec-cleaner -m -i URL and Requires order changes
+ Remove patch gdal-fix_ecw5_detection.patch (merged upstream) + Remove patch gdal-fix_ecw5_detection.patch (merged upstream)
+ Redone patch GDALmake.opt.in.patch with version 2.3.2 + Redone patch GDALmake.opt.in.patch with version 2.3.2
@ -95,16 +108,16 @@ Tue Jul 10 07:52:21 UTC 2018 - guillaume@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 6 11:20:45 UTC 2018 - bruno@ioda-net.ch Fri Jul 6 11:20:45 UTC 2018 - bruno@ioda-net.ch
- Upgrade to new bugfix 2.3.1 version - Upgrade to new bugfix 2.3.1 version
See details https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News See details https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News
+ Fix build with recent Poppler (0.64) (#573) + Fix build with recent Poppler (0.64) (#573)
+ PDF driver: fix build against PDFium (#612) + PDF driver: fix build against PDFium (#612)
+ Do not use json-c private API RDA and AmigoCloud? drivers(#618) + Do not use json-c private API RDA and AmigoCloud? drivers(#618)
+ fix build against MySQL 8.0 + fix build against MySQL 8.0
+ Include gdalsse_priv.h from user defined paths + Include gdalsse_priv.h from user defined paths
+ Unix: + Unix:
- update GRASS drivers to support GRASS 7.4.0 (#633) - update GRASS drivers to support GRASS 7.4.0 (#633)
- configure: use CXXFLAGS when CXX is used (#693) - configure: use CXXFLAGS when CXX is used (#693)
- Packaging : redone patches against new version - Packaging : redone patches against new version
+ gdal-perl.patch + gdal-perl.patch
@ -122,17 +135,17 @@ Fri Jun 1 10:04:15 UTC 2018 - opensuse@dstoecker.de
Mon May 14 14:03:36 UTC 2018 - bruno@ioda-net.ch Mon May 14 14:03:36 UTC 2018 - bruno@ioda-net.ch
- Upgrade to new 2.3.0 version - Upgrade to new 2.3.0 version
See details https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News See details https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News
+ Source code is now hosted on github + Source code is now hosted on github
+ RFC 70: Guessing output format from output file name extension + RFC 70: Guessing output format from output file name extension
for utilities for utilities
https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
+ RFC 68: C++11 Compilation requirement + RFC 68: C++11 Compilation requirement
https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11 https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
GDAL now requires a C++11 compatible compiler. External code GDAL now requires a C++11 compatible compiler. External code
using GDAL C++ API will also need to enable at least C++11 using GDAL C++ API will also need to enable at least C++11
compilation mode, if the compiler defaults to C++98/C++03. compilation mode, if the compiler defaults to C++98/C++03.
+ Stricter const-ness in OGRGeomFieldDefn, OGRFeatureDefn and + Stricter const-ness in OGRGeomFieldDefn, OGRFeatureDefn and
OGRFeature classes, impacting out-of-tree drivers that subclass OGRFeature classes, impacting out-of-tree drivers that subclass
them. them.
- Packaging : redone patches against new version - Packaging : redone patches against new version
@ -147,7 +160,7 @@ Mon May 7 12:40:25 UTC 2018 - guillaume.gardet@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 5 14:51:21 UTC 2018 - bruno@ioda-net.ch Thu Apr 5 14:51:21 UTC 2018 - bruno@ioda-net.ch
- Fix boo#1088014 by adding missing LICENSE in lib and main package - Fix boo#1088014 by adding missing LICENSE in lib and main package
Remove misplaced LICENSE.txt in /usr/share/gdal Remove misplaced LICENSE.txt in /usr/share/gdal
------------------------------------------------------------------- -------------------------------------------------------------------
@ -171,8 +184,8 @@ Fri Jan 12 10:24:13 UTC 2018 - dimstar@opensuse.org
Thu Nov 23 20:34:20 UTC 2017 - bruno@ioda-net.ch Thu Nov 23 20:34:20 UTC 2017 - bruno@ioda-net.ch
- Update to new upstream bugfix release 2.2.3 - Update to new upstream bugfix release 2.2.3
See details https://trac.osgeo.org/gdal/wiki/Release/2.2.3-News See details https://trac.osgeo.org/gdal/wiki/Release/2.2.3-News
- Packaging : - Packaging :
+ remove wrong /usr/bin/env python shebang + remove wrong /usr/bin/env python shebang
+ use /usr/bin/python3 for all /usr/bin/gdal*.py scripts + use /usr/bin/python3 for all /usr/bin/gdal*.py scripts
- Remove gdal-2.2.2-mariadb_102_build_fix.patch merged upstream - Remove gdal-2.2.2-mariadb_102_build_fix.patch merged upstream
@ -189,7 +202,7 @@ Wed Nov 8 13:02:10 UTC 2017 - kstreitova@suse.com
Sat Sep 23 13:30:27 UTC 2017 - bruno@ioda-net.ch Sat Sep 23 13:30:27 UTC 2017 - bruno@ioda-net.ch
- New upstream bugfix release 2.2.2 - New upstream bugfix release 2.2.2
See details https://trac.osgeo.org/gdal/wiki/Release/2.2.2-News See details https://trac.osgeo.org/gdal/wiki/Release/2.2.2-News
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 1 11:37:54 UTC 2017 - tchvatal@suse.com Tue Aug 1 11:37:54 UTC 2017 - tchvatal@suse.com
@ -207,17 +220,17 @@ Fri Jul 14 15:15:38 UTC 2017 - toddrme2178@gmail.com
Wed Jul 12 10:22:32 UTC 2017 - bruno@ioda-net.ch Wed Jul 12 10:22:32 UTC 2017 - bruno@ioda-net.ch
- New upstream bugfix release 2.2.1 - New upstream bugfix release 2.2.1
See details https://trac.osgeo.org/gdal/wiki/Release/2.2.1-News See details https://trac.osgeo.org/gdal/wiki/Release/2.2.1-News
- Packaging - Packaging
+ Remove gdal-upstream-issue#6898-changeset#38636.patch merged + Remove gdal-upstream-issue#6898-changeset#38636.patch merged
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 24 09:00:11 UTC 2017 - bruno@ioda-net.ch Wed May 24 09:00:11 UTC 2017 - bruno@ioda-net.ch
- New upstream release 2.2.0 - New upstream release 2.2.0
- https://trac.osgeo.org/gdal/wiki/Release/2.2.0-News - https://trac.osgeo.org/gdal/wiki/Release/2.2.0-News
- Packaging - Packaging
+ add patch gdal-upstream-issue#6898-changeset#38636.patch + add patch gdal-upstream-issue#6898-changeset#38636.patch
fixing non void return garbage in swig/perl. fixing non void return garbage in swig/perl.
+ redone patches against 2.2.0 + redone patches against 2.2.0
gdal-libproj.patch gdal-libproj.patch
@ -235,7 +248,7 @@ Sat Oct 29 20:31:47 UTC 2016 - bruno@ioda-net.ch
- Due to build failure on non x86 arch, and advise from upstream - Due to build failure on non x86 arch, and advise from upstream
comment out the usage of obsolete jasper. comment out the usage of obsolete jasper.
We have openjpeg2 anyway. We have openjpeg2 anyway.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 28 07:14:22 UTC 2016 - bruno@ioda-net.ch Fri Oct 28 07:14:22 UTC 2016 - bruno@ioda-net.ch
@ -264,7 +277,7 @@ Sun Sep 25 13:20:22 UTC 2016 - bruno@ioda-net.ch
- https://trac.osgeo.org/gdal/wiki/Release/2.1.1-News - https://trac.osgeo.org/gdal/wiki/Release/2.1.1-News
- Packaging changes - Packaging changes
- Remove ogr_wrap.patch included upstream - Remove ogr_wrap.patch included upstream
- Added support to liblzma - Added support to liblzma
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 10 03:11:00 UTC 2016 - Angelos Tzotsos <tzotsos@opensuse.org> Tue May 10 03:11:00 UTC 2016 - Angelos Tzotsos <tzotsos@opensuse.org>
@ -283,7 +296,7 @@ Tue May 10 03:11:00 UTC 2016 - Angelos Tzotsos <tzotsos@opensuse.org>
Tue Feb 23 14:42:10 UTC 2016 - bruno@ioda-net.ch Tue Feb 23 14:42:10 UTC 2016 - bruno@ioda-net.ch
- Upgrade to 2x series version : 2.0.2 bugfix release - Upgrade to 2x series version : 2.0.2 bugfix release
- https://trac.osgeo.org/gdal/wiki/Release/2.0.2-News - https://trac.osgeo.org/gdal/wiki/Release/2.0.2-News
- https://trac.osgeo.org/gdal/wiki/Release/2.0.1-News - https://trac.osgeo.org/gdal/wiki/Release/2.0.1-News
- https://trac.osgeo.org/gdal/wiki/Release/2.0.0-News - https://trac.osgeo.org/gdal/wiki/Release/2.0.0-News
@ -356,159 +369,159 @@ Sat May 2 18:47:37 UTC 2015 - ecsos@opensuse.org
- Upgrade to version 1.11.2 - Upgrade to version 1.11.2
* Build * Build
- configure: fix detection of OCI by changing linking order - configure: fix detection of OCI by changing linking order
to please modern GCC (#5550) to please modern GCC (#5550)
- configure: fix test to accept MariaDB 10.X as valid MySQL - configure: fix test to accept MariaDB 10.X as valid MySQL
(#5722) (#5722)
- More compiler warnings addressed (#5414) - More compiler warnings addressed (#5414)
- Windows build of PDF: fix compilation issue with - Windows build of PDF: fix compilation issue with
Visual Studio 2012 (#5744) Visual Studio 2012 (#5744)
- Windows build: Add support for MrSID 9.1 SDK (#5814) - Windows build: Add support for MrSID 9.1 SDK (#5814)
- Windows build: when building netCDF, HDF4, HDF5 as plugins, - Windows build: when building netCDF, HDF4, HDF5 as plugins,
call registration of 'sub-drivers' GMT, HDF4Image and call registration of 'sub-drivers' GMT, HDF4Image and
HDF5Image (#5802) HDF5Image (#5802)
* Port * Port
- CSV finder: Stop probing for csv/horiz_cs.csv. (#5698) - CSV finder: Stop probing for csv/horiz_cs.csv. (#5698)
- /vsicurl/: avoid reading after end-of-file and fix failure - /vsicurl/: avoid reading after end-of-file and fix failure
when reading more than 16MB in a single time (#5786) when reading more than 16MB in a single time (#5786)
- CPLHexToBinary(): faster implementation (#5812) - CPLHexToBinary(): faster implementation (#5812)
* GDAL Core and algorithms * GDAL Core and algorithms
- Make GetMaskBand?() work with GDT_UInt16 alpha bands (#5692) - Make GetMaskBand?() work with GDT_UInt16 alpha bands (#5692)
- Fix 32bit overflow in GDALRasterBand::IRasterIO() (#5713) - Fix 32bit overflow in GDALRasterBand::IRasterIO() (#5713)
- RPC transformer: take into account nodata in RPC DEM (#5680) - RPC transformer: take into account nodata in RPC DEM (#5680)
- RPC transformer: add RPC_DEM_MISSING_VALUE transformer option - RPC transformer: add RPC_DEM_MISSING_VALUE transformer option
to avoid failure when there's no DEM at the transformed point to avoid failure when there's no DEM at the transformed point
(#5730) (#5730)
- Fix GDALSuggestedWarpOutput() wrong extent in some - Fix GDALSuggestedWarpOutput() wrong extent in some
circumstances (e.g. dataset of big dimension with world circumstances (e.g. dataset of big dimension with world
coordinates) (#5693) coordinates) (#5693)
- Fix crash when calling GetTiledVirtualMem?() on non-Linux - Fix crash when calling GetTiledVirtualMem?() on non-Linux
platform (#5728) platform (#5728)
- warp: fix integer overflow when reprojecting into an area - warp: fix integer overflow when reprojecting into an area
with (part of) bounds completely outside of the source with (part of) bounds completely outside of the source
projection (#5789) projection (#5789)
- OpenCL warper: fix OpenCL code compilation with NVIDIA OpenCL - OpenCL warper: fix OpenCL code compilation with NVIDIA OpenCL
(#5772) (#5772)
* Utilities * Utilities
- gdalwarp: initialize destination dataset to no_data value - gdalwarp: initialize destination dataset to no_data value
when automatically propagating source nodata (#5675) when automatically propagating source nodata (#5675)
- gdalwarp: only apply INIT_DEST when processing the first - gdalwarp: only apply INIT_DEST when processing the first
input dataset (#5387) input dataset (#5387)
- gdaldem: avoid too large files to be produced when using - gdaldem: avoid too large files to be produced when using
-co COMPRESS=xxxx -co TILED=YES (#5678) -co COMPRESS=xxxx -co TILED=YES (#5678)
* GDAL drivers * GDAL drivers
- GRASS driver: - GRASS driver:
- fix compilation issues against GRASS 7 (#2953) - fix compilation issues against GRASS 7 (#2953)
- GIF driver: - GIF driver:
- fix crash on images without color table (#5792) - fix crash on images without color table (#5792)
- validate the size of the graphic control extension block - validate the size of the graphic control extension block
(#5793) (#5793)
- GTiff driver: - GTiff driver:
- Internal overviews: for near, average, gauss, and pixel - Internal overviews: for near, average, gauss, and pixel
interleaving, make sure to use the same code path for interleaving, make sure to use the same code path for
compressed vs uncompressed overviews (#5701) compressed vs uncompressed overviews (#5701)
- allow lossless copying of CMYK JPEG into JPEG-in-TIFF - allow lossless copying of CMYK JPEG into JPEG-in-TIFF
(#5712) (#5712)
- when overriding metadata in update mode, make sure to clear - when overriding metadata in update mode, make sure to clear
it from PAM file (#5807) it from PAM file (#5807)
- fix GTiffRasterBand::DirectIO() to work with TIFF files - fix GTiffRasterBand::DirectIO() to work with TIFF files
with multiple directories (overviews, masks) (#5831) with multiple directories (overviews, masks) (#5831)
- Internal libtiff: partial (mostly security related fixes) - Internal libtiff: partial (mostly security related fixes)
upgrade to 4.0.4beta (#5830) upgrade to 4.0.4beta (#5830)
- ISIS3 driver: - ISIS3 driver:
- fix to recognize IsisCube?.Mapping.LatitudeType? = - fix to recognize IsisCube?.Mapping.LatitudeType? =
Planetocentric (#5717) Planetocentric (#5717)
- JP2OpenJPEG driver: - JP2OpenJPEG driver:
- add compatibility with OpenJPEG 2.1 (#5579) - add compatibility with OpenJPEG 2.1 (#5579)
- JPEG driver: - JPEG driver:
- Report non-fatal libjpeg errors as CE_Warning - Report non-fatal libjpeg errors as CE_Warning
(or CE_Failure if GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE) (or CE_Failure if GDAL_ERROR_ON_LIBJPEG_WARNING = TRUE)
(#5667) (#5667)
- KMLSuperOverlay driver: - KMLSuperOverlay driver:
- remove useless and unreliable computations on floating - remove useless and unreliable computations on floating
point numbers that caused issues (truncated raster) point numbers that caused issues (truncated raster)
on 32bit (#5683) on 32bit (#5683)
- USGSDEM driver: - USGSDEM driver:
- take into account horizontal unit = ft in the UTM case - take into account horizontal unit = ft in the UTM case
(#5819) (#5819)
- VRT driver: - VRT driver:
- fix RasterIO() to be able to fill buffers larger than 2GB - fix RasterIO() to be able to fill buffers larger than 2GB
(#5700, #5734) (#5700, #5734)
* OGR core * OGR core
- ogr_core.h: only ignore -Wfloat-equal for IsInit?() and not - ogr_core.h: only ignore -Wfloat-equal for IsInit?() and not
for the rest of the file and files that inc it (#5299) for the rest of the file and files that inc it (#5299)
- OGR layer algebra: properly initialize field maps to avoid - OGR layer algebra: properly initialize field maps to avoid
Valgrind warnings in OGRLayer::Update() (#5778) Valgrind warnings in OGRLayer::Update() (#5778)
* OGR drivers * OGR drivers
- CSV driver: - CSV driver:
- fix segfault when reading allCountries.txt of geonames.org - fix segfault when reading allCountries.txt of geonames.org
(#5668) (#5668)
- FileGDB: - FileGDB:
- avoid emitting error when opening a FileGDB v9, so that - avoid emitting error when opening a FileGDB v9, so that
OpenFileGDB can be tried to open it, in the case FileGDB OpenFileGDB can be tried to open it, in the case FileGDB
is a plugin (#5674) is a plugin (#5674)
- GeoJSON driver: - GeoJSON driver:
- ESRIJson: parse correctly rings of esriGeometryPolygon - ESRIJson: parse correctly rings of esriGeometryPolygon
objects to build correct Polygon or MultiPolygon? (#5538) objects to build correct Polygon or MultiPolygon? (#5538)
- GML driver: - GML driver:
- Fix incorrect geometry cast when reading GML topogeometries - Fix incorrect geometry cast when reading GML topogeometries
(#5715) (#5715)
- Update GFS files for RUIAN (UVOH & OB) (#5770) - Update GFS files for RUIAN (UVOH & OB) (#5770)
- LIBKML driver: - LIBKML driver:
- when skipped, fix segfault on second OGRRegisterAll() call - when skipped, fix segfault on second OGRRegisterAll() call
(#5775) (#5775)
- do not delete the libkml singleton factory (linked to #5775) - do not delete the libkml singleton factory (linked to #5775)
- MapInfo? File driver: - MapInfo? File driver:
- Add GDA94 datum entries to the lookup table (#5671) - Add GDA94 datum entries to the lookup table (#5671)
- fix segfault in CreateFeature?() if passing an invalid OGR - fix segfault in CreateFeature?() if passing an invalid OGR
feature style string (#1209) feature style string (#1209)
- MSSQL driver: - MSSQL driver:
- Fix recognizing image columns as geometry columns for the - Fix recognizing image columns as geometry columns for the
select layers. (#5498) select layers. (#5498)
- Fix issue when creating non-spatial table (#5696) - Fix issue when creating non-spatial table (#5696)
- Fix to read metadata if the tables are specified in the - Fix to read metadata if the tables are specified in the
connection string (#5796) connection string (#5796)
- Fix invalid use of CSLAddString() in OGR MSSQL (#5810) - Fix invalid use of CSLAddString() in OGR MSSQL (#5810)
- Fix crash if the tablename is specified in the connection - Fix crash if the tablename is specified in the connection
string (#5826) string (#5826)
- MySQL driver: - MySQL driver:
-don't be dependant on locale when building spatial filter -don't be dependant on locale when building spatial filter
(#5720) (#5720)
- NAS driver: - NAS driver:
- make chevrons configurable by NAS_INDICATOR (#5708) - make chevrons configurable by NAS_INDICATOR (#5708)
- OCI driver: - OCI driver:
- Initialize member variable to avoid UpdateLayerExtents?() - Initialize member variable to avoid UpdateLayerExtents?()
to be called randomly on non spatial tables (#5376) to be called randomly on non spatial tables (#5376)
- fix FID (multi_load=off, OGRNullFID) - start with 1 - fix FID (multi_load=off, OGRNullFID) - start with 1
(not -1) (#5454) (not -1) (#5454)
- OpenFileGDB driver: - OpenFileGDB driver:
- fix ResetReading?() on SQL layer with ORDER BY on indexed - fix ResetReading?() on SQL layer with ORDER BY on indexed
column (#5669) column (#5669)
- add support for non spatial GDB v9 tables (#5673) - add support for non spatial GDB v9 tables (#5673)
- PG driver: - PG driver:
- fix GDAL 1.11.0 regression that prevented to retrieve more - fix GDAL 1.11.0 regression that prevented to retrieve more
than 500 features from a connection with tables= parameter than 500 features from a connection with tables= parameter
and on a SQL result layer (#5837) and on a SQL result layer (#5837)
- SQLite/Spatialite driver: - SQLite/Spatialite driver:
- remove 'T' suffix when formatting the content of a Date - remove 'T' suffix when formatting the content of a Date
field (#5672) field (#5672)
- fix segmentation fault when executing OGR2SQLITE_Register() - fix segmentation fault when executing OGR2SQLITE_Register()
when compiling against sqlite 3.8.7 (#5725) when compiling against sqlite 3.8.7 (#5725)
- make GetFIDColumn() work when run as first method call - make GetFIDColumn() work when run as first method call
(#5781) (#5781)
- VRT driver: - VRT driver:
- do not propagate ignoring of x and y cols of a - do not propagate ignoring of x and y cols of a
PointFromColumns? to the source layer (#5777) PointFromColumns? to the source layer (#5777)
- XLSX driver: - XLSX driver:
- fix column numbering when there are more than 26 columns - fix column numbering when there are more than 26 columns
(#5774) (#5774)
* SWIG Language Bindings * SWIG Language Bindings
- Python bindings: - Python bindings:
- Fix hang of Python in case of repeated call to gdal/ogr. - Fix hang of Python in case of repeated call to gdal/ogr.
UseExceptions?() and CE_Warning emitted (#5704) UseExceptions?() and CE_Warning emitted (#5704)
- fix processing error of ogr_python.i with SWIG 3 (#5795) - fix processing error of ogr_python.i with SWIG 3 (#5795)
- NUMPY driver: avoid returning CE_None in GetGeoTransform?() - NUMPY driver: avoid returning CE_None in GetGeoTransform?()
when there's no geotransform set (#5801) when there's no geotransform set (#5801)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 27 13:53:57 UTC 2015 - dimstar@opensuse.org Fri Mar 27 13:53:57 UTC 2015 - dimstar@opensuse.org
@ -529,7 +542,7 @@ Sun Mar 8 20:39:00 UTC 2015 - mpluskal@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 9 16:46:37 UTC 2015 - mpluskal@suse.com Mon Feb 9 16:46:37 UTC 2015 - mpluskal@suse.com
- Add GDALmake.opt.in.patch to fix random failures of parallel - Add GDALmake.opt.in.patch to fix random failures of parallel
builds builds
------------------------------------------------------------------- -------------------------------------------------------------------
@ -539,15 +552,15 @@ Mon Feb 9 15:15:10 UTC 2015 - mpluskal@suse.com
- Correct license and bundle license with packages. - Correct license and bundle license with packages.
- Misc spec file cleanups. - Misc spec file cleanups.
- Build with webp support if possible. - Build with webp support if possible.
- Use autoreconf when possible to avoid issues with improper - Use autoreconf when possible to avoid issues with improper
cflags used and parallel builds. cflags used and parallel builds.
- Rename package to match upstream name (gdal) - library is - Rename package to match upstream name (gdal) - library is
provided as libgdal1 which matches shared libraries policy. provided as libgdal1 which matches shared libraries policy.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 16 10:23:44 UTC 2014 - guillaume@opensuse.org Tue Dec 16 10:23:44 UTC 2014 - guillaume@opensuse.org
- Add optional support to ECW JPEG lib support (disabled by default) - Add optional support to ECW JPEG lib support (disabled by default)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 11 08:35:27 UTC 2014 - behrisch@users.sourceforge.net Sat Oct 11 08:35:27 UTC 2014 - behrisch@users.sourceforge.net
@ -561,50 +574,50 @@ Thu Oct 2 10:06:59 UTC 2014 - ecsos@schirra.net
Upgrade to version 1.11.1 Upgrade to version 1.11.1
- Build - Build
* Fix compilation errors with json-c 0.12 (#5449) * Fix compilation errors with json-c 0.12 (#5449)
* configure: fix for cpl_recode_iconv.cpp compilation error * configure: fix for cpl_recode_iconv.cpp compilation error
on freebsd 10 (#5452) on freebsd 10 (#5452)
* Fix compilation error in alg/gdalgrid.cpp when AVX is available, * Fix compilation error in alg/gdalgrid.cpp when AVX is available,
but not SSE (#5566) but not SSE (#5566)
* Fix wrong include order in ingr and nitf subdirs w.r.t internal * Fix wrong include order in ingr and nitf subdirs w.r.t internal
libtiff (#5644) libtiff (#5644)
* Add CPL_UNUSED for gcc >= 4 (#5414) * Add CPL_UNUSED for gcc >= 4 (#5414)
- Port - Port
* CPLSpawn() on Windows: quote arguments with spaces * CPLSpawn() on Windows: quote arguments with spaces
in them (#5469) in them (#5469)
* /vsigzip/: avoid infinite loop when reading broken * /vsigzip/: avoid infinite loop when reading broken
.gml.gz file (#5486) .gml.gz file (#5486)
* /vsizip/: fix bug that caused premature end of file condition * /vsizip/: fix bug that caused premature end of file condition
with some read patterns (#5530) with some read patterns (#5530)
* /vsizip/: on >4GB zips: accept .zip declare 0 disks (#5615) * /vsizip/: on >4GB zips: accept .zip declare 0 disks (#5615)
* Fix stack corruption upon thread termination with * Fix stack corruption upon thread termination with
CPLSetThreadLocalConfigOption on Windows 32 bit (#5590, CPLSetThreadLocalConfigOption on Windows 32 bit (#5590,
reported by cleo) reported by cleo)
* cpl_http.cpp: truly set CURLOPT_NOSIGNAL if available (#5568) * cpl_http.cpp: truly set CURLOPT_NOSIGNAL if available (#5568)
- GDAL Core - GDAL Core
* EXIF reader: add missing validation for some data types (#3078) * EXIF reader: add missing validation for some data types (#3078)
* Fix segfault in GDALPamRasterBand::SerializeToXML() when * Fix segfault in GDALPamRasterBand::SerializeToXML() when
saving an empty RAT (#5451) saving an empty RAT (#5451)
* Windows plugin: complementary fix to #5211 to avoid error * Windows plugin: complementary fix to #5211 to avoid error
dialog box when there are dependency problems (#5525) dialog box when there are dependency problems (#5525)
* RPC transformer with DEM: fix near interpolation * RPC transformer with DEM: fix near interpolation
(patch by liminlu0314, #5553) (patch by liminlu0314, #5553)
* OpenCL warper: remove unused variable in bilinear resampling * OpenCL warper: remove unused variable in bilinear resampling
that can cause compilation error (#5518) that can cause compilation error (#5518)
* GDALCreateTPSTransformer(): fix crash if the forward or backward * GDALCreateTPSTransformer(): fix crash if the forward or backward
transform cannot be computed (#5588) transform cannot be computed (#5588)
* Overview: ignore alpha=0 values when compute an average overview * Overview: ignore alpha=0 values when compute an average overview
of an alpha band; and also avoid memory errors when calling of an alpha band; and also avoid memory errors when calling
GetMaskBand?()/GetMaskFlags() after overview computation if GetMaskBand?()/GetMaskFlags() after overview computation if
GetMaskXXX() has been called before (#5640) GetMaskXXX() has been called before (#5640)
- Utilities - Utilities
* gdal2tiles.py: fix inverted long/lat in BoundingBox? and * gdal2tiles.py: fix inverted long/lat in BoundingBox? and
Origin elements of tilemapresource.xml (#5336) Origin elements of tilemapresource.xml (#5336)
* pct2rgb.py: make it work (again) with color tables with * pct2rgb.py: make it work (again) with color tables with
less than 256 entries (#5555) less than 256 entries (#5555)
Previous upgrades from version 1.11.0 Previous upgrades from version 1.11.0
- New GDAL drivers: - New GDAL drivers:
* KRO: read/write support for KRO KOKOR Raw format * KRO: read/write support for KRO KOKOR Raw format
- New OGR drivers: - New OGR drivers:
* CartoDB : read/write support * CartoDB : read/write support
* GME (Google Map Engine) : read/write support * GME (Google Map Engine) : read/write support
@ -612,21 +625,21 @@ Previous upgrades from version 1.11.0
* OpenFileGDB: read-only support (no external dependency) * OpenFileGDB: read-only support (no external dependency)
* SXF: read-only support * SXF: read-only support
* WALK : read-only support * WALK : read-only support
* WAsP .map : read-write support * WAsP .map : read-write support
- Significantly improved drivers: GML, LIBKML - Significantly improved drivers: GML, LIBKML
- RFC 40: enhanced RAT support (#5129) - RFC 40: enhanced RAT support (#5129)
- RFC 41: multiple geometry fields support - RFC 41: multiple geometry fields support
- RFC 42: OGR Layer laundered field lookup - RFC 42: OGR Layer laundered field lookup
- RFC 43: add GDALMajorObject::GetMetadataDomainList?() (#5275) - RFC 43: add GDALMajorObject::GetMetadataDomainList?() (#5275)
- RFC 45: GDAL datasets and raster bands as virtual memory mapping - RFC 45: GDAL datasets and raster bands as virtual memory mapping
- Upgrade to EPSG 8.2 database - Upgrade to EPSG 8.2 database
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 3 17:24:58 UTC 2013 - Angelos Tzotsos <tzotsos@opensuse.org> Thu Oct 3 17:24:58 UTC 2013 - Angelos Tzotsos <tzotsos@opensuse.org>
Upgrade to version 1.10.1: Upgrade to version 1.10.1:
- Compilation fixes for iOS (#5197, #5198) - Compilation fixes for iOS (#5197, #5198)
- Fix VSISubFileHandle::Eof() behaviour to be POSIX compliant, so that the shapefile reader can read the last feature when using /vsitar (#5093) - Fix VSISubFileHandle::Eof() behaviour to be POSIX compliant, so that the shapefile reader can read the last feature when using /vsitar (#5093)
- vsicache: fix for 32bit binaries when file size is over 2GB (#5170) - vsicache: fix for 32bit binaries when file size is over 2GB (#5170)
- warper: Fix warping when input pixel size is too close to 0 (#5190) - warper: Fix warping when input pixel size is too close to 0 (#5190)
- GDALFillNodata(): Fix use of uninitialized memory and integer overflows (#4010, #5203) - GDALFillNodata(): Fix use of uninitialized memory and integer overflows (#4010, #5203)
@ -635,7 +648,7 @@ Upgrade to version 1.10.1:
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 3 17:14:40 UTC 2013 - dvaleev@suse.com Mon Jun 3 17:14:40 UTC 2013 - dvaleev@suse.com
- install man to the %{_mandir} - install man to the %{_mandir}
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 25 19:39:26 UTC 2013 - behrisch@users.sourceforge.net Sat May 25 19:39:26 UTC 2013 - behrisch@users.sourceforge.net
@ -719,7 +732,7 @@ Sun Oct 14 20:00:15 UTC 2012 - schwab@linux-m68k.org
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 12 16:52:14 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org> Fri Oct 12 16:52:14 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>
- Update to new release 1.9.2: - Update to new release 1.9.2:
Fix infinite GDALOpen recursion with some VRTs (#4835) Fix infinite GDALOpen recursion with some VRTs (#4835)
Avoid destroying existing overviews (.aux/.rrd) (#4831) Avoid destroying existing overviews (.aux/.rrd) (#4831)
Support recognising NaN better in !CPLStrtod() (#4799) Support recognising NaN better in !CPLStrtod() (#4799)
@ -729,7 +742,7 @@ Fri Oct 12 16:52:14 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>
Improve warning handling in !CPLClearRecodeStubWarningFlags() (#4650) Improve warning handling in !CPLClearRecodeStubWarningFlags() (#4650)
Fix Solaris compilation bug (#4705) Fix Solaris compilation bug (#4705)
!MorphFromESRI(): compare SPHEROID/PRIMEM parms, not names (#4673) !MorphFromESRI(): compare SPHEROID/PRIMEM parms, not names (#4673)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 27 18:14:55 UTC 2012 - behrisch@users.sourceforge.net Thu Sep 27 18:14:55 UTC 2012 - behrisch@users.sourceforge.net
@ -754,7 +767,7 @@ Fri Sep 14 18:30:43 UTC 2012 - behrisch@users.sourceforge.net
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 29 00:05:57 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org> Fri Jun 29 00:05:57 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>
- added new parameters to avoid issue: - added new parameters to avoid issue:
https://bugs.archlinux.org/task/30471 https://bugs.archlinux.org/task/30471
http://www.mail-archive.com/ubuntu@lists.osgeo.org/msg00330.html http://www.mail-archive.com/ubuntu@lists.osgeo.org/msg00330.html
@ -779,16 +792,16 @@ Thu May 31 11:37:12 CEST 2012 - kukuk@suse.de
Wed May 23 07:32:21 UTC 2012 - tzotsos@opensuse.org Wed May 23 07:32:21 UTC 2012 - tzotsos@opensuse.org
- Update to new release 1.9.1 - Update to new release 1.9.1
*fix crash with VSICachedFile::Read() for large reads (#4646) *fix crash with VSICachedFile::Read() for large reads (#4646)
*Unix VSI*L: correctly set current offset after a failed read (#4583) *Unix VSI*L: correctly set current offset after a failed read (#4583)
*Improve OpenJDK finding logic in configure. (#4643) *Improve OpenJDK finding logic in configure. (#4643)
*Fix iconv configure problem on FreeBSD (#4525) *Fix iconv configure problem on FreeBSD (#4525)
*Fix MinGW build when pthread is also available (#4430) *Fix MinGW build when pthread is also available (#4430)
*makegdalXX.vcproj : update 71,80 and 90 version. Drop 10 version --> open the 90 version and VS2010 should convert it (#4415) *makegdalXX.vcproj : update 71,80 and 90 version. Drop 10 version --> open the 90 version and VS2010 should convert it (#4415)
*reverseWindingOrder(): don't force coordinate dimension to 3 (#4621) *reverseWindingOrder(): don't force coordinate dimension to 3 (#4621)
*Fix incorrect rounding in OGRFormatDouble (#4614) *Fix incorrect rounding in OGRFormatDouble (#4614)
*Fix segfault when running 'ogr2ogr target src -select AFIELD -where FID=xxx' when the source layer has more than 5 fields (#4500) *Fix segfault when running 'ogr2ogr target src -select AFIELD -where FID=xxx' when the source layer has more than 5 fields (#4500)
- gdal-sqlite.patch moved upstream http://trac.osgeo.org/gdal/ticket/4515 - gdal-sqlite.patch moved upstream http://trac.osgeo.org/gdal/ticket/4515
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 12 19:28:16 UTC 2012 - behrisch@users.sourceforge.net Sat May 12 19:28:16 UTC 2012 - behrisch@users.sourceforge.net
@ -809,7 +822,7 @@ Wed Feb 15 07:48:41 UTC 2012 - dassau@gbd-consult.de
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 10 08:22:22 UTC 2012 - dassau@gbd-consult.de Tue Jan 10 08:22:22 UTC 2012 - dassau@gbd-consult.de
- Update to new release 1.9.0 - Update to new release 1.9.0
* New GDAL drivers: ACE2, CTG, E00GRID, ECRGTOC, GRASSASCIIGrid, * New GDAL drivers: ACE2, CTG, E00GRID, ECRGTOC, GRASSASCIIGrid,
GTA, NGSGEOID, SNODAS, WebP, ZMap GTA, NGSGEOID, SNODAS, WebP, ZMap
* New OGR drivers: ARCGEN, CouchDB, DWG, EDIGEO, ESRI FileGDB, Geomedia, * New OGR drivers: ARCGEN, CouchDB, DWG, EDIGEO, ESRI FileGDB, Geomedia,
@ -819,7 +832,7 @@ Tue Jan 10 08:22:22 UTC 2012 - dassau@gbd-consult.de
* RFC 35: Delete, reorder and alter field definitions of OGR layers * RFC 35: Delete, reorder and alter field definitions of OGR layers
* RFC 37: Add mechanism to provide user data to CPLErrorHandler (#4295) * RFC 37: Add mechanism to provide user data to CPLErrorHandler (#4295)
* gdalsrsinfo: new supported utility to report SRS in various form * gdalsrsinfo: new supported utility to report SRS in various form
(supercedes testepsg) (supercedes testepsg)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 21 20:19:34 UTC 2011 - dassau@gbd-consult.de Thu Jul 21 20:19:34 UTC 2011 - dassau@gbd-consult.de
@ -833,7 +846,7 @@ Wed Apr 27 10:59:34 UTC 2011 - dassau@gbd-consult.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 24 12:59:34 UTC 2011 - toddrme2178@gmail.com Sun Apr 24 12:59:34 UTC 2011 - toddrme2178@gmail.com
- Switched to valid groups (fix for RPMLINT warning) - Switched to valid groups (fix for RPMLINT warning)
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -26,7 +26,7 @@
%bcond_with ecw5_support %bcond_with ecw5_support
%bcond_with fgdb_support %bcond_with fgdb_support
Name: gdal Name: gdal
Version: 2.4.0 Version: 2.4.1
Release: 0 Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: MIT AND BSD-3-Clause AND SUSE-Public-Domain License: MIT AND BSD-3-Clause AND SUSE-Public-Domain
@ -37,10 +37,8 @@ Source1: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ver
Patch0: gdal-perl.patch Patch0: gdal-perl.patch
# Fix occasional parallel build failure # Fix occasional parallel build failure
Patch1: GDALmake.opt.in.patch Patch1: GDALmake.opt.in.patch
# PATCH-FIX-UPSTREAM -- https://github.com/OSGeo/gdal/commit/d9ff536713c1bcaff00657f5fb9a94f36b92c0d8 # Fix UPSTREAM Patch (pr#1418 in progress) upstream issue #1412
Patch2: Poppler-revision-version-management.patch Patch2: pkg-config-libpq.patch
# PATCH-FIX-UPSTREAM -- https://github.com/OSGeo/gdal/commit/d295d0ebc3b41092ad072790c704c772098da210
Patch3: add-support-for-poppler-0.72.0-and-0.73.0.patch
BuildRequires: KEALib-devel BuildRequires: KEALib-devel
BuildRequires: blas-devel BuildRequires: blas-devel
BuildRequires: chrpath BuildRequires: chrpath
@ -60,7 +58,6 @@ BuildRequires: mysql-devel
BuildRequires: opencl-headers BuildRequires: opencl-headers
BuildRequires: perl-macros BuildRequires: perl-macros
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
@ -73,6 +70,7 @@ BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpq)
BuildRequires: pkgconfig(libtiff-4) >= 3.6.0 BuildRequires: pkgconfig(libtiff-4) >= 3.6.0
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(netcdf) BuildRequires: pkgconfig(netcdf)
@ -179,13 +177,10 @@ The GDAL python modules provide support to handle multiple GIS file formats.
%prep %prep
%setup -q -n %{sourcename}-%{version} %setup -q -n %{sourcename}-%{version}
%patch0 -p1 %autopatch -p1
%patch1 -p1
%patch2 -p2
%patch3 -p2
# Set the right (build) libproj.so version # Set the right (build) libproj.so version, use the upper found version.
PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | awk -F '.' '{print $3}') PROJSOVER=$(ls -1 %_libdir/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}')
sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp
# Fix mandir # Fix mandir

65
pkg-config-libpq.patch Normal file
View File

@ -0,0 +1,65 @@
diff -rup a/configure.ac b/configure.ac
--- a/configure.ac 2019-03-15 13:30:02.000000000 +0100
+++ b/configure.ac 2019-04-06 21:29:50.153490589 +0200
@@ -1249,12 +1249,10 @@ PG_CONFIG=no
AC_ARG_WITH(pg,
AS_HELP_STRING([--with-pg[=ARG]],
- [Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,)
+ [Include PostgreSQL GDAL/OGR Support (ARG=yes,no)]),,)
if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then
- AC_PATH_PROG(PG_CONFIG, pg_config, no)
-else
- PG_CONFIG=$with_pg
+ PG_CONFIG=yes
fi
AC_MSG_CHECKING([for PostgreSQL])
@@ -1268,23 +1266,24 @@ if test "x$PG_CONFIG" = "xno" ; then
AC_MSG_RESULT([no])
else
- if test -d ${PG_CONFIG} ; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([--with-pg argument is a directory. It should be the path to the pg_config script, often somewhere like /usr/local/pgsql/bin/pg_config.])
- fi
-
- if test \! -x ${PG_CONFIG} ; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([--with-pg argument is a not an executable file. It should be the path to the pg_config script, often somewhere like /usr/local/pgsql/bin/pg_config.])
- fi
-
- AC_MSG_RESULT([yes])
- AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,-L`$PG_CONFIG --libdir`)
+ PKG_PROG_PKG_CONFIG([0.21])
+ PKG_CHECK_MODULES([PQ],[libpq > 9.1], [HAVE_PG=yes], [HAVE_PG=no])
if test "${HAVE_PG}" = "yes" ; then
- LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
- PG_INC=-I`$PG_CONFIG --includedir`" -I"`$PG_CONFIG --includedir-server`
+ PG_LIB="${PQ_LIBS}"
+ PG_INC="${PQ_CFLAGS}"
+ SAVED_LIBS="${LIBS}"
+ LIBS="${PG_LIBS}"
+ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no)
+ LIBS="${SAVED_LIBS}"
+ if test "${HAVE_PG}" = "yes" ; then
+ LIBS="${PG_LIB} ${LIBS}"
+ fi
+ else
+ if "x$with_pg" = "xyes"; then
+ AC_MSG_ERROR([--with-pg was requested, but libpq is not available])
+ fi
fi
fi
@@ -1293,6 +1292,7 @@ AC_SUBST(HAVE_PG,$HAVE_PG)
AC_SUBST(PG_INC,$PG_INC)
AC_SUBST(PG_LIB,$PG_LIB)
+
dnl ---------------------------------------------------------------------------
dnl Check if we should build with GRASS support.
dnl ---------------------------------------------------------------------------