From ba662c9bdd78e1117926d076628ca02fa57ded6a Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 22 Oct 2024 10:04:02 +0800
Subject: [PATCH] Bump webp and hdf5 version to avoid compilation errors.

---
 library_builders.sh            | 11 ++++++-----
 tests/test_library_builders.sh |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/library_builders.sh b/library_builders.sh
index 186e7abf..914a5034 100644
--- a/library_builders.sh
+++ b/library_builders.sh
@@ -22,11 +22,11 @@ JPEGTURBO_VERSION="${JPEGTURBO_VERSION:-2.1.3}"
 OPENJPEG_VERSION="${OPENJPEG_VERSION:-2.1}"
 LCMS2_VERSION="${LCMS2_VERSION:-2.9}"
 GIFLIB_VERSION="${GIFLIB_VERSION:-5.1.3}"
-LIBWEBP_VERSION="${LIBWEBP_VERSION:-0.5.0}"
+LIBWEBP_VERSION="${LIBWEBP_VERSION:-1.4.0}"
 XZ_VERSION="${XZ_VERSION:-5.2.2}"
 LIBYAML_VERSION="${LIBYAML_VERSION:-0.2.2}"
 SZIP_VERSION="${SZIP_VERSION:-2.1.1}"
-HDF5_VERSION="${HDF5_VERSION:-1.10.5}"
+HDF5_VERSION="${HDF5_VERSION:-1.14.5}"
 LIBAEC_VERSION="${LIBAEC_VERSION:-1.0.4}"
 LZO_VERSION=${LZO_VERSION:-2.10}
 LZF_VERSION="${LZF_VERSION:-3.6}"
@@ -311,9 +311,10 @@ function build_hdf5 {
     build_zlib
     # libaec is a drop-in replacement for szip
     build_libaec
-    local hdf5_url=https://support.hdfgroup.org/ftp/HDF5/releases
-    local short=$(echo $HDF5_VERSION | awk -F "." '{printf "%d.%d", $1, $2}')
-    fetch_unpack $hdf5_url/hdf5-$short/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz
+    local hdf5_url=https://support.hdfgroup.org/releases/hdf5/
+    local short=$(echo $HDF5_VERSION | awk -F "." '{printf "v%d_%d", $1, $2}')
+    local long=$(echo $HDF5_VERSION | awk -F "." '{printf "v%d_%d_%d", $1, $2, $3}')
+    fetch_unpack $hdf5_url/$short/$long/downloads/hdf5-$HDF5_VERSION.tar.gz
     (cd hdf5-$HDF5_VERSION \
         && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BUILD_PREFIX/lib \
         && ./configure --with-szlib=$BUILD_PREFIX --prefix=$BUILD_PREFIX \
diff --git a/tests/test_library_builders.sh b/tests/test_library_builders.sh
index 5077ea9f..df5c47ac 100644
--- a/tests/test_library_builders.sh
+++ b/tests/test_library_builders.sh
@@ -62,7 +62,8 @@ if [ -z "$IS_MACOS" ]; then
     suppress build_cfitsio
 fi
 suppress build_new_zlib
-suppress build_hdf5
+export
+build_hdf5
 rm jpeg-stamp
 suppress build_libjpeg_turbo
 suppress get_modern_cmake