1.10.1

2 files changed, 15 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9aa986d68485..ede1a4ac83a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 # Generated by mksrcinfo v8
-# Tue Feb 14 19:38:20 UTC 2017
+# Wed Aug 16 20:23:12 UTC 2017
 pkgbase = mingw-w64-hdf5
 	pkgdesc = General purpose library and file format for storing scientific data (mingw-w64)
-	pkgver = 1.10.0_patch1
+	pkgver = 1.10.1
 	pkgrel = 1
 	url = http://www.hdfgroup.org/HDF5/
 	arch = any
 	license = custom
 	makedepends = mingw-w64-cmake
-	makedepends = wine
 	depends = mingw-w64-crt
 	depends = mingw-w64-zlib
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/hdf5-1.10.0-patch1.tar.bz2
-	sha1sums = 2f34251186fa9e59887d8f094bc0bc90187d0aa4
+	source = ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.bz2
+	sha1sums = 22edee1f4ed603ea9544daec3492874fa3028bbb
 
 pkgname = mingw-w64-hdf5
 
diff --git a/PKGBUILD b/PKGBUILD
index 64b8d2ae6af4..063b3f6f87ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,41 @@
 pkgname=mingw-w64-hdf5
-pkgver=1.10.0_patch1
-_pkgver=1.10.0-patch1
+pkgver=1.10.1
+_pkgver=${pkgver}
 pkgrel=1
 arch=('any')
 pkgdesc="General purpose library and file format for storing scientific data (mingw-w64)"
 url="http://www.hdfgroup.org/HDF5/"
 license=('custom')
 depends=('mingw-w64-crt' 'mingw-w64-zlib')
-makedepends=('mingw-w64-cmake' 'wine')
+makedepends=('mingw-w64-cmake')
 options=('!strip' '!buildflags' 'staticlibs')
-sha1sums=('82ed248e5d0293bc1dba4c13c9b2880a26643ee0')
-source=(ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-1.10/hdf5-${_pkgver}/src/hdf5-${_pkgver}.tar.bz2)
-sha1sums=('2f34251186fa9e59887d8f094bc0bc90187d0aa4')
+source=("ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-1.10/hdf5-${_pkgver}/src/hdf5-${_pkgver}.tar.bz2")
+sha1sums=('22edee1f4ed603ea9544daec3492874fa3028bbb')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare () {
   cd "$srcdir/hdf5-${pkgver/_/-}"
 
-  # do not rename import library ".lib"
-  sed -i "s|MINGW AND \${libtype} MATCHES \"SHARED\"|0|g" config/cmake_ext_mod/HDFMacros.cmake
-
   # run H5detect.exe, H5make_libsettings.exe through wine
   sed -i "s|set (CMD $<TARGET_FILE:H5|set (CMD wine $<TARGET_FILE:H5|g" src/CMakeLists.txt
 
-  # error: redefinition of ‘struct timezone’
-  sed -i "s|struct timezone {|struct timezonezzzz {|g" src/H5win32defs.h
+  # do not use msvc import suffix
+  sed -i "s|MINGW AND \${libtype} MATCHES \"SHARED\"|0|g" config/cmake_ext_mod/HDFMacros.cmake
+
+  # dont add twice the lib prefix
+  sed -i 's|set (LIB_RELEASE_NAME "lib\${libname}")|set (LIB_RELEASE_NAME "\${libname}")|g' config/cmake_ext_mod/HDFMacros.cmake
 }
 
 build() {
   cd "$srcdir/hdf5-${pkgver/_/-}"
   for _arch in $_architectures; do
-    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_TESTING=OFF \
-      -DHDF5_BUILD_TOOLS=OFF \
-      -DHDF5_BUILD_EXAMPLES=OFF \
-      ..
-    make
-    popd
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
-      -DCMAKE_BUILD_TYPE=Release \
+      -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \
       -DBUILD_TESTING=OFF \
       -DHDF5_BUILD_TOOLS=OFF \
       -DHDF5_BUILD_EXAMPLES=OFF \
-      -DBUILD_SHARED_LIBS=ON \
       ..
     make
     popd
@@ -55,8 +44,6 @@ build() {
 
 package() {
   for _arch in $_architectures; do
-    cd "$srcdir/hdf5-${pkgver/_/-}/build-${_arch}-static"
-    make DESTDIR="${pkgdir}" install
     cd "$srcdir/hdf5-${pkgver/_/-}/build-${_arch}"
     make DESTDIR="${pkgdir}" install
     rm "$pkgdir"/usr/${_arch}/{COPYING,*.txt}