Hello community, here is the log from the commit of package matio for openSUSE:Factory checked in at 2016-08-10 19:55:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matio (Old) and /work/SRC/openSUSE:Factory/.matio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "matio" Changes: -------- --- /work/SRC/openSUSE:Factory/matio/matio.changes 2016-07-09 09:25:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.matio.new/matio.changes 2016-08-10 19:55:32.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 5 08:09:01 UTC 2016 - [email protected] + +- Add matio-hdf5_110-support.patch to fix support for + hdf5 >= 1.10; patch taken from upstream git (gh#tbeu/matio#37). +- Add matio-disable-failing-hdf5-tests.patch to disable "mat73" + tests that fail (apparently) due to bugs in hdf5 1.10 + (gh#tbeu/matio#41); patch touches autotool files, add + BuildRequires on libtool and run "autoreconf -fi" before + configure. + +------------------------------------------------------------------- New: ---- matio-disable-failing-hdf5-tests.patch matio-hdf5_110-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matio.spec ++++++ --- /var/tmp/diff_new_pack.sCjyiv/_old 2016-08-10 19:55:33.000000000 +0200 +++ /var/tmp/diff_new_pack.sCjyiv/_new 2016-08-10 19:55:33.000000000 +0200 @@ -24,9 +24,14 @@ Summary: Open-source library for reading and writing MATLAB MAT files License: BSD-2-Clause Group: System/Libraries +# PATCH-FIX-UPSTREAM matio-hdf5_110-support.patch gh#tbeu/matio#37 [email protected] -- Fix support for hdf5 >= 1.10; patch taken from upstream git +Patch0: matio-hdf5_110-support.patch +# PATCH-FIX-UPSTREAM matio-disable-failing-hdf5-tests.patch gh#tbeu/matio#41 [email protected] -- Disable tests that fail (apparently) because of bugs in hdf5 v1.10 +Patch1: matio-disable-failing-hdf5-tests.patch Url: http://sourceforge.net/projects/matio Source0: http://downloads.sourceforge.net/matio/%{name}-%{version}.tar.gz BuildRequires: hdf5-devel >= 1.8 +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel >= 1.2.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,8 +79,11 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +autoreconf -fi %configure \ --enable-shared \ --disable-static \ ++++++ matio-disable-failing-hdf5-tests.patch ++++++ Index: matio-1.5.8/test/Makefile.am =================================================================== --- matio-1.5.8.orig/test/Makefile.am +++ matio-1.5.8/test/Makefile.am @@ -354,11 +354,7 @@ TEST_DATAFILES = $(srcdir)/datasets/mati $(srcdir)/results/write_struct_complex_2d_numeric-uint16.out \ $(srcdir)/results/write_struct_complex_2d_numeric-uint32.out \ $(srcdir)/results/write_struct_complex_2d_numeric-uint64.out -if MAT73 -MAT73 = 1 -else MAT73 = 0 -endif if HAVE_ZLIB COMPRESSION_ZLIB = 1 ++++++ matio-hdf5_110-support.patch ++++++ >From e387271d20f902d4f65fa1352898f12a789b1161 Mon Sep 17 00:00:00 2001 From: tbeu <[email protected]> Date: Wed, 3 Aug 2016 17:39:55 +0200 Subject: [PATCH] Update support for HDF5 v1.10 * No longer use deprecated (v1.8) function H5Rdereference1 but use function H5Rdereference2 (v1.10) * Update build note for HDF5 v1.10 * See https://github.com/tbeu/matio/issues/37 --- README.md | 2 +- src/mat73.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7697d16..8f19ec3 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ To support compressed MAT files, zlib 1.2.3 or greater is required. The zlib sof Support for MAT file version 7.3 requires the HDF5 library. This library can be downloaded from https://www.hdfgroup.org/. Matio requires HDF5 version ≥ 1.8.x. Neither deprecated HDF5 1.6.x API functions nor HDF5 higher-level functions are called. * Building matio with HDF5 1.8.x requires configuration of HDF5 with default API version 1.8 (i.e. `--with-default-api-version=v18`). -* Building matio with HDF5 1.10.x requires configuration of HDF5 with either default API version 1.10 (i.e. `--with-default-api-version=v110`) and enabled legacy API functions (i.e. `--enable-deprecated-symbols=yes`) or configuration of HDF5 with deprecated API version 1.8 (i.e. `--with-default-api-version=v18`). +* Building matio with HDF5 1.10.x requires configuration of HDF5 with either default API version 1.10 (i.e. `--with-default-api-version=v110`) or with deprecated API version 1.8 (i.e. `--with-default-api-version=v18`). For Windows, the pre-compiled binaries can be used which also include a DLL of zlib to satisfy the zlib dependency. diff --git a/src/mat73.c b/src/mat73.c index 2f20177..beaf609 100644 --- a/src/mat73.c +++ b/src/mat73.c @@ -72,9 +72,11 @@ struct h5_read_group_info_iter_data { }; #if defined(H5Rdereference) -#define H5RDEREFERENCE H5Rdereference1 +/* HDF5 1.10.0 */ +#define H5RDEREFERENCE(obj_id, ref_type, _ref) H5Rdereference2((obj_id), H5P_DATASET_ACCESS_DEFAULT, (ref_type), (_ref)) #else -#define H5RDEREFERENCE H5Rdereference +/* HDF5 prior to 1.10.0 */ +#define H5RDEREFERENCE(obj_id, ref_type, _ref) H5Rdereference((obj_id), (ref_type), (_ref)) #endif /*===========================================================================
