hdf5: Update to 1.8.21

mingw-w64-hdf5/PKGBUILD

@@ -4,10 +4,10 @@
 _realname=hdf5
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_ver=1.8.20
+_ver=1.8.21
 patch=
 pkgver=${_ver}${patch//-/.}
-pkgrel=2
+pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data (mingw-w64)"
 arch=('any')
 license=("custom")
@@ -21,13 +21,13 @@ source=("https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver%.*}/hdf5-${_
         "hdf5-fix-find-szip.patch"
         "hdf5-cmake-size-type-checks.patch"
         )
-sha256sums=('a4f2db7e0a078aa324f64e0216a80731731f73025367fa94d158c9b1d3fbdf6f'
+sha256sums=('e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d'
             '35f8d9a313e8675e79f3920b4f2f6d349887f1b1e162dc06b1ffab9872473c3e'
             '81bd20b39ff5064cb454b7763b6cb9d3a2443c1fe0625f2d7819dce97b0b628d'
             'da0e3c30982946eddd58026359352f3cbb565e4b5ba399c8921778655c4d6505'
             '72a4c3ff11b0811e2462252ddc7f14428c0241c71b3403408dbc0f93a21271c9'
-            'a21a6be1fa7e606ed16d903ea8ba670a1e387cdb9aac69e2c6468a5a9fc5c990'
-            'c384db7d39123578ea7b9ead449c347ed0833bc77163c4165340a71b34baaaa0'
+            '828e431c8982846c2c67763368b5ba3bf6a27cac7ed6bd8a73ed8bcbf3fba6a3'
+            '905c1ae3a28ace1557584bbdbd2e50b721fda0ccc9e816e77834655053d4410e'
             '7370973e66370bb39bf2466be3ef58f464a10478b996e8c040c5a994d143d111')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran"
@@ -42,11 +42,11 @@ options=('staticlibs' 'strip')
 prepare() {
   cd "${srcdir}/${_realname}-${_ver}${patch}"
   patch -p1 -i "${srcdir}/hdf5-link-ws2_32-mingw.patch"
-  patch -p1 -i "${srcdir}/hdf5-install.patch"
+  #patch -p1 -i "${srcdir}/hdf5-install.patch"
   patch -p1 -i "${srcdir}/hdf5-default-import-suffix.patch"
   patch -p1 -i "${srcdir}/hdf5-fix-install-docs.patch"
   patch -p1 -i "${srcdir}/hdf5-proper-library-names-mingw.patch"
-  #patch -p1 -i "${srcdir}/hdf5-fix-find-szip.patch"
+  patch -p1 -i "${srcdir}/hdf5-fix-find-szip.patch"
   patch -p1 -i "${srcdir}/hdf5-cmake-size-type-checks.patch"
 }
 
@@ -55,6 +55,7 @@ build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  SZIP_INSTALL=${MINGW_PREFIX} \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -Wno-dev \
     -G"MSYS Makefiles" \
@@ -70,6 +71,8 @@ build() {
     -DHDF5_ENABLE_DEPRECATED_SYMBOLS=ON \
     -DHDF5_ENABLE_SZIP_SUPPORT=ON \
     -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
+    -DHDF5_INSTALL_CMAKE_DIR="lib/cmake" \
+    -DHDF5_INSTALL_DATA_DIR="share" \
     ../${_realname}-${_ver}${patch}
 
   make
@@ -84,7 +87,7 @@ package() {
   make DESTDIR=${pkgdir} install
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-  for _f in "${pkgdir}${MINGW_PREFIX}"/share/cmake/*.cmake; do
+  for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/hdf5/*.cmake; do
     sed -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" -i ${_f}
   done
 }

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

@@ -9,35 +9,35 @@
      set (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
      set (SZIP_SEARCH_RELEASE_NAMES "sz;libsz;libszip")
  else ()
---- hdf5-1.8.19.orig/CMakeFilters.cmake.orig	2017-07-28 16:59:07.288594400 +0200
-+++ hdf5-1.8.19/CMakeFilters.cmake	2017-07-28 17:05:59.279311000 +0200
-@@ -47,10 +47,10 @@
+--- hdf5-1.8.21/CMakeFilters.cmake.orig	2018-07-31 13:15:05.730704200 +0300
++++ hdf5-1.8.21/CMakeFilters.cmake	2018-07-31 13:21:23.985568600 +0300
+@@ -44,10 +44,10 @@
        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_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
--          set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_LIBRARIES})
+-          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
+-          set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES})
 -        endif ()
 +      endif ()
-+	  if (ZLIB_FOUND)
-+        set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
-+        set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_LIBRARIES})
++      if (ZLIB_FOUND)
++        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
++        set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES})
        endif ()
      endif ()
      if (ZLIB_FOUND)
-@@ -98,10 +98,10 @@
+@@ -95,10 +95,10 @@
      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_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
--        set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_LIBRARIES})
+-        set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+-        set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES})
 -      endif ()
 +    endif ()
-+	if (SZIP_FOUND)
-+      set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
-+      set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_LIBRARIES})
++    if (SZIP_FOUND)
++      set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
++      set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES})
      endif ()
    endif ()
    if (SZIP_FOUND)

mingw-w64-hdf5/hdf5-proper-library-names-mingw.patch

@@ -1,18 +1,17 @@
 --- hdf5-1.8.19.orig/config/cmake_ext_mod/HDFMacros.cmake	2017-07-28 16:41:41.840936100 +0200
 +++ hdf5-1.8.19/config/cmake_ext_mod/HDFMacros.cmake	2017-07-28 16:45:12.960710400 +0200
-@@ -88,8 +88,11 @@
+@@ -88,7 +88,10 @@
  
  #-------------------------------------------------------------------------------
  macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
+-  if (WIN32)
 +  if (MINGW)
 +    string(REGEX REPLACE "^lib([A-za-z]+)" "\\1" libname ${libname})
 +  endif ()
-   if (${libtype} MATCHES "SHARED")
--    if (WIN32)
-+    if (MSVC)
-       set (LIB_RELEASE_NAME "${libname}")
-       set (LIB_DEBUG_NAME "${libname}_D")
-     else ()
++  if (MSVC)
+     set (LIB_DEBUG_SUFFIX "_D")
+   else ()
+     set (LIB_DEBUG_SUFFIX "_debug")
 @@ -97,7 +100,7 @@
        set (LIB_DEBUG_NAME "${libname}_debug")
      endif ()
@@ -23,8 +22,8 @@
        set (LIB_DEBUG_NAME "lib${libname}_D")
      else ()
 @@ -116,6 +116,13 @@
-       OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
-       OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
+          OUTPUT_NAME_RELWITHDEBINFO
+                ${LIB_RELEASE_NAME}
    )
 + 
 +  if (MINGW)