diff options
Diffstat (limited to 'graphics/gdal')
| -rw-r--r-- | graphics/gdal/Makefile | 47 | ||||
| -rw-r--r-- | graphics/gdal/distinfo | 6 | ||||
| -rw-r--r-- | graphics/gdal/files/patch-libertiff | 11 | ||||
| -rw-r--r-- | graphics/gdal/files/patch-mysql | 6 | ||||
| -rw-r--r-- | graphics/gdal/files/patch-ogr_ogrsf__frmts_xodr_ogr__xodr.h | 11 | ||||
| -rw-r--r-- | graphics/gdal/pkg-plist | 87 |
6 files changed, 145 insertions, 23 deletions
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index c052c8d6b747..62c09c9b8a78 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -1,6 +1,6 @@ PORTNAME= gdal -PORTVERSION= 3.10.3 -PORTREVISION= 1 +PORTVERSION= 3.11.3 +PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet @@ -13,7 +13,9 @@ WWW= https://gdal.org/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BUILD_DEPENDS= libgeotiff>=1.5.0:graphics/libgeotiff \ +BUILD_DEPENDS= fast_float>=0:math/fast_float \ + libertiff>=0:graphics/libertiff \ + libgeotiff>=1.5.0:graphics/libgeotiff \ proj>=6,1:graphics/proj LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ libgif.so:graphics/giflib \ @@ -25,6 +27,7 @@ LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff \ USES= cmake compiler:c++17-lang cpe iconv jpeg localbase pkgconfig ssl tar:xz +CMAKE_OFF_armv7= GDAL_ENABLE_ARM_NEON_OPTIMIZATIONS CMAKE_OFF= BUILD_CSHARP_BINDINGS \ BUILD_DOCS \ BUILD_JAVA_BINDINGS \ @@ -55,7 +58,8 @@ CMAKE_OFF= BUILD_CSHARP_BINDINGS \ GDAL_USE_TIFF_INTERNAL \ GDAL_USE_ZLIB_INTERNAL \ HDFS_ENABLED \ - SWIG_REGENERATE_PYTHON + SWIG_REGENERATE_PYTHON \ + ${CMAKE_OFF_${ARCH}} CMAKE_ON= BUILD_APPS \ BUILD_SHARED_LIBS \ BUILD_STATIC_LIBS \ @@ -94,8 +98,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} CPE_VENDOR= osgeo -HEADER_FILES= alg/gdalwarpkernel_opencl.h \ - alg/gvgcpfit.h \ +HEADER_FILES= alg/gvgcpfit.h \ alg/internal_qhull_headers.h \ alg/thinplatespline.h\ gcore/gdalexif.h \ @@ -111,7 +114,7 @@ HEADER_FILES= alg/gdalwarpkernel_opencl.h \ port/cpl_vsil_curl_priv.h \ port/cpl_worker_thread_pool.h -OPTIONS_DEFINE= AEC ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF JXL KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD +OPTIONS_DEFINE= AEC ARMADILLO BLOSC BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT FREEXL GEOS GTA HDF5 HEIF JXL KEA KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENDRIVE OPENEXR OPENJPEG PCRE2 PGSQL QB3 RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER OPTIONS_DEFAULT=AEC CURL DEFLATE EXPAT FREEXL GEOS LERC LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \ @@ -120,12 +123,15 @@ OPTIONS_EXCLUDE_powerpc= LERC OPTIONS_EXCLUDE_powerpc64= LERC OPTIONS_SUB= yes AEC_DESC= Adaptive entropy coding library +BLOSC_DESC= Blosc support in Zarr driver BRUNSLI_DESC= Brunsli support via libbrunsli library CRYPTOPP_DESC= Cryptopp support DEFLATE_DESC= Faster deflate support via libdeflate library -EXR_DESC= EXR support via OpenEXR library +KEA_DESC= KEA format support LERC_DESC= LERC (Limited Error Raster Compression) support +OPENDRIVE_DESC= OpenDRIVE format support PCRE2_DESC= Regular expression support for SQLite +QB3_DESC= QB3 compression in MRF driver RASTERLITE2_DESC= RasterLite2 support TILEDB_DESC= TileDB support @@ -133,6 +139,8 @@ AEC_CMAKE_BOOL= GDAL_USE_LIBAEC AEC_LIB_DEPENDS= libaec.so:science/libaec ARMADILLO_CMAKE_BOOL= GDAL_USE_ARMADILLO ARMADILLO_LIB_DEPENDS= libarmadillo.so:math/armadillo +BLOSC_CMAKE_BOOL= GDAL_USE_BLOSC +BLOSC_LIB_DEPENDS= libblosc.so:archivers/c-blosc BRUNSLI_CMAKE_BOOL= GDAL_USE_BRUNSLI BRUNSLI_LIB_DEPENDS= libbrunslidec-c.so:graphics/brunsli CFITSIO_CMAKE_BOOL= GDAL_USE_CFITSIO @@ -147,10 +155,6 @@ ECW_CMAKE_BOOL= GDAL_USE_ECW ECW_LIB_DEPENDS= libNCSEcw.so:graphics/libecwj2 EXPAT_CMAKE_BOOL= GDAL_USE_EXPAT EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2 -EXR_CFLAGS= -DInt64=uint64_t -EXR_CMAKE_BOOL= GDAL_USE_EXR -EXR_LIB_DEPENDS= libImath.so:math/Imath \ - libOpenEXR.so:graphics/openexr FREEXL_CMAKE_BOOL= GDAL_USE_FREEXL FREEXL_LIB_DEPENDS= libfreexl.so:textproc/freexl GEOS_CMAKE_BOOL= GDAL_USE_GEOS @@ -163,6 +167,8 @@ HEIF_CMAKE_BOOL= GDAL_USE_HEIF HEIF_LIB_DEPENDS= libheif.so:graphics/libheif JXL_CMAKE_BOOL= GDAL_USE_JXL GDAL_USE_JXL_THREADS JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +KEA_CMAKE_BOOL= GDAL_USE_KEA +KEA_LIB_DEPENDS= libkea.so:graphics/kealib KML_CMAKE_BOOL= GDAL_USE_LIBKML KML_LIB_DEPENDS= libkmlbase.so:science/libkml \ liburiparser.so:net/uriparser @@ -179,6 +185,14 @@ NETCDF_CMAKE_BOOL= GDAL_USE_NETCDF NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf ODBC_CMAKE_BOOL= GDAL_USE_ODBC ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +OPENDRIVE_CMAKE_BOOL= GDAL_USE_OPENDRIVE +OPENDRIVE_LDFLAGS= -lpugixml +OPENDRIVE_LIB_DEPENDS= libOpenDrive.so:graphics/libopendrive \ + libpugixml.so:textproc/pugixml +OPENEXR_CFLAGS= -DInt64=uint64_t +OPENEXR_CMAKE_BOOL= GDAL_USE_EXR +OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ + libOpenEXR.so:graphics/openexr OPENJPEG_BUILD_DEPENDS= openjpeg>=2.1.0:graphics/openjpeg OPENJPEG_CMAKE_BOOL= GDAL_USE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg @@ -190,6 +204,8 @@ PODOFO_CMAKE_BOOL= GDAL_USE_PODOFO PODOFO_LIB_DEPENDS= libpodofo.so:graphics/podofo POPPLER_CMAKE_BOOL= GDAL_USE_POPPLER POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler +QB3_CMAKE_BOOL= GDAL_USE_LIBQB3 +QB3_LIB_DEPENDS= libQB3.so:graphics/qb3 RASTERLITE2_CMAKE_BOOL= GDAL_USE_RASTERLITE2 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2 SFCGAL_CMAKE_BOOL= GDAL_USE_SFCGAL @@ -220,26 +236,29 @@ PLIST_SUB+= BIGENDIAN="" EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/alg/internal_libqhull \ --exclude ${DISTNAME}/frmts/gif/giflib \ --exclude ${DISTNAME}/frmts/gtiff/libgeotiff \ - --exclude ${DISTNAME}/frmts/gtiff/libtiff \ --exclude ${DISTNAME}/frmts/jpeg/libjpeg \ --exclude ${DISTNAME}/frmts/jpeg/libjpeg12 \ --exclude ${DISTNAME}/frmts/png/libpng \ --exclude ${DISTNAME}/frmts/zlib \ --exclude ${DISTNAME}/ogr/ogrsf_frmts/geojson/libjson \ + --exclude ${DISTNAME}/third_party/fast_float \ --exclude ${DISTNAME}/third_party/LercLib \ + --exclude ${DISTNAME}/third_party/libertiff \ --no-same-owner --no-same-permissions .else post-patch: @${RM} -r ${WRKSRC}/alg/internal_libqhull/ @${RM} -r ${WRKSRC}/frmts/gif/giflib/ @${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/ - @${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/ +# @${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/ # tif_lerc.c, tif_lzw.c, tif_packbits.c @${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/ + @${RM} -r ${WRKSRC}/third_party/fast_float/ @${RM} -r ${WRKSRC}/third_party/LercLib/ + @${RM} -r ${WRKSRC}/third_party/libertiff/ .endif post-install: diff --git a/graphics/gdal/distinfo b/graphics/gdal/distinfo index 23e72f65d3b5..9e9a4f020e0f 100644 --- a/graphics/gdal/distinfo +++ b/graphics/gdal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744288770 -SHA256 (gdal-3.10.3.tar.xz) = 335a8d2c7567d783563d3fed37e8b58d72d9c1723f6fd1d8c299fe4c0d936781 -SIZE (gdal-3.10.3.tar.xz) = 9208456 +TIMESTAMP = 1752416410 +SHA256 (gdal-3.11.3.tar.xz) = ba0807729fa681eed55bb6d5588bb9e4bde2b691c46e8d6d375ff5eaf789b16a +SIZE (gdal-3.11.3.tar.xz) = 9313768 diff --git a/graphics/gdal/files/patch-libertiff b/graphics/gdal/files/patch-libertiff new file mode 100644 index 000000000000..7ff515bfe53e --- /dev/null +++ b/graphics/gdal/files/patch-libertiff @@ -0,0 +1,11 @@ +--- frmts/snap_tiff/snaptiffdriver.cpp.orig 2025-05-06 16:38:15 UTC ++++ frmts/snap_tiff/snaptiffdriver.cpp +@@ -8,7 +8,7 @@ + #include "rawdataset.h" + + #define LIBERTIFF_NS GDAL_libertiff +-#include "../../third_party/libertiff/libertiff.hpp" ++#include "libertiff.hpp" + + #include <algorithm> + #include <cmath> diff --git a/graphics/gdal/files/patch-mysql b/graphics/gdal/files/patch-mysql index 9b5d8032dc6f..a12efddd61eb 100644 --- a/graphics/gdal/files/patch-mysql +++ b/graphics/gdal/files/patch-mysql @@ -1,10 +1,10 @@ ---- cmake/modules/packages/FindMySQL.cmake.orig 2023-07-06 11:14:14 UTC +--- cmake/modules/packages/FindMySQL.cmake.orig 2025-05-06 16:38:14 UTC +++ cmake/modules/packages/FindMySQL.cmake -@@ -23,6 +23,7 @@ if( MYSQL_INCLUDE_DIR AND EXISTS "${MYSQL_INCLUDE_DIR} +@@ -23,6 +23,7 @@ endif() "${MYSQL_VERSION_H}" ) endif() +set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "mysql") - find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r) + find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r NAMES_PER_DIR) if( NOT CMAKE_C_COMPILER_LOADED ) diff --git a/graphics/gdal/files/patch-ogr_ogrsf__frmts_xodr_ogr__xodr.h b/graphics/gdal/files/patch-ogr_ogrsf__frmts_xodr_ogr__xodr.h new file mode 100644 index 000000000000..296d424dae67 --- /dev/null +++ b/graphics/gdal/files/patch-ogr_ogrsf__frmts_xodr_ogr__xodr.h @@ -0,0 +1,11 @@ +--- ogr/ogrsf_frmts/xodr/ogr_xodr.h.orig 2025-07-12 10:33:49 UTC ++++ ogr/ogrsf_frmts/xodr/ogr_xodr.h +@@ -15,7 +15,7 @@ + #include "ogr_api.h" + #include <iostream> + #include <OpenDriveMap.h> +-#include <pugixml/pugixml.hpp> ++#include <pugixml.hpp> + #include <vector> + + struct RoadElements diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist index 952ff48e0055..605a1c7d789c 100644 --- a/graphics/gdal/pkg-plist +++ b/graphics/gdal/pkg-plist @@ -1,3 +1,4 @@ +bin/gdal bin/gdal-config bin/gdal_contour bin/gdal_create @@ -38,6 +39,7 @@ include/cpl_conv.h include/cpl_cpu_features.h include/cpl_csv.h include/cpl_error.h +include/cpl_float.h include/cpl_google_cloud.h include/cpl_hash_set.h include/cpl_http.h @@ -62,19 +64,25 @@ include/cpl_vsil_curl_priv.h include/cpl_worker_thread_pool.h include/cplkeywordparser.h include/gdal.h +include/gdal_adbc.h include/gdal_alg.h include/gdal_alg_priv.h include/gdal_csv.h include/gdal_frmts.h +include/gdal_fwd.h include/gdal_mdreader.h +include/gdal_minmax_element.hpp include/gdal_pam.h include/gdal_priv.h +include/gdal_priv_templates.hpp include/gdal_proxy.h include/gdal_rat.h include/gdal_simplesurf.h +include/gdal_typetraits.h include/gdal_utils.h include/gdal_version.h include/gdal_vrt.h +include/gdalalgorithm.h include/gdalcachedpixelaccessor.h include/gdalexif.h include/gdalgeorefpamdataset.h @@ -87,7 +95,7 @@ include/gdalpansharpen.h include/gdalsse_priv.h include/gdalsubdatasetinfo.h include/gdalwarper.h -include/gdalwarpkernel_opencl.h +include/geoheif.h include/gnm.h include/gnm_api.h include/gnm_priv.h @@ -117,9 +125,10 @@ lib/cmake/gdal/GDALConfig.cmake lib/cmake/gdal/GDALConfigVersion.cmake lib/gdalplugins/drivers.ini lib/libgdal.so -lib/libgdal.so.36 -lib/libgdal.so.36.%%PORTVERSION%% +lib/libgdal.so.37 +lib/libgdal.so.37.%%PORTVERSION%% libdata/pkgconfig/gdal.pc +share/bash-completion/completions/gdal share/bash-completion/completions/gdal-config share/bash-completion/completions/gdal2tiles.py share/bash-completion/completions/gdal2xyz.py @@ -170,6 +179,8 @@ share/bash-completion/completions/ogrtindex %%CURL%%%%DATADIR%%/eedaconf.json %%DATADIR%%/epsg.wkt %%DATADIR%%/esri_StatePlane_extra.wkt +%%DATADIR%%/gdal_algorithm.schema.json +%%DATADIR%%/gdalg.schema.json %%DATADIR%%/gdalicon.png %%DATADIR%%/gdalinfo_output.schema.json %%DATADIR%%/gdalmdiminfo_output.schema.json @@ -279,9 +290,11 @@ share/bash-completion/completions/ogrtindex %%DATADIR%%/jpfgdgml_WL.gfs %%DATADIR%%/jpfgdgml_WStrA.gfs %%DATADIR%%/jpfgdgml_WStrL.gfs +%%DATADIR%%/leaflet_template.html %%NETCDF%%%%DATADIR%%/netcdf_config.xsd %%DATADIR%%/nitf_spec.xml %%DATADIR%%/nitf_spec.xsd +%%DATADIR%%/ogr_fields_override.schema.json %%DATADIR%%/ogrinfo_output.schema.json %%DATADIR%%/ogrvrt.xsd %%SQLITE%%%%DATADIR%%/osmconf.ini @@ -313,6 +326,74 @@ share/bash-completion/completions/ogrtindex %%DATADIR%%/vdv452.xsd %%DATADIR%%/vicar.json share/man/man1/gdal-config.1.gz +share/man/man1/gdal-convert.1.gz +share/man/man1/gdal-info.1.gz +share/man/man1/gdal-mdim-convert.1.gz +share/man/man1/gdal-mdim-info.1.gz +share/man/man1/gdal-mdim.1.gz +share/man/man1/gdal-raster-calc.1.gz +share/man/man1/gdal-raster-clean-collar.1.gz +share/man/man1/gdal-raster-clip.1.gz +share/man/man1/gdal-raster-color-map.1.gz +share/man/man1/gdal-raster-contour.1.gz +share/man/man1/gdal-raster-convert.1.gz +share/man/man1/gdal-raster-create.1.gz +share/man/man1/gdal-raster-edit.1.gz +share/man/man1/gdal-raster-fill-nodata.1.gz +share/man/man1/gdal-raster-footprint.1.gz +share/man/man1/gdal-raster-hillshade.1.gz +share/man/man1/gdal-raster-index.1.gz +share/man/man1/gdal-raster-info.1.gz +share/man/man1/gdal-raster-mosaic.1.gz +share/man/man1/gdal-raster-overview-add.1.gz +share/man/man1/gdal-raster-overview-delete.1.gz +share/man/man1/gdal-raster-pipeline.1.gz +share/man/man1/gdal-raster-pixel-info.1.gz +share/man/man1/gdal-raster-polygonize.1.gz +share/man/man1/gdal-raster-reclassify.1.gz +share/man/man1/gdal-raster-reproject.1.gz +share/man/man1/gdal-raster-resize.1.gz +share/man/man1/gdal-raster-roughness.1.gz +share/man/man1/gdal-raster-scale.1.gz +share/man/man1/gdal-raster-select.1.gz +share/man/man1/gdal-raster-set-type.1.gz +share/man/man1/gdal-raster-sieve.1.gz +share/man/man1/gdal-raster-slope.1.gz +share/man/man1/gdal-raster-stack.1.gz +share/man/man1/gdal-raster-tile.1.gz +share/man/man1/gdal-raster-tpi.1.gz +share/man/man1/gdal-raster-tri.1.gz +share/man/man1/gdal-raster-unscale.1.gz +share/man/man1/gdal-raster-viewshed.1.gz +share/man/man1/gdal-raster.1.gz +share/man/man1/gdal-vector-clip.1.gz +share/man/man1/gdal-vector-convert.1.gz +share/man/man1/gdal-vector-edit.1.gz +share/man/man1/gdal-vector-filter.1.gz +share/man/man1/gdal-vector-geom-buffer.1.gz +share/man/man1/gdal-vector-geom-explode-collections.1.gz +share/man/man1/gdal-vector-geom-make-valid.1.gz +share/man/man1/gdal-vector-geom-segmentize.1.gz +share/man/man1/gdal-vector-geom-set-type.1.gz +share/man/man1/gdal-vector-geom-simplify.1.gz +share/man/man1/gdal-vector-geom-swap-xy.1.gz +share/man/man1/gdal-vector-geom.1.gz +share/man/man1/gdal-vector-grid.1.gz +share/man/man1/gdal-vector-info.1.gz +share/man/man1/gdal-vector-pipeline.1.gz +share/man/man1/gdal-vector-rasterize.1.gz +share/man/man1/gdal-vector-select.1.gz +share/man/man1/gdal-vector-sql.1.gz +share/man/man1/gdal-vector.1.gz +share/man/man1/gdal-vector_concat.1.gz +share/man/man1/gdal-vsi-copy.1.gz +share/man/man1/gdal-vsi-delete.1.gz +share/man/man1/gdal-vsi-list.1.gz +share/man/man1/gdal-vsi-move.1.gz +share/man/man1/gdal-vsi-sozip.1.gz +share/man/man1/gdal-vsi-sync.1.gz +share/man/man1/gdal-vsi.1.gz +share/man/man1/gdal.1.gz share/man/man1/gdal2tiles.1.gz share/man/man1/gdal_calc.1.gz share/man/man1/gdal_contour.1.gz |