Index: head/graphics/gdal/Makefile =================================================================== --- head/graphics/gdal/Makefile (revision 506037) +++ head/graphics/gdal/Makefile (revision 506038) @@ -1,159 +1,158 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 2.4.1 -PORTREVISION= 3 +PORTVERSION= 2.4.2 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Translator library for raster geospatial data formats LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ libgif.so:graphics/giflib \ libjson-c.so:devel/json-c \ libpng.so:graphics/png \ libproj.so:graphics/proj \ libtiff.so:graphics/tiff OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \ KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \ SPATIALITE SQLITE WEBP XERCES ZSTD OPTIONS_DEFAULT=JASPER OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER OPTIONS_SUB= yes PCRE_DESC= Regular expression support for SQLite USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz CFLAGS+= -fPIC CONFIGURE_ARGS= --datadir=${DATADIR} \ --enable-static=yes \ --with-geotiff=yes \ --with-gif=yes \ --with-gnm=yes \ --with-jpeg=yes \ --with-libjson-c=yes \ --with-liblzma=yes \ --with-libtiff=yes \ --with-libz=/usr \ --with-png=yes \ --with-proj=yes \ --with-threads=yes \ --without-libtool \ ${ICONV_CONFIGURE_ARG} GNU_CONFIGURE= yes LDFLAGS+= ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile USE_CXXSTD= c++11 USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} SLAVEDIRS= graphics/p5-Geo-GDAL graphics/py-gdal HEADER_FILES= alg/gdalwarpkernel_opencl.h \ alg/gvgcpfit.h \ alg/internal_qhull_headers.h \ alg/thinplatespline.h\ gcore/gdalexif.h \ gcore/gdaljp2metadatagenerator.h \ gcore/gdalsse_priv.h \ gnm/gnm_priv.h \ port/cpl_aws.h \ port/cpl_cpu_features.h \ port/cpl_google_cloud.h \ port/cpl_sha1.h \ port/cpl_sha256.h \ port/cpl_vsil_curl_priv.h \ port/cpl_worker_thread_pool.h ARMADILLO_CONFIGURE_WITH= armadillo ARMADILLO_LIB_DEPENDS= libarmadillo.so:math/armadillo CFITSIO_CONFIGURE_WITH= cfitsio CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio CURL_CONFIGURE_OFF= --with-curl=no CURL_CONFIGURE_ON= --with-curl=${LOCALBASE}/bin/curl-config CURL_LIB_DEPENDS= libcurl.so:ftp/curl ECW_CONFIGURE_WITH= ecw ECW_LIB_DEPENDS= libNCSEcw.so:graphics/libecwj2 EXPAT_CONFIGURE_WITH= expat EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2 FREEXL_CONFIGURE_WITH= freexl FREEXL_LIB_DEPENDS= libfreexl.so:textproc/freexl GEOS_CONFIGURE_OFF= --with-geos=no GEOS_CONFIGURE_ON= --with-geos=${LOCALBASE}/bin/geos-config GEOS_LIB_DEPENDS= libgeos.so:graphics/geos GTA_CONFIGURE_WITH= gta GTA_LIB_DEPENDS= libgta.so:devel/libgta HDF5_CONFIGURE_WITH= hdf5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 JASPER_CONFIGURE_WITH= jasper JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper KML_CONFIGURE_WITH= libkml KML_LIB_DEPENDS= libkmlbase.so:science/libkml LIBXML2_CONFIGURE_OFF= --with-xml2=no LIBXML2_CONFIGURE_ON= --with-xml2=${LOCALBASE}/bin/xml2-config LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 MYSQL_CONFIGURE_OFF= --with-mysql=no MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MYSQL_USES= mysql NETCDF_CONFIGURE_WITH= netcdf NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf ODBC_CONFIGURE_WITH= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC OPENJPEG_CONFIGURE_WITH=openjpeg OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PGSQL_CONFIGURE_OFF= --with-pg=no PGSQL_CONFIGURE_ON= --with-pg=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql PODOFO_CONFIGURE_WITH= podofo PODOFO_LIB_DEPENDS= libpodofo.so:graphics/podofo POPPLER_CONFIGURE_WITH= poppler=${LOCALBASE} POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler SFCGAL_CONFIGURE_OFF= --with-sfcgal=no SFCGAL_CONFIGURE_ON= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config SFCGAL_LIB_DEPENDS= libSFCGAL.so:databases/sfcgal SPATIALITE_CONFIGURE_WITH= spatialite SPATIALITE_LIB_DEPENDS= libspatialite.so:databases/spatialite SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES= sqlite WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp XERCES_CONFIGURE_WITH= xerces XERCES_LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-patch: @${REINPLACE_CMD} -e '/^#GDAL_SLIB_SONAME/ s|^#||' ${WRKSRC}/GDALmake.opt.in @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|; s| LICENSE.TXT||' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|getCString()|c_str()|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp # Clean up bundled libraries @${RM} -r ${WRKSRC}/frmts/gif/giflib/ @${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/ @${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/ @${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/ @${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/ @${RM} -r ${WRKSRC}/frmts/png/libpng/ @${RM} -r ${WRKSRC}/frmts/zlib/ @${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/ post-install: cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/ ${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/ ${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme ${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION} .include Index: head/graphics/gdal/distinfo =================================================================== --- head/graphics/gdal/distinfo (revision 506037) +++ head/graphics/gdal/distinfo (revision 506038) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553260456 -SHA256 (gdal-2.4.1.tar.xz) = fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad -SIZE (gdal-2.4.1.tar.xz) = 8887164 +TIMESTAMP = 1562427740 +SHA256 (gdal-2.4.2.tar.xz) = dcc132e469c5eb76fa4aaff238d32e45a5d947dc5b6c801a123b70045b618e0c +SIZE (gdal-2.4.2.tar.xz) = 8885200 Index: head/graphics/gdal/files/patch-frmts-pdf-pdfio.h =================================================================== --- head/graphics/gdal/files/patch-frmts-pdf-pdfio.h (revision 506037) +++ head/graphics/gdal/files/patch-frmts-pdf-pdfio.h (nonexistent) @@ -1,16 +0,0 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/783addc36d7da7a3f0c15fd46dde117e0ec0bb87 - ---- frmts/pdf/pdfio.h.orig 2019-03-15 12:33:01 UTC -+++ frmts/pdf/pdfio.h -@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public Bas - virtual void close() override; - - private: -- /* getChars/hasGetChars added in poppler 0.15.0 -- * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16, -- * This test will be wrong for poppler 0.15 or 0.16, -- * but will still compile correctly. -- */ - virtual GBool hasGetChars() override; - virtual int getChars(int nChars, Guchar *buffer) override; - Property changes on: head/graphics/gdal/files/patch-frmts-pdf-pdfio.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp =================================================================== --- head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp (revision 506037) +++ head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp (nonexistent) @@ -1,123 +0,0 @@ -Obtained from: https://github.com/OSGeo/gdal/commit/783addc36d7da7a3f0c15fd46dde117e0ec0bb87 - ---- frmts/pdf/pdfobject.cpp.orig 2019-03-15 12:33:01 UTC -+++ frmts/pdf/pdfobject.cpp -@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler: - return oIter->second; - - #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58 -- Object o = m_poDict->lookupNF(((char*)pszKey)); -+ auto&& o(m_poDict->lookupNF(((char*)pszKey))); - if (!o.isNull()) - { - int nRefNum = 0; -@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler: - { - nRefNum = o.getRefNum(); - nRefGen = o.getRefGen(); -- Object o2 = m_poDict->lookup((char*)pszKey); -+ Object o2(m_poDict->lookup((char*)pszKey)); - if( !o2.isNull() ) - { - GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE); -@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler: - } - else - { -- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE); -+ GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE); - poObj->SetRefNumAndGen(nRefNum, nRefGen); - m_map[pszKey] = poObj; - return poObj; -@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get( - return m_v[nIndex]; - - #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58 -- Object o = m_poArray->getNF(nIndex); -+ auto&& o(m_poArray->getNF(nIndex)); - if( !o.isNull() ) - { - int nRefNum = 0; -@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get( - { - nRefNum = o.getRefNum(); - nRefGen = o.getRefGen(); -- Object o2 = m_poArray->get(nIndex); -+ Object o2(m_poArray->get(nIndex)); - if( !o2.isNull() ) - { - GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE); -@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get( - } - else - { -- GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE); -+ GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE); - poObj->SetRefNumAndGen(nRefNum, nRefGen); - m_v[nIndex] = poObj; - return poObj; -@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength() - - char* GDALPDFStreamPoppler::GetBytes() - { -- /* fillGooString() available in poppler >= 0.16.0 */ --#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS - GooString* gstr = new GooString(); - m_poStream->fillGooString(gstr); - -@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes() - char* pszContent = (char*) VSIMalloc(m_nLength + 1); - if (pszContent) - { -- memcpy(pszContent, gstr->getCString(), m_nLength); -+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72) -+ const char* srcStr = gstr->c_str(); -+#else -+ const char* srcStr = gstr->getCString(); -+#endif -+ memcpy(pszContent, srcStr, m_nLength); - pszContent[m_nLength] = '\0'; - } - delete gstr; -@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes() - delete gstr; - return nullptr; - } --#else -- int i; -- int nLengthAlloc = 0; -- char* pszContent = nullptr; -- if( m_nLength >= 0 ) -- { -- pszContent = (char*) VSIMalloc(m_nLength + 1); -- if (!pszContent) -- return nullptr; -- nLengthAlloc = m_nLength; -- } -- m_poStream->reset(); -- for(i = 0; ; ++i ) -- { -- int nVal = m_poStream->getChar(); -- if (nVal == EOF) -- break; -- if( i >= nLengthAlloc ) -- { -- nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3; -- char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1); -- if( pszContentNew == nullptr ) -- { -- CPLFree(pszContent); -- m_nLength = 0; -- return nullptr; -- } -- pszContent = pszContentNew; -- } -- pszContent[i] = (GByte)nVal; -- } -- m_nLength = i; -- pszContent[i] = '\0'; -- return pszContent; --#endif - } - - #endif // HAVE_POPPLER Property changes on: head/graphics/gdal/files/patch-frmts-pdf-pdfobject.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property