diff options
Diffstat (limited to 'graphics/gdal')
| -rw-r--r-- | graphics/gdal/Makefile | 17 | ||||
| -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/pkg-plist | 87 |
5 files changed, 111 insertions, 16 deletions
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 2ad5c425d161..a92ab2f07baa 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -1,6 +1,5 @@ PORTNAME= gdal -PORTVERSION= 3.10.3 -PORTREVISION= 2 +PORTVERSION= 3.11.0 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet @@ -13,7 +12,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 \ @@ -94,8 +95,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 \ @@ -220,26 +220,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..e132da71acea 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 = 1747715310 +SHA256 (gdal-3.11.0.tar.xz) = ba1a17a74428bfd5c789ce293f59b6a3d8bfabab747431c33331ac0ac579ea71 +SIZE (gdal-3.11.0.tar.xz) = 9292588 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/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 |