From 7de694572a6e5649c6179819f75214ca8ab4821b Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Wed, 16 Oct 2024 12:53:00 +0200 Subject: [PATCH 1/3] Support hdf5 1.14.5 --- hdf5-sys/build.rs | 4 ++-- hdf5-sys/src/h5e.rs | 15 ++++++++++----- hdf5/build.rs | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hdf5-sys/build.rs b/hdf5-sys/build.rs index 5cb4238e..7725afcd 100644 --- a/hdf5-sys/build.rs +++ b/hdf5-sys/build.rs @@ -50,12 +50,12 @@ impl Debug for Version { } fn known_hdf5_versions() -> Vec { - // Keep up to date with known_versions in hdf5 + // Keep up to date with known_hdf5_versions in hdf5 let mut vs = Vec::new(); vs.extend((5..=21).map(|v| Version::new(1, 8, v))); // 1.8.[5-23] vs.extend((0..=8).map(|v| Version::new(1, 10, v))); // 1.10.[0-10] vs.extend((0..=2).map(|v| Version::new(1, 12, v))); // 1.12.[0-2] - vs.extend((0..=4).map(|v| Version::new(1, 14, v))); // 1.14.[0-4] + vs.extend((0..=5).map(|v| Version::new(1, 14, v))); // 1.14.[0-5] vs } diff --git a/hdf5-sys/src/h5e.rs b/hdf5-sys/src/h5e.rs index e5b38eb3..8e9399d3 100644 --- a/hdf5-sys/src/h5e.rs +++ b/hdf5-sys/src/h5e.rs @@ -86,6 +86,16 @@ extern "C" { pub fn H5Ecreate_msg(cls: hid_t, msg_type: H5E_type_t, msg: *const c_char) -> hid_t; pub fn H5Ecreate_stack() -> hid_t; pub fn H5Eget_current_stack() -> hid_t; + #[cfg(feature = "1.14.0")] + pub fn H5Eappend_stack( + dst_stack_id: hid_t, src_stack_id: hid_t, close_source_stack: hbool_t, + ) -> herr_t; + #[cfg(feature = "1.14.5")] + pub fn H5Eis_paused(stack_id: hid_t, is_paused: *mut hbool_t) -> herr_t; + #[cfg(feature = "1.14.5")] + pub fn H5Epause_stack(stack_id: hid_t) -> herr_t; + #[cfg(feature = "1.14.5")] + pub fn H5Eresume_stack(stack_id: hid_t) -> herr_t; pub fn H5Eclose_stack(stack_id: hid_t) -> herr_t; pub fn H5Eget_class_name(class_id: hid_t, name: *mut c_char, size: size_t) -> ssize_t; pub fn H5Eset_current_stack(err_stack_id: hid_t) -> herr_t; @@ -130,11 +140,6 @@ extern "C" { pub fn H5Eget_major(maj: H5E_major_t) -> *mut c_char; #[deprecated(note = "deprecated in HDF5 1.8.0")] pub fn H5Eget_minor(min: H5E_minor_t) -> *mut c_char; - - #[cfg(feature = "1.14.0")] - pub fn H5Eappend_stack( - dst_stack_id: hid_t, src_stack_id: hid_t, close_source_stack: hbool_t, - ) -> herr_t; } pub use self::globals::*; diff --git a/hdf5/build.rs b/hdf5/build.rs index bcdc99ba..eea9ddc0 100644 --- a/hdf5/build.rs +++ b/hdf5/build.rs @@ -19,7 +19,7 @@ fn known_hdf5_versions() -> Vec { vs.extend((5..=21).map(|v| Version::new(1, 8, v))); // 1.8.[5-23] vs.extend((0..=8).map(|v| Version::new(1, 10, v))); // 1.10.[0-10] vs.extend((0..=2).map(|v| Version::new(1, 12, v))); // 1.12.[0-2] - vs.extend((0..=4).map(|v| Version::new(1, 14, v))); // 1.14.[0-4] + vs.extend((0..=5).map(|v| Version::new(1, 14, v))); // 1.14.[0-5] vs } From 981425a4d16a4e75608a4c8267853d89e323fc03 Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Wed, 16 Oct 2024 12:57:36 +0200 Subject: [PATCH 2/3] Bundle hdf5 1.14.5 --- hdf5-src/ext/hdf5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5-src/ext/hdf5 b/hdf5-src/ext/hdf5 index 57948148..0fe0459f 160000 --- a/hdf5-src/ext/hdf5 +++ b/hdf5-src/ext/hdf5 @@ -1 +1 @@ -Subproject commit 57948148dbcb275c9a39212eebc62e071b11a00d +Subproject commit 0fe0459fc24d71be13d5f266513c2832b525671b From 0942dbc37ba8f3d3b20251ffb30efbbe5ecb4f15 Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Fri, 18 Oct 2024 09:12:12 +0200 Subject: [PATCH 3/3] Add to changelog --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ded757..f6d296cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,18 @@ # Changelog ## hdf5 unreleased -## hdf5-sys unreleased -## hdf5-src unreleased ## hdf5-derive unreleased ## hdf5-types unreleased +## hdf5-sys unreleased +- Fixed linking to libz +- Added support for hdf5 1.14.5 +- Removed implicit `libz-sys` feature (breaking change) + +## hdf5-src unreleased +- Fixed linking to libz +- Bumped bundled hdf5 to 1.14.5 + ## hdf5-derive v0.9.1 Release date: Sep 18, 2024.