From b79d6bacc8a6b4ad5508aeb7b59732b408313f6b Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sat, 17 Jun 2017 09:21:54 +0300 Subject: [PATCH] python-h5py: Update to 2.7.0 --- mingw-w64-python-h5py/001-mingw-python.patch | 27 ++++++++++---------- mingw-w64-python-h5py/PKGBUILD | 17 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mingw-w64-python-h5py/001-mingw-python.patch b/mingw-w64-python-h5py/001-mingw-python.patch index c12a8eb7ab..ea67499c89 100644 --- a/mingw-w64-python-h5py/001-mingw-python.patch +++ b/mingw-w64-python-h5py/001-mingw-python.patch @@ -1,5 +1,5 @@ ---- h5py-2.5.0/setup_build.py.orig 2015-07-21 19:33:54.858023400 +0300 -+++ h5py-2.5.0/setup_build.py 2015-07-21 19:37:16.980584200 +0300 +--- h5py-2.7.0/setup_build.py.orig 2017-06-16 19:33:54.858023400 +0300 ++++ h5py-2.7.0/setup_build.py 2017-06-16 19:37:16.980584200 +0300 @@ -17,6 +17,7 @@ from functools import reduce import api_gen @@ -8,19 +8,18 @@ def localpath(*args): return op.abspath(reduce(op.join, (op.dirname(__file__),)+args)) -@@ -36,7 +37,14 @@ - localpath("lzf/lzf/lzf_d.c")]} - +@@ -36,7 +37,13 @@ + 'define_macros' : [('H5_USE_16_API', None)] + } -if sys.platform.startswith('win'): +if _POSIX_BUILD: -+ COMPILER_SETTINGS = { -+ 'libraries' : ['hdf5', 'hdf5_hl'], -+ 'include_dirs' : [localpath('lzf'), '/opt/local/include', '/usr/local/include'], -+ 'library_dirs' : ['/opt/local/lib', '/usr/local/lib'], -+ 'define_macros' : [('H5_USE_16_API', None), ('_HDF5USEDLL_', None)] } -+ ++ COMPILER_SETTINGS['define_macros'].extend([ ++ ('H5_USE_16_API', None), ++ ('_HDF5USEDLL_', None), ++ ('H5_BUILT_AS_DYNAMIC_LIB', None) ++ ]) +elif sys.platform.startswith('win'): - COMPILER_SETTINGS = { - 'libraries' : ['h5py_hdf5', 'h5py_hdf5_hl'], - 'include_dirs' : [localpath('lzf'), localpath('windows')], + COMPILER_SETTINGS['include_dirs'].append(localpath('windows')) + COMPILER_SETTINGS['define_macros'].extend([ + ('_HDF5USEDLL_', None), diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index 65de0db799..ff85b08371 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -2,10 +2,10 @@ _realname=h5py pkgbase=mingw-w64-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" - "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=2.5.0 -pkgrel=3 +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" + "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=2.7.0 +pkgrel=1 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') url="http://www.h5py.org" @@ -19,18 +19,19 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-hdf5" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(https://pypi.python.org/packages/source/h/h5py/h5py-${pkgver}.tar.gz +_dtoken="11/6b/32cee6f59e7a03ab7c60bb250caff63e2d20c33ebca47cf8c28f6a2d085c" +source=(https://pypi.python.org/packages/${_dtoken}/h5py-${pkgver}.tar.gz 001-mingw-python.patch lzf_c.c.patch) -sha256sums=('9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6' - '7c3f6afa82fdb5805c5415e62b0de4e82896986613bdc5e541b53dcc4fa19982' +sha256sums=('79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310' + '0a841ece7c08dbc5acdf247b3e73f3e1ca346940394a7a06ee30e8055189ce46' '6d0126b881b5dcd637146d151341b72aa68eef760092272279072ec0bc4ceca9') prepare() { cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-mingw-python.patch patch -p1 -i ${srcdir}/lzf_c.c.patch - cd .. + cd ${srcdir} cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver} cp -a ${_realname}-${pkgver} ${_realname}-py3-${pkgver}