From 439dba14fa7006250c711dbbed828219a0fde45c Mon Sep 17 00:00:00 2001 From: Alexpux Date: Wed, 28 May 2014 12:45:12 +0400 Subject: [PATCH] hdf5: Update to 1.8.13 --- mingw-w64-hdf5/PKGBUILD | 25 ++++++----- .../hdf5-default-import-suffix.patch | 11 +++-- mingw-w64-hdf5/hdf5-fix-install-docs.patch | 12 +++--- mingw-w64-hdf5/hdf5-install.patch | 32 +++++++------- mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch | 42 ++++++++++--------- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/mingw-w64-hdf5/PKGBUILD b/mingw-w64-hdf5/PKGBUILD index 7100908805..48ffb657ec 100644 --- a/mingw-w64-hdf5/PKGBUILD +++ b/mingw-w64-hdf5/PKGBUILD @@ -4,23 +4,22 @@ _realname=hdf5 _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" -pkgver=1.8.12 +pkgver=1.8.13 pkgrel=1 pkgdesc="General purpose library and file format for storing scientific data" arch=('any') url="http://www.hdfgroup.org/HDF5/" -source=( - "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver}/src/hdf5-${pkgver}.tar.bz2" - "hdf5-link-ws2_32-mingw.patch" - "hdf5-default-import-suffix.patch" - "hdf5-install.patch" - "hdf5-fix-install-docs.patch" - ) -md5sums=('03ad766d225f5e872eb3e5ce95524a08' - 'c2eae0fa98e1b0f15c70d6ac65f8f7fb' - 'ff88f8dac682af32181ca801f25b12aa' - '66314208fdeb6e6456ab003e1ae837e5' - 'f41dd4f98034fbdd3e15e0800ce79407') +source=("http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver}/src/hdf5-${pkgver}.tar.bz2" + "hdf5-link-ws2_32-mingw.patch" + "hdf5-default-import-suffix.patch" + "hdf5-install.patch" + "hdf5-fix-install-docs.patch" + ) +md5sums=('b060bb137d6bd8accf8f0c4c59d2746d' + '35e0198f4ed456ee5673c23a06aa5eb6' + 'f6150aad270fe6f2dc6d6402926e67e9' + 'f08826ac66e319190a01d3f82a692c0e' + '44ac9317cb413eca5ed506033fd3b676') depends=("${_mingw_suff}-gcc-libs" "${_mingw_suff}-gcc-libgfortran" "${_mingw_suff}-zlib" "${_mingw_suff}-szip") makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-gcc-fortran" "${_mingw_suff}-cmake" "patch") options=('staticlibs' 'strip') diff --git a/mingw-w64-hdf5/hdf5-default-import-suffix.patch b/mingw-w64-hdf5/hdf5-default-import-suffix.patch index 9355fb6ac3..219193765d 100644 --- a/mingw-w64-hdf5/hdf5-default-import-suffix.patch +++ b/mingw-w64-hdf5/hdf5-default-import-suffix.patch @@ -1,20 +1,19 @@ diff -ur hdf5-1.8.12.orig/config/cmake/HDFMacros.cmake hdf5-1.8.12/config/cmake/HDFMacros.cmake --- hdf5-1.8.12.orig/config/cmake/HDFMacros.cmake 2013-11-22 22:35:38.454236491 +0100 +++ hdf5-1.8.12/config/cmake/HDFMacros.cmake 2013-11-22 22:37:27.717130034 +0100 -@@ -108,16 +108,6 @@ +@@ -108,15 +108,6 @@ RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME} ) - #----- Use MSVC Naming conventions for Shared Libraries -- IF (MINGW AND ${libtype} MATCHES "SHARED") -- SET_TARGET_PROPERTIES (${libtarget} +- if (MINGW AND ${libtype} MATCHES "SHARED") +- set_target_properties (${libtarget} - PROPERTIES - IMPORT_SUFFIX ".lib" - IMPORT_PREFIX "" - PREFIX "" - ) -- ENDIF (MINGW AND ${libtype} MATCHES "SHARED") -- +- endif (MINGW AND ${libtype} MATCHES "SHARED") + ENDMACRO (HDF_SET_LIB_OPTIONS) - #------------------------------------------------------------------------------- diff --git a/mingw-w64-hdf5/hdf5-fix-install-docs.patch b/mingw-w64-hdf5/hdf5-fix-install-docs.patch index 6aa3b95594..00c233a94b 100644 --- a/mingw-w64-hdf5/hdf5-fix-install-docs.patch +++ b/mingw-w64-hdf5/hdf5-fix-install-docs.patch @@ -1,20 +1,20 @@ --- hdf5-1.8.12/CMakeInstallation.cmake.orig 2013-11-21 19:14:04.000000000 +0400 +++ hdf5-1.8.12/CMakeInstallation.cmake 2014-04-30 12:23:14.248200000 +0400 @@ -144,7 +144,7 @@ + install ( FILES - ${HDF5_SOURCE_DIR}/ACKNOWLEDGMENTS ${HDF5_SOURCE_DIR}/COPYING - DESTINATION ${HDF5_INSTALL_DATA_DIR} + DESTINATION ${HDF5_INSTALL_DATA_DIR}/doc/hdf5 COMPONENT hdfdocuments ) - IF (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") + if (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") @@ -188,7 +188,7 @@ - ENDIF (HDF5_PACK_INSTALL_DOCS) - INSTALL ( + endif (HDF5_PACK_INSTALL_DOCS) + install ( FILES ${release_files} - DESTINATION ${HDF5_INSTALL_DATA_DIR} -+ DESTINATION ${HDF5_INSTALL_DATA_DIR}/doc/hdf5 ++ DESTINATION ${HDF5_INSTALL_DATA_DIR}/doc/hdf5 COMPONENT hdfdocuments ) - ENDIF (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") + endif (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") diff --git a/mingw-w64-hdf5/hdf5-install.patch b/mingw-w64-hdf5/hdf5-install.patch index f1a26ef000..f7ee27e4b7 100644 --- a/mingw-w64-hdf5/hdf5-install.patch +++ b/mingw-w64-hdf5/hdf5-install.patch @@ -1,19 +1,19 @@ ---- CMakeLists.txt.orig 2013-11-21 23:14:04.000000000 +0800 -+++ CMakeLists.txt 2014-04-30 09:31:00.933628200 +0800 +--- hdf5-1.8.12/CMakeLists.txt.orig 2013-11-21 23:14:04.000000000 +0800 ++++ hdf5-1.8.12/CMakeLists.txt 2014-04-30 09:31:00.933628200 +0800 @@ -157,13 +157,13 @@ - SET (HDF5_INSTALL_INCLUDE_DIR include) - ENDIF (NOT HDF5_INSTALL_INCLUDE_DIR) - IF (NOT HDF5_INSTALL_DATA_DIR) -- IF (NOT WIN32) -+ IF (NOT WIN32 OR MINGW) - SET (HDF5_INSTALL_DATA_DIR share) - SET (HDF5_INSTALL_CMAKE_DIR share/cmake) -- ELSE (NOT WIN32) -+ ELSE (NOT WIN32 OR MINGW) - SET (HDF5_INSTALL_DATA_DIR ".") - SET (HDF5_INSTALL_CMAKE_DIR cmake) -- ENDIF (NOT WIN32) -+ ENDIF (NOT WIN32 OR MINGW) - ENDIF (NOT HDF5_INSTALL_DATA_DIR) + set (HDF5_INSTALL_INCLUDE_DIR include) + endif (NOT HDF5_INSTALL_INCLUDE_DIR) + if (NOT HDF5_INSTALL_DATA_DIR) +- if (NOT WIN32) ++ if (NOT WIN32 OR MINGW) + set (HDF5_INSTALL_DATA_DIR share) + set (HDF5_INSTALL_CMAKE_DIR share/cmake) +- else (NOT WIN32) ++ else (NOT WIN32 OR MINGW) + set (HDF5_INSTALL_DATA_DIR ".") + set (HDF5_INSTALL_CMAKE_DIR cmake) +- endif (NOT WIN32) ++ endif (NOT WIN32 OR MINGW) + endif (NOT HDF5_INSTALL_DATA_DIR) #----------------------------------------------------------------------------- diff --git a/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch b/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch index a7788bd35b..ec8ae0e09e 100644 --- a/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch +++ b/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch @@ -1,29 +1,31 @@ diff -ur hdf5-1.8.12.orig/src/CMakeLists.txt hdf5-1.8.12/src/CMakeLists.txt --- hdf5-1.8.12.orig/src/CMakeLists.txt 2013-11-22 22:01:31.874461256 +0100 +++ hdf5-1.8.12/src/CMakeLists.txt 2013-11-22 22:06:19.702407529 +0100 -@@ -615,9 +615,9 @@ +@@ -615,9 +615,11 @@ #----------------------------------------------------------------------------- - ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) + add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) TARGET_C_PROPERTIES (H5detect " " " ") --IF (MSVC) -- TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") --ENDIF (MSVC) -+IF (WIN32) -+ TARGET_LINK_LIBRARIES (H5detect ws2_32) -+ENDIF () +-if (MSVC OR MINGW) ++if (MSVC) + target_link_libraries (H5detect "ws2_32.lib") +-endif (MSVC OR MINGW) ++elseif (MINGW) ++ target_link_libraries (H5detect "ws2_32") ++endif () - SET (CMD $) - ADD_CUSTOM_COMMAND ( -@@ -629,9 +629,9 @@ + set (CMD $) + add_custom_command ( +@@ -629,9 +629,11 @@ - ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) + add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) TARGET_C_PROPERTIES (H5make_libsettings " " " ") --IF (MSVC) -- TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib") --ENDIF (MSVC) -+IF (WIN32) -+ TARGET_LINK_LIBRARIES (H5make_libsettings ws2_32) -+ENDIF () +-if (MSVC OR MINGW) ++if (MSVC) + target_link_libraries (H5make_libsettings "ws2_32.lib") +-endif (MSVC OR MINGW) ++elseif (MINGW) ++ target_link_libraries (H5make_libsettings "ws2_32") ++endif () - SET (CMD $) - ADD_CUSTOM_COMMAND ( + set (CMD $) + add_custom_command (