Merge pull request #17130 from mmuetzel/hdf5

hdf5: update to 1.14.1

mingw-w64-hdf5/PKGBUILD

@@ -4,10 +4,10 @@
 _realname=hdf5
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_ver=1.14.0
-patch=
+_ver=1.14.1
+patch=-2
 pkgver=${_ver}${patch//-/.}
-pkgrel=6
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -26,18 +26,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* && ${MSYSTEM} != *64 ]] || echo \
                "${MINGW_PACKAGE_PREFIX}-fc")
              )
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver%.*}/hdf5-${_ver}${patch}/src/hdf5-${_ver}${patch}.tar.bz2"
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver%.*}/hdf5-${_ver}/src/hdf5-${_ver}${patch}.tar.bz2"
         "hdf5-proper-library-names-mingw.patch"
-        "hdf5-fix-find-szip.patch"
-        "hdf5-fix-strstria-shlwapi.patch::https://github.com/HDFGroup/hdf5/commit/d300febacda44b5f81d7d882c6f45b56c0424c97.patch"
         "hdf5-fix-static-lib.patch"
         "hdf5-fix-fortran-module-directory-leak.patch"
         "hdf5-fix-long-double-aarch64.patch")
-sha256sums=('e4e79433450edae2865a4c6328188bb45391b29d74f8c538ee699f0b116c2ba0'
+sha256sums=('06ca141d1a3c312b5d7cc4826a12737293ae131031748861689f6a2ec8219dbd'
             'e236f5805152b25065c206922d7ec1bab05b233adac51bbd0fb1e546326162f6'
-            '96175626455a36b970f9f50a06246f7c65a30057d8feed48172b7bd06a8e4bc0'
-            '3fab248ac5f9c60da09988ba7c6825248f3072c5599cdcc18eb614baebc2c52e'
-            'da8c6e789b8a8b923ce9fb153b6dd0bc44723ffb791144e64298bb4a758b7535'
+            '9d172a7f6b8f54fdbf840e032708acade4ab88c81262b45bfa85d203810962a9'
             '02b5d7335a9db628ed03b29c62d8f0e5f5618fa39de8e453aa02b530d28317a8'
             'a5170d96b893373d0c6e3350b4f5097c6c53f61c1b4adc49cf7f4995325e4dd8')
 
@@ -55,8 +51,6 @@ prepare() {
 
   apply_patch_with_msg \
     hdf5-proper-library-names-mingw.patch \
-    hdf5-fix-find-szip.patch \
-    hdf5-fix-strstria-shlwapi.patch \
     hdf5-fix-static-lib.patch \
     hdf5-fix-fortran-module-directory-leak.patch \
     hdf5-fix-long-double-aarch64.patch

mingw-w64-hdf5/hdf5-fix-find-szip.patch

@@ -1,28 +0,0 @@
---- a/CMakeFilters.cmake
-+++ b/CMakeFilters.cmake
-@@ -59,9 +59,9 @@
-       find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-       if (NOT ZLIB_FOUND)
-         find_package (ZLIB) # Legacy find
--        if (ZLIB_FOUND)
--          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
--        endif ()
-+      endif ()
-+      if (ZLIB_FOUND)
-+        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
-       endif ()
-     endif ()
-     if (ZLIB_FOUND)
-@@ -116,9 +116,9 @@
-       find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-       if (NOT SZIP_FOUND)
-         find_package (SZIP) # Legacy find
--        if (SZIP_FOUND)
--          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
--        endif ()
-+      endif ()
-+      if (SZIP_FOUND)
-+        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
-       endif ()
-     endif ()
-   endif ()

mingw-w64-hdf5/hdf5-fix-static-lib.patch

@@ -1,9 +1,9 @@
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -1241,6 +1241,7 @@
-           $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API>  # Enable tracing of the API
-           $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:${HDF5_DEBUG_APIS}>
-           $<$<CONFIG:Developer>:${HDF5_DEVELOPER_DEFS}>
+           "$<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API>" # Enable tracing of the API
+           "$<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:${HDF5_DEBUG_APIS}>"
+           "$<$<CONFIG:Developer>:${HDF5_DEVELOPER_DEFS}>"
 +          CURL_STATICLIB
    )
    TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC)