cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdal 2.2.4.

Browse Source 
See https://trac.osgeo.org/gdal/wiki/Release/2.2.4-News
This commit is contained in:
landry 2018-03-29 19:48:18 +00:00
parent 6da01744f0
commit ee17e1fada
4 changed files with 9 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/gdal/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.66 2018/02/11 15:15:27 landry Exp $
# $OpenBSD: Makefile,v 1.67 2018/03/29 19:48:18 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
COMMENT-perl = perl bindings for GDAL
V = 2.2.3
V = 2.2.4
DISTNAME = gdal-${V}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
gdalautotest-${V}${EXTRACT_SUFX}
REVISION = 0
FULLPKGNAME-main = ${DISTNAME}
FULLPKGPATH-main = geo/gdal,-main
@ -17,7 +16,7 @@ FULLPKGPATH-python = geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-perl = p5-Geo-GDAL-${V}
FULLPKGPATH-perl = geo/gdal,-perl
SHARED_LIBS = gdal 30.1 #23.2
SHARED_LIBS = gdal 31.0 #23.3
CATEGORIES = geo devel
HOMEPAGE = http://www.gdal.org/

8
geo/gdal/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (gdal-2.2.3.tar.gz) = UvAb2oloZDYzAWdpYH5ggqi6HHRvrcLBq+Es99yPYd0=
SHA256 (gdalautotest-2.2.3.tar.gz) = rMHsLIxRgwpBVXtsFgXwJ2ZqDip4iY+5WQ51AY9X3qY=
SIZE (gdal-2.2.3.tar.gz) = 13754766
SIZE (gdalautotest-2.2.3.tar.gz) = 6775769
SHA256 (gdal-2.2.4.tar.gz) = udWnI3h/MAaoLLJ22xccchGHsEi4ZsDiDm30ZNZxoaQ=
SHA256 (gdalautotest-2.2.4.tar.gz) = DTuxNi+GUHslXY4gALWIJLMulgKviTE13lSSYoM71qo=
SIZE (gdal-2.2.4.tar.gz) = 13774304
SIZE (gdalautotest-2.2.4.tar.gz) = 6778713

100
geo/gdal/patches/patch-ogr_ogrsf_frmts_geojson_ogrgeojsonwriter_cpp
View File

@ -1,100 +0,0 @@
$OpenBSD: patch-ogr_ogrsf_frmts_geojson_ogrgeojsonwriter_cpp,v 1.1 2018/02/11 15:15:27 landry Exp $
Fix build with json-c 0.13.
Adapted from https://github.com/OSGeo/gdal/pull/277
Index: ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
--- ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp.orig
+++ ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp
@@ -27,12 +27,18 @@
* DEALINGS IN THE SOFTWARE.
****************************************************************************/
+#define JSON_C_VER_013 (13 << 8)
+
#include "ogrgeojsonwriter.h"
#include "ogrgeojsonutils.h"
#include "ogr_geojson.h"
#include "ogrgeojsonreader.h"
#include <json.h> // JSON-C
+
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
#include <json_object_private.h>
+#endif
+
#include <printbuf.h>
#include <ogr_api.h>
#include <ogr_p.h>
@@ -1381,13 +1387,17 @@ static int OGR_json_double_with_precision_to_string( s
{
// TODO(schwehr): Explain this casting.
const int nPrecision =
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
static_cast<int>(reinterpret_cast<GUIntptr_t>(jso->_userdata));
+#else
+ static_cast<int>(reinterpret_cast<GUIntptr_t>(json_object_get_userdata(jso)));
+#endif
char szBuffer[75] = {};
- OGRFormatDouble( szBuffer, sizeof(szBuffer), jso->o.c_double, '.',
+ OGRFormatDouble( szBuffer, sizeof(szBuffer), json_object_get_double(jso), '.',
(nPrecision < 0) ? 15 : nPrecision );
if( szBuffer[0] == 't' /*oobig */ )
{
- CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", jso->o.c_double);
+ CPLsnprintf(szBuffer, sizeof(szBuffer), "%.18g", json_object_get_double(jso));
}
return printbuf_memappend(pb, szBuffer, static_cast<int>(strlen(szBuffer)));
}
@@ -1417,11 +1427,11 @@ OGR_json_double_with_significant_figures_to_string( st
{
char szBuffer[75] = {};
int nSize = 0;
- if( CPLIsNan(jso->o.c_double))
+ if( CPLIsNan(json_object_get_double(jso)))
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "NaN");
- else if( CPLIsInf(jso->o.c_double) )
+ else if( CPLIsInf(json_object_get_double(jso)) )
{
- if( jso->o.c_double > 0 )
+ if( json_object_get_double(jso) > 0 )
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity");
else
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "-Infinity");
@@ -1429,13 +1439,17 @@ OGR_json_double_with_significant_figures_to_string( st
else
{
char szFormatting[32] = {};
+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
const int nSignificantFigures = (int) (GUIntptr_t) jso->_userdata;
+#else
+ const int nSignificantFigures = (int) (GUIntptr_t) json_object_get_userdata(jso);
+#endif
const int nInitialSignificantFigures =
nSignificantFigures >= 0 ? nSignificantFigures : 17;
CPLsnprintf(szFormatting, sizeof(szFormatting),
"%%.%dg", nInitialSignificantFigures);
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
- szFormatting, jso->o.c_double);
+ szFormatting, json_object_get_double(jso));
const char* pszDot = NULL;
if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
(pszDot = strchr(szBuffer, '.')) == NULL )
@@ -1457,7 +1471,7 @@ OGR_json_double_with_significant_figures_to_string( st
CPLsnprintf(szFormatting, sizeof(szFormatting),
"%%.%dg", nInitialSignificantFigures- i);
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
- szFormatting, jso->o.c_double);
+ szFormatting, json_object_get_double(jso));
pszDot = strchr(szBuffer, '.');
if( pszDot != NULL &&
strstr(pszDot, "999999") == NULL &&
@@ -1472,7 +1486,7 @@ OGR_json_double_with_significant_figures_to_string( st
CPLsnprintf(szFormatting, sizeof(szFormatting),
"%%.%dg", nInitialSignificantFigures);
nSize = CPLsnprintf(szBuffer, sizeof(szBuffer),
- szFormatting, jso->o.c_double);
+ szFormatting, json_object_get_double(jso));
if( nSize+2 < static_cast<int>(sizeof(szBuffer)) &&
strchr(szBuffer, '.') == NULL )
{

15
geo/gdal/patches/patch-swig_python_setup_py
View File

@ -1,20 +1,9 @@
$OpenBSD: patch-swig_python_setup_py,v 1.9 2017/11/24 19:18:07 landry Exp $
https://trac.osgeo.org/gdal/changeset/40801/
$OpenBSD: patch-swig_python_setup_py,v 1.10 2018/03/29 19:48:18 landry Exp $
Index: swig/python/setup.py
--- swig/python/setup.py.orig
+++ swig/python/setup.py
@@ -7,7 +7,7 @@
# Howard Butler hobu.inc@gmail.com
-gdal_version = '2.2.2'
+gdal_version = '2.2.3'
import sys
import os
@@ -216,7 +216,7 @@ class gdal_ext(build_ext):
@@ -219,7 +219,7 @@ class gdal_ext(build_ext):
self.include_dirs.append(os.path.join(self.gdaldir,'include'))