From bff59e9e2a0aba60833dfb470ba3dbc2cde17dbd Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Thu, 31 Mar 2022 07:22:13 +0100
Subject: [PATCH] hdf5: update to 1.13.1

---
 mingw-w64-hdf5/PKGBUILD                 | 28 +++++++++++++------------
 mingw-w64-hdf5/hdf5-fix-find-szip.patch | 28 -------------------------
 2 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 mingw-w64-hdf5/hdf5-fix-find-szip.patch

diff --git a/mingw-w64-hdf5/PKGBUILD b/mingw-w64-hdf5/PKGBUILD
index 355ecb2f2a..e2e1fbf95b 100644
--- a/mingw-w64-hdf5/PKGBUILD
+++ b/mingw-w64-hdf5/PKGBUILD
@@ -4,10 +4,10 @@
 _realname=hdf5
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_ver=1.12.1
+_ver=1.13.1
 patch=
 pkgver=${_ver}${patch//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -25,11 +25,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              )
 options=('staticlibs' 'strip')
 source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver%.*}/hdf5-${_ver}${patch}/src/hdf5-${_ver}${patch}.tar.bz2"
-        "hdf5-proper-library-names-mingw.patch"
-        "hdf5-fix-find-szip.patch")
-sha256sums=('aaf9f532b3eda83d3d3adc9f8b40a9b763152218fa45349c3bc77502ca1f8f1c'
-            '7b5595ee9903e14f147f7b4615648cad6a0f5a76f8299461ebe91d739e750476'
-            '1a778a273225c36589b8874deb71caedbd76f2704ff39948b7a2b4d5f977b529')
+        "hdf5-proper-library-names-mingw.patch")
+sha256sums=('e16973ec893e2d5aa9c8dc73e196db9b99a605578e7317b421c713936f8bf57d'
+            '7b5595ee9903e14f147f7b4615648cad6a0f5a76f8299461ebe91d739e750476')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -44,8 +42,7 @@ prepare() {
   cd "${srcdir}/${_realname}-${_ver}${patch}"
 
   apply_patch_with_msg \
-    hdf5-proper-library-names-mingw.patch \
-    hdf5-fix-find-szip.patch
+    hdf5-proper-library-names-mingw.patch
 }
 
 build() {
@@ -61,7 +58,7 @@ build() {
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   SZIP_INSTALL=${MINGW_PREFIX} \
-    cmake \
+    ${MINGW_PREFIX}/bin/cmake \
       -Wno-dev \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
@@ -73,15 +70,18 @@ build() {
       -DHDF5_BUILD_CPP_LIB=ON \
       -DHDF5_BUILD_FORTRAN=${_enable_fortran} \
       -DHDF5_BUILD_TOOLS=ON \
+      -DHDF5_BUILD_EXAMPLES=OFF \
       -DHDF5_ENABLE_DEPRECATED_SYMBOLS=ON \
       -DHDF5_ENABLE_SZIP_SUPPORT=ON \
       -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
-      -DHDF5_INSTALL_CMAKE_DIR="lib/cmake" \
+      -DHDF5_INSTALL_CMAKE_DIR="lib/cmake/hdf5" \
       -DHDF5_INSTALL_DATA_DIR="share/doc/hdf5" \
       -DHDF5_MSVC_NAMING_CONVENTION=OFF \
+      -DUSE_LIBAEC=ON \
+      -Dlibaec_DIR=${MINGW_PREFIX}/lib/cmake \
       ../${_realname}-${_ver}${patch}
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
@@ -94,7 +94,9 @@ package() {
     cp ${srcdir}/build-${MSYSTEM}/bin/shared/*.mod ${srcdir}/build-${MSYSTEM}/bin/shared/Release
   fi
 
-  DESTDIR="${pkgdir}" cmake --install .
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+
+  install -Dm644 "${srcdir}"/${_realname}-${_ver}${patch}/COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/hdf5/*.cmake; do
diff --git a/mingw-w64-hdf5/hdf5-fix-find-szip.patch b/mingw-w64-hdf5/hdf5-fix-find-szip.patch
deleted file mode 100644
index 2e0679cf8a..0000000000
--- a/mingw-w64-hdf5/hdf5-fix-find-szip.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeFilters.cmake
-+++ b/CMakeFilters.cmake
-@@ -62,9 +62,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)
-@@ -113,9 +113,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 ()
-   if (SZIP_FOUND)