X-NMUDIFF-Version: 2.23.4+deb12u1 Control: tags 1074848 + patch Control: tags 1074848 + pending
Dear maintainer, I've prepared an NMU for bitshuffle (versioned as 0.5.1-1.3) and uploaded it to DELAYED/6. Please feel free to tell me if I should delay it longer. Regards.diff -Nru bitshuffle-0.5.1/debian/changelog bitshuffle-0.5.1/debian/changelog --- bitshuffle-0.5.1/debian/changelog 2023-12-22 18:03:34.000000000 +0100 +++ bitshuffle-0.5.1/debian/changelog 2024-08-16 21:57:44.000000000 +0200
@@ -1,3 +1,10 @@ +bitshuffle (0.5.1-1.3) unstable; urgency=medium + + * Non-maintainer upload.+ * New patch gcc14.patch to fix FTBFS against GCC-14 (closes: #1074848)
+ + -- Gilles Filippini <p...@debian.org> Fri, 16 Aug 2024 21:57:44 +0200 + bitshuffle (0.5.1-1.2) unstable; urgency=medium * Non-maintainer upload.diff -Nru bitshuffle-0.5.1/debian/patches/gcc14.patch bitshuffle-0.5.1/debian/patches/gcc14.patch --- bitshuffle-0.5.1/debian/patches/gcc14.patch 1970-01-01 01:00:00.000000000 +0100 +++ bitshuffle-0.5.1/debian/patches/gcc14.patch 2024-08-16 21:57:44.000000000 +0200
@@ -0,0 +1,43 @@ +From b80f735bc6a8b5d08063124780bca416a05cee8b Mon Sep 17 00:00:00 2001 +From: Liam Gray <lg...@phas.ubc.ca> +Date: Wed, 7 Aug 2024 16:37:35 -0700+Subject: [PATCH 4/4] fix(lzf_filter.c): fix H5Z_class_t definition for newer
+ hdf5 api + +Closes kiyo-masui/bitshuffle#153 +--- + lzf/lzf_filter.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/lzf/lzf_filter.c b/lzf/lzf_filter.c +index c6dd4b0..1a9d4da 100644 +--- a/lzf/lzf_filter.c ++++ b/lzf/lzf_filter.c +@@ -43,18 +43,22 @@ + #endif + + /* Deal with the mutiple definitions for H5Z_class_t. +- Note: Only HDF5 1.6 and 1.8 are supported. ++ Note: HDF5 1.6 and >= 1.8 are supported.++ See https://portal.hdfgroup.org/hdf5/develop/group___h5_z.html#title6
++ for version history. + + (1) The old class should always be used for HDF5 1.6 + (2) The new class should always be used for HDF5 1.8 < 1.8.3 +- (3) The old class should be used for HDF5 1.8 >= 1.8.3 only if the ++ (3) The old class should be used for HDF5 >= 1.8.3 only if the + macro H5_USE_16_API is set + */ ++-#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 8 && (H5_VERS_RELEASE < 3 || !H5_USE_16_API)
+-#define H5PY_H5Z_NEWCLS 1 ++#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 8 ++#define H5PY_H5Z_NEWCLS 0++#elif H5_VERS_MAJOR == 1 && H5_VERS_MINOR >= 8 && H5_VERS_RELEASE >= 3 && H5_USE_16_API
++#define H5PY_H5Z_NEWCLS 0 + #else +-#define H5PY_H5Z_NEWCLS 0 ++#define H5PY_H5Z_NEWCLS 1 + #endif + + size_t lzf_filter(unsigned flags, size_t cd_nelmts,diff -Nru bitshuffle-0.5.1/debian/patches/series bitshuffle-0.5.1/debian/patches/series --- bitshuffle-0.5.1/debian/patches/series 2023-12-22 18:03:34.000000000 +0100 +++ bitshuffle-0.5.1/debian/patches/series 2024-08-16 21:57:44.000000000 +0200
@@ -3,3 +3,4 @@ 0003-link-with-libzstd.patch 0004-cython-and-setuptools-are-not-runtime-dependencies.patch 0005-remove-march-and-mcpu-to-avoid-FTBFS.patch +gcc14.patch
signature.asc
Description: OpenPGP digital signature
