From e5994f387528125b7caf8399910d5eef45d98412 Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Wed, 9 Oct 2024 20:22:40 +0000 Subject: [PATCH] [GDAL] Add explicit LERC dependency Needs #9586. The recent LERC_jll v4 release broke GDAL_jll since it was an implicit dependency. See https://github.com/JuliaGeo/GDAL.jl/issues/179. This tries to make a new release compatible with LERC_jll v4, and the latest breaking PROJ release. Since PROJ is also a dependency of libgeotiff this needs #9586 first. It also adds compats for dependencies that did not yet have them. --- G/GDAL/build_tarballs.jl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/G/GDAL/build_tarballs.jl b/G/GDAL/build_tarballs.jl index ea9995b483c..29154481786 100644 --- a/G/GDAL/build_tarballs.jl +++ b/G/GDAL/build_tarballs.jl @@ -4,7 +4,7 @@ using BinaryBuilder, Pkg name = "GDAL" upstream_version = v"3.9.2" -version_offset = v"1.1.0" +version_offset = v"1.2.0" version = VersionNumber(upstream_version.major * 100 + version_offset.major, upstream_version.minor * 100 + version_offset.minor, upstream_version.patch * 100 + version_offset.patch) @@ -65,6 +65,7 @@ CMAKE_FLAGS=(-DCMAKE_INSTALL_PREFIX=${prefix} -DGDAL_USE_GEOS=ON -DGDAL_USE_GEOTIFF=ON -DGDAL_USE_GIF=OFF # Breaks GDAL on Windows as of Giflib_jll v5.2.2 (#8781) + -DGDAL_USE_LERC=ON -DGDAL_USE_LIBLZMA=ON -DGDAL_USE_LIBXML2=ON -DGDAL_USE_LZ4=ON @@ -190,21 +191,22 @@ dependencies = [ Dependency("Expat_jll"; compat="2.2.10"), Dependency("GEOS_jll"; compat="3.11.2"), Dependency("HDF5_jll"; compat="~1.14.3", platforms=hdf5_platforms), + Dependency("LERC_jll"; compat="4"), Dependency("LibCURL_jll"; compat="7.73,8"), - Dependency("LibPQ_jll"), - Dependency("Libtiff_jll"; compat="4.5.1"), + Dependency("LibPQ_jll"; compat="16"), + Dependency("Libtiff_jll"; compat="4.7"), Dependency("Lz4_jll"; compat="1.9.3"), Dependency("NetCDF_jll"; compat="400.902.210", platforms=hdf5_platforms), - Dependency("OpenJpeg_jll"), + Dependency("OpenJpeg_jll"; compat="2.5"), Dependency("PCRE2_jll"; compat="10.35.0"), - Dependency("PROJ_jll"; compat="901.300.0"), + Dependency("PROJ_jll"; compat="902.500"), Dependency("Qhull_jll"; compat="8.0.999"), - Dependency("SQLite_jll"), + Dependency("SQLite_jll"; compat="3.45"), Dependency("XML2_jll"; compat="2.9.11"), Dependency("XZ_jll"; compat="5.2.5"), Dependency("Zlib_jll"; compat="1.2.12"), Dependency("Zstd_jll"; compat="1.5.6"), - Dependency("libgeotiff_jll"; compat="100.701.100"), + Dependency("libgeotiff_jll"; compat="100.702.300"), Dependency("libpng_jll"; compat="1.6.38"), Dependency("libwebp_jll"; compat="1.2.4"), ]