pool/gdal
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 333861 from home:ecsos

Browse Source 
update to 1.11.3

OBS-URL: https://build.opensuse.org/request/show/333861
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=19
This commit is contained in:
Martin Pluskal 2015-09-26 09:38:36 +00:00 committed by Git OBS Bridge
parent a7bf7af898
commit f744c2e1b0
7 changed files with 16 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdal-1.11.2.tar.gz
View File

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

3
gdal-1.11.3.tar.gz Normal file
View File

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

14
gdal-gcc5-getaddrinfo-issue6073.patch
View File

@ -1,14 +0,0 @@
Index: apps/gdalserver.c
===================================================================
--- a/apps/gdalserver.c
+++ b/apps/gdalserver.c
@@ -28,7 +28,6 @@
****************************************************************************/
-#if defined(__STDC_VERSION__)
-#define _XOPEN_SOURCE
-#endif
+// So that __USE_XOPEN2K is defined to have getaddrinfo
+#define _XOPEN_SOURCE 600
#include "cpl_port.h"

122
gdal-poppler-0.31.patch
View File

@ -1,122 +0,0 @@
Index: frmts/pdf/pdfdataset.cpp
===================================================================
--- frmts/pdf/pdfdataset.cpp.orig
+++ frmts/pdf/pdfdataset.cpp
@@ -108,12 +108,9 @@ class GDALPDFOutputDev : public SplashOu
public:
GDALPDFOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
- GBool reverseVideoA, SplashColorPtr paperColorA,
- GBool bitmapTopDownA = gTrue,
- GBool allowAntialiasA = gTrue) :
+ GBool reverseVideoA, SplashColorPtr paperColorA) :
SplashOutputDev(colorModeA, bitmapRowPadA,
- reverseVideoA, paperColorA,
- bitmapTopDownA, allowAntialiasA),
+ reverseVideoA, paperColorA),
bEnableVector(TRUE),
bEnableText(TRUE),
bEnableBitmap(TRUE) {}
Index: frmts/pdf/pdfio.cpp
===================================================================
--- frmts/pdf/pdfio.cpp.orig
+++ frmts/pdf/pdfio.cpp
@@ -39,13 +39,25 @@
CPL_CVSID("$Id: pdfio.cpp 27044 2014-03-16 23:41:27Z rouault $");
+
+#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
+/* Poppler 0.31.0 is the first one that needs to know the file size */
+static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE* f)
+{
+ VSIFSeekL(f, 0, SEEK_END);
+ vsi_l_offset nSize = VSIFTellL(f);
+ VSIFSeekL(f, 0, SEEK_SET);
+ return nSize;
+}
+#endif
+
/************************************************************************/
/* VSIPDFFileStream() */
/************************************************************************/
VSIPDFFileStream::VSIPDFFileStream(VSILFILE* f, const char* pszFilename, Object *dictA):
#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
- BaseStream(dictA, 0)
+ BaseStream(dictA, (setPos_offset_type)VSIPDFFileStreamGetSize(f))
#else
BaseStream(dictA)
#endif
@@ -195,7 +207,7 @@ int VSIPDFFileStream::FillBuffer()
/* getChar() */
/************************************************************************/
-/* The unoptimized version performs a bit well since we must go through */
+/* The unoptimized version performs a bit less since we must go through */
/* the whole virtual I/O chain for each character reading. We save a few */
/* percent with this extra internal caching */
@@ -326,4 +338,47 @@ void VSIPDFFileStream::moveStart(moveSta
nPosInBuffer = nBufferLength = -1;
}
+/************************************************************************/
+/* hasGetChars() */
+/************************************************************************/
+
+GBool VSIPDFFileStream::hasGetChars()
+{
+ return true;
+}
+
+/************************************************************************/
+/* getChars() */
+/************************************************************************/
+
+int VSIPDFFileStream::getChars(int nChars, Guchar *buffer)
+{
+ int nRead = 0;
+ while (nRead < nChars)
+ {
+ int nToRead = nChars - nRead;
+ if (nPosInBuffer == nBufferLength)
+ {
+ if (!bLimited && nToRead > BUFFER_SIZE)
+ {
+ int nJustRead = (int) VSIFReadL(buffer + nRead, 1, nToRead, f);
+ nPosInBuffer = nBufferLength = -1;
+ nCurrentPos += nJustRead;
+ nRead += nJustRead;
+ break;
+ }
+ else if (!FillBuffer() || nPosInBuffer >= nBufferLength)
+ break;
+ }
+ if( nToRead > nBufferLength - nPosInBuffer )
+ nToRead = nBufferLength - nPosInBuffer;
+
+ memcpy( buffer + nRead, abyBuffer + nPosInBuffer, nToRead );
+ nPosInBuffer += nToRead;
+ nCurrentPos += nToRead;
+ nRead += nToRead;
+ }
+ return nRead;
+}
+
#endif
Index: frmts/pdf/pdfio.h
===================================================================
--- frmts/pdf/pdfio.h.orig
+++ frmts/pdf/pdfio.h
@@ -93,6 +93,10 @@ class VSIPDFFileStream: public BaseStrea
virtual void close();
private:
+ /* Added in poppler 0.15.0 */
+ virtual GBool hasGetChars();
+ virtual int getChars(int nChars, Guchar *buffer);
+
VSIPDFFileStream *poParent;
GooString *poFilename;
VSILFILE *f;

