Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=976578c17a6963488efce61b3b895a2df38f83ce
commit 976578c17a6963488efce61b3b895a2df38f83ce Author: crazy <[email protected]> Date: Sun Feb 4 03:25:54 2018 +0100 gdal-2.2.3-2-x86_64 * rebuild with tc * backport patch for newer json-c diff --git a/source/apps-extra/gdal/FrugalBuild b/source/apps-extra/gdal/FrugalBuild index 37bc6a6..96f7495 100644 --- a/source/apps-extra/gdal/FrugalBuild +++ b/source/apps-extra/gdal/FrugalBuild @@ -5,17 +5,18 @@ pkgname=gdal pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="GDAL - a translator library for raster geospatial data formats" url="http://www.gdal.org/"; license="MIT licence; Copyright by Frank Warmerdam" depends=('geos>=3.6.2' 'sqlite3>=3.10.2' 'unixodbc>=2.3.4-2' 'expat>=2.1.0-5' \ - 'libjpeg>=9b-2' 'libpng>=1.6.20' 'libpq>=9.5.4' 'pcre>=1.6.20' 'libxml2>=2.9.4-3') + 'libjpeg-turbo' 'libpng>=1.6.20' 'libpq>=9.5.4' 'pcre>=1.6.20' 'libxml2>=2.9.4-3') makedepends+=('postgresql>=9.5.4') archs=('x86_64') groups=('apps-extra') up2date="Flasttar http://download.osgeo.org/gdal/CURRENT/"; -source=(http://download.osgeo.org/gdal/CURRENT/$pkgname-$pkgver.tar.xz) +source=(http://download.osgeo.org/gdal/CURRENT/$pkgname-$pkgver.tar.xz \ + gdal-2.2.3-json-c-0.13.patch) Fconfopts+=" --prefix=/usr \ --exec-prefix=/usr \ --bindir=/usr/bin \ @@ -27,6 +28,7 @@ Fconfopts+=" --prefix=/usr \ --enable-shared=yes --with-gnu-ld" Finclude python -sha1sums=('7563bf2a3506069c546d32d10b8050945154397a') +sha1sums=('7563bf2a3506069c546d32d10b8050945154397a' \ + 'cd3dc8ba534bd823d3c8f5f5b3015afc38574b29') # optimization OK diff --git a/source/apps-extra/gdal/gdal-2.2.3-json-c-0.13.patch b/source/apps-extra/gdal/gdal-2.2.3-json-c-0.13.patch new file mode 100644 index 0000000..bbee77b --- /dev/null +++ b/source/apps-extra/gdal/gdal-2.2.3-json-c-0.13.patch @@ -0,0 +1,84 @@ +Index: gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp +=================================================================== +--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41042) ++++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp (revision 41043) +@@ -28,4 +28,6 @@ + ****************************************************************************/ + ++#define JSON_C_VER_013 (13 << 8) ++ + #include "ogrgeojsonwriter.h" + #include "ogrgeojsonutils.h" +@@ -33,5 +35,9 @@ + #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> +@@ -1382,11 +1388,15 @@ + // 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))); +@@ -1418,9 +1428,9 @@ + 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) ) +- { +- if( jso->o.c_double > 0 ) ++ else if( CPLIsInf(json_object_get_double(jso)) ) ++ { ++ if( json_object_get_double(jso) > 0 ) + nSize = CPLsnprintf(szBuffer, sizeof(szBuffer), "Infinity"); + else +@@ -1430,5 +1440,9 @@ + { + 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; +@@ -1436,5 +1450,5 @@ + "%%.%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)) && +@@ -1458,5 +1472,5 @@ + "%%.%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 && +@@ -1473,5 +1487,5 @@ + "%%.%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 ) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
