hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gis/gdal: Updated for version 1.11.1. 

Signed-off-by: David Spencer <baildon.research@googlemail.com>
This commit is contained in:
David Spencer 2014-10-05 02:39:55 +01:00 committed by Willy Sudiarto Raharjo
parent 01c2670ff3
commit a5a1f783d8
3 changed files with 5 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
gis/gdal/gdal-json-c-012.patch
View File

@ -1,84 +0,0 @@
Index: ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp
===================================================================
--- ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp (revision 27044)
+++ ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp (revision 27267)
@@ -1079,5 +1079,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"JSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
Index: ogr/ogrsf_frmts/gme/ogrgmejson.cpp
===================================================================
--- ogr/ogrsf_frmts/gme/ogrgmejson.cpp (revision 27208)
+++ ogr/ogrsf_frmts/gme/ogrgmejson.cpp (revision 27267)
@@ -515,5 +515,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"JSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
Index: ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
===================================================================
--- ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp (revision 27044)
+++ ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp (revision 27267)
@@ -78,5 +78,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"GeoJSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
@@ -1517,5 +1517,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"GeoJSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
return NULL;
Index: ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp
===================================================================
--- ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp (revision 27044)
+++ ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp (revision 27267)
@@ -75,5 +75,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"TopoJSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
Index: ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
===================================================================
--- ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp (revision 27050)
+++ ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp (revision 27267)
@@ -79,5 +79,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"ESRIJSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
Index: ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp
===================================================================
--- ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp (revision 27044)
+++ ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp (revision 27267)
@@ -505,5 +505,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"JSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err], jstok->char_offset);
+ json_tokener_error_desc(jstok->err), jstok->char_offset);
json_tokener_free(jstok);
CPLHTTPDestroyResult(psResult);
Index: frmts/mbtiles/mbtilesdataset.cpp
===================================================================
--- frmts/mbtiles/mbtilesdataset.cpp (revision 27215)
+++ frmts/mbtiles/mbtilesdataset.cpp (revision 27267)
@@ -619,5 +619,5 @@
CPLError( CE_Failure, CPLE_AppDefined,
"JSON parsing error: %s (at offset %d)",
- json_tokener_errors[jstok->err],
+ json_tokener_error_desc(jstok->err),
jstok->char_offset);
json_tokener_free(jstok);

6
gis/gdal/gdal.SlackBuild
View File

@ -24,8 +24,8 @@
# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=gdal
VERSION=${VERSION:-1.11.0}
BUILD=${BUILD:-2}
VERSION=${VERSION:-1.11.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -113,8 +113,6 @@ fi
# Thanks to the people at Arch for this:
patch -p0 <$CWD/gdal-python-install.patch
# Another patch from Arch, supporting json-c >= 0.12 (also works with 0.11)
patch -p0 <$CWD/gdal-json-c-012.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \

6
gis/gdal/gdal.info
View File

@ -1,8 +1,8 @@
PRGNAM="gdal"
VERSION="1.11.0"
VERSION="1.11.1"
HOMEPAGE="http://www.gdal.org/"
DOWNLOAD="http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.xz"
MD5SUM="31f2c4a7230b40e5fdc3cf12a100f96b"
DOWNLOAD="http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.xz"
MD5SUM="2e126d7c6605691d38f3e71b945f5c73"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="geos proj"