63
gdal-python-swig3-issue6045.patch
View File

@ -1,63 +0,0 @@
diff -rup a/swig/include/python/ogr_python.i b/swig/include/python/ogr_python.i
--- a/swig/include/python/ogr_python.i 2015-02-10 13:12:08.000000000 +0100
+++ b/swig/include/python/ogr_python.i 2015-08-28 11:51:02.955567700 +0200
@@ -66,9 +66,9 @@
def __getitem__(self, value):
"""Support dictionary, list, and slice -like access to the datasource.
-ds[0] would return the first layer on the datasource.
-ds['aname'] would return the layer named "aname".
-ds[0:4] would return a list of the first four layers."""
+ ds[0] would return the first layer on the datasource.
+ ds['aname'] would return the layer named "aname".
+ ds[0:4] would return a list of the first four layers."""
if isinstance(value, slice):
output = []
for i in xrange(value.start,value.stop,value.step):
@@ -134,8 +134,8 @@ ds[0:4] would return a list of the first
def __getitem__(self, value):
"""Support list and slice -like access to the layer.
-layer[0] would return the first feature on the layer.
-layer[0:4] would return a list of the first four features."""
+ layer[0] would return the first feature on the layer.
+ layer[0:4] would return a list of the first four features."""
if isinstance(value, slice):
import sys
output = []
@@ -400,7 +400,7 @@ layer[0:4] would return a list of the fi
def __reduce__(self):
return (self.__class__, (), self.ExportToWkb())
-
+
def __setstate__(self, state):
result = CreateGeometryFromWkb(state)
self.this = result.this
diff -rup a/swig/python/osgeo/ogr.py b/swig/python/osgeo/ogr.py
--- a/swig/python/osgeo/ogr.py 2015-02-10 13:12:08.000000000 +0100
+++ b/swig/python/osgeo/ogr.py 2015-08-28 11:54:46.775552596 +0200
@@ -815,9 +815,9 @@ class DataSource(_object):
def __getitem__(self, value):
"""Support dictionary, list, and slice -like access to the datasource.
- ] would return the first layer on the datasource.
- aname'] would return the layer named "aname".
- :4] would return a list of the first four layers."""
+ ds[0] would return the first layer on the datasource.
+ ds['aname'] would return the layer named "aname".
+ ds[0:4] would return a list of the first four layers."""
if isinstance(value, slice):
output = []
for i in xrange(value.start,value.stop,value.step):
@@ -2035,8 +2035,8 @@ class Layer(_object):
def __getitem__(self, value):
"""Support list and slice -like access to the layer.
- r[0] would return the first feature on the layer.
- r[0:4] would return a list of the first four features."""
+ layer[0] would return the first feature on the layer.
+ layer[0:4] would return a list of the first four features."""
if isinstance(value, slice):
import sys
output = []

10
gdal.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Sep 25 11:29:38 UTC 2015 - ecsos@opensuse.org
- Upgrade to version 1.11.3
see http://trac.osgeo.org/gdal/wiki/Release/1.11.3-News
- remove following patches, because their are now in source:
- gdal-poppler-0.31.patch
- gdal-python-swig3-issue6045.patch
- gdal-gcc5-getaddrinfo-issue6073.patch
-------------------------------------------------------------------
Fri Aug 28 10:26:28 UTC 2015 - bruno@ioda-net.ch

13
gdal.spec
View File

@ -18,7 +18,7 @@
%bcond_with ecw_support
Name: gdal
Version: 1.11.2
Version: 1.11.3
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
@ -32,12 +32,6 @@ Patch2: gdal-perl.patch
Patch3: GDALmake.opt.in.patch
# Fix hard coded name of libproj library
Patch4: gdal-libproj.patch
# PATCH-FIX-UPSTREAM gdal-poppler-0.31.patch dimstar@opensuse.org -- Fix build with poppler 0.31+, taken from upstream svn.
Patch5: gdal-poppler-0.31.patch
# Fix python coding in swig3+ (backport of gdal20)
Patch6: gdal-python-swig3-issue6045.patch
# Fix gcc5 build upstream issue 6073
Patch7: gdal-gcc5-getaddrinfo-issue6073.patch
BuildRequires: blas-devel
BuildRequires: chrpath
BuildRequires: curl-devel
@ -52,6 +46,7 @@ BuildRequires: libexpat-devel >= 1.95.0
BuildRequires: libgeotiff-devel >= 1.2.1
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libmysqld-devel
BuildRequires: libpng-devel
BuildRequires: libproj-devel
BuildRequires: libspatialite-devel
@ -149,9 +144,6 @@ The GDAL python3 modules provide support to handle multiple GIS file formats.
%patch2 -p1
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p1
%patch7 -p1
# Fix wrong encoding EOL
for F in frmt_twms_srtm.xml frmt_wms_bluemarble_s3_tms.xml frmt_wms_virtualearth.xml frmt_twms_Clementine.xml;
@ -203,6 +195,7 @@ autoreconf -fi
--with-poppler \
--with-python \
--with-perl \
--with-mysql \
--with-xerces=yes \
--with-xerces-lib="-lxerces-c" \
--with-xerces-inc=%{_includedir}/xercesc \