[arch-commits] Commit in libmatio/trunk (ChangeLog PKGBUILD hdf5-1.10.patch)

[Evgeniy Alekseev]

    Date: Tuesday, April 12, 2016 @ 15:27:15
  Author: arcanis
Revision: 170692

upgpkg: libmatio 1.5.6-2
rebuild against the newest hdf5

Added:
  libmatio/trunk/hdf5-1.10.patch
Modified:
  libmatio/trunk/ChangeLog
  libmatio/trunk/PKGBUILD

-----------------+
 ChangeLog       |    3 ++
 PKGBUILD        |   13 +++++++++---
 hdf5-1.10.patch |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2016-04-12 13:25:43 UTC (rev 170691)
+++ ChangeLog	2016-04-12 13:27:15 UTC (rev 170692)
@@ -1,3 +1,6 @@
+1.5.6-2:
+rebuild against the newest hdf5
+
 1.5.6-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-12 13:25:43 UTC (rev 170691)
+++ PKGBUILD	2016-04-12 13:27:15 UTC (rev 170692)
@@ -6,7 +6,7 @@
 
 pkgname=libmatio
 pkgver=1.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc='C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files'
 arch=('x86_64' 'i686')
 license=('custom:BSD')
@@ -13,10 +13,17 @@
 url='http://sourceforge.net/projects/matio'
 depends=('zlib' 'hdf5')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/matio/matio-${pkgver}.tar.gz")
+source=("http://downloads.sourceforge.net/matio/matio-${pkgver}.tar.gz"
+        "hdf5-1.10.patch")
 changelog=ChangeLog
-md5sums=('bb53fd06f7ebb74589e9dd684b1b66a6')
+md5sums=('bb53fd06f7ebb74589e9dd684b1b66a6'
+         '7f1793012c3093851cbfad38f213d3fd')
 
+prepare() {
+  # update for newest hdf5
+  patch -p0 -i "hdf5-1.10.patch"
+}
+
 build() {
   cd "matio-${pkgver}"
   ./configure --prefix=/usr --enable-shared --with-hdf5

Added: hdf5-1.10.patch
===================================================================
--- hdf5-1.10.patch	                        (rev 0)
+++ hdf5-1.10.patch	2016-04-12 13:27:15 UTC (rev 170692)
@@ -0,0 +1,57 @@
+diff -ruN matio-1.5.6.orig/src/mat73.c matio-1.5.6/src/mat73.c
+--- matio-1.5.6.orig/src/mat73.c	2016-04-12 16:19:26.714810306 +0300
++++ matio-1.5.6/src/mat73.c	2016-04-12 16:20:03.509186059 +0300
+@@ -607,7 +607,7 @@
+                 cells[i] = Mat_VarCalloc();
+                 cells[i]->internal->hdf5_ref = ref_ids[i];
+                 /* Closing of ref_id is done in Mat_H5ReadNextReferenceInfo */
+-                ref_id = H5Rdereference(dset_id,H5R_OBJECT,ref_ids+i);
++                ref_id = H5Rdereference1(dset_id,H5R_OBJECT,ref_ids+i);
+                 cells[i]->internal->id = ref_id;
+                 cells[i]->internal->fp = matvar->internal->fp;
+                 Mat_H5ReadNextReferenceInfo(ref_id,cells[i],mat);
+@@ -902,7 +902,7 @@
+                         /* Closing of ref_id is done in
+                          * Mat_H5ReadNextReferenceInfo
+                          */
+-                        ref_id = H5Rdereference(field_id,H5R_OBJECT,
++                        ref_id = H5Rdereference1(field_id,H5R_OBJECT,
+                                                 ref_ids+l);
+                         fields[l*nfields+k]->internal->id=ref_id;
+                         Mat_H5ReadNextReferenceInfo(ref_id,fields[l*nfields+k],mat);
+@@ -1073,7 +1073,7 @@
+                         cells[i] = Mat_VarCalloc();
+                         cells[i]->internal->hdf5_ref = ref_ids[i];
+                         /* Closing of ref_id is done in Mat_H5ReadNextReferenceInfo */
+-                        ref_id = H5Rdereference(dset_id,H5R_OBJECT,ref_ids+i);
++                        ref_id = H5Rdereference1(dset_id,H5R_OBJECT,ref_ids+i);
+                         cells[i]->internal->id=ref_id;
+                         cells[i]->internal->fp=matvar->internal->fp;
+                         Mat_H5ReadNextReferenceInfo(ref_id,cells[i],mat);
+@@ -2273,7 +2273,7 @@
+                 H5Iinc_ref(ref_id);
+             }
+             if ( 0 < matvar->internal->hdf5_ref ) {
+-                dset_id = H5Rdereference(ref_id,H5R_OBJECT,&matvar->internal->hdf5_ref);
++                dset_id = H5Rdereference1(ref_id,H5R_OBJECT,&matvar->internal->hdf5_ref);
+             } else {
+                 dset_id = ref_id;
+                 H5Iinc_ref(dset_id);
+@@ -2526,7 +2526,7 @@
+                 H5Iinc_ref(ref_id);
+             }
+             if ( 0 < matvar->internal->hdf5_ref ) {
+-                dset_id = H5Rdereference(ref_id,H5R_OBJECT,&matvar->internal->hdf5_ref);
++                dset_id = H5Rdereference1(ref_id,H5R_OBJECT,&matvar->internal->hdf5_ref);
+             } else {
+                 dset_id = ref_id;
+                 H5Iinc_ref(dset_id);
+@@ -2842,7 +2842,7 @@
+                         /* Closing of ref_id is done in
+                          * Mat_H5ReadNextReferenceInfo
+                          */
+-                        ref_id = H5Rdereference(dset_id,H5R_OBJECT,ref_ids+i);
++                        ref_id = H5Rdereference1(dset_id,H5R_OBJECT,ref_ids+i);
+                         cells[i]->internal->id=ref_id;
+                         cells[i]->internal->fp=matvar->internal->fp;
+                         Mat_H5ReadNextReferenceInfo(ref_id,cells[i],mat);