[arch-commits] Commit in libmatio/repos (8 files)
Evgeniy Alekseev
arcanis at archlinux.org
Tue Apr 12 13:27:39 UTC 2016
Date: Tuesday, April 12, 2016 @ 15:27:39
Author: arcanis
Revision: 170693
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
libmatio/repos/community-staging-i686/
libmatio/repos/community-staging-i686/ChangeLog
(from rev 170692, libmatio/trunk/ChangeLog)
libmatio/repos/community-staging-i686/PKGBUILD
(from rev 170692, libmatio/trunk/PKGBUILD)
libmatio/repos/community-staging-i686/hdf5-1.10.patch
(from rev 170692, libmatio/trunk/hdf5-1.10.patch)
libmatio/repos/community-staging-x86_64/
libmatio/repos/community-staging-x86_64/ChangeLog
(from rev 170692, libmatio/trunk/ChangeLog)
libmatio/repos/community-staging-x86_64/PKGBUILD
(from rev 170692, libmatio/trunk/PKGBUILD)
libmatio/repos/community-staging-x86_64/hdf5-1.10.patch
(from rev 170692, libmatio/trunk/hdf5-1.10.patch)
------------------------------------------+
community-staging-i686/ChangeLog | 8 ++++
community-staging-i686/PKGBUILD | 37 ++++++++++++++++++
community-staging-i686/hdf5-1.10.patch | 57 +++++++++++++++++++++++++++++
community-staging-x86_64/ChangeLog | 8 ++++
community-staging-x86_64/PKGBUILD | 37 ++++++++++++++++++
community-staging-x86_64/hdf5-1.10.patch | 57 +++++++++++++++++++++++++++++
6 files changed, 204 insertions(+)
Copied: libmatio/repos/community-staging-i686/ChangeLog (from rev 170692, libmatio/trunk/ChangeLog)
===================================================================
--- community-staging-i686/ChangeLog (rev 0)
+++ community-staging-i686/ChangeLog 2016-04-12 13:27:39 UTC (rev 170693)
@@ -0,0 +1,8 @@
+1.5.6-2:
+rebuild against the newest hdf5
+
+1.5.6-1:
+upstream update
+
+1.5.2-3:
+move from AUR to [community]
Copied: libmatio/repos/community-staging-i686/PKGBUILD (from rev 170692, libmatio/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-04-12 13:27:39 UTC (rev 170693)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
+# Contributor: Alexander Rødseth <rodseth at gmail dot com>
+# Contributor: William Rea <sillywilly at gmail dot com>
+
+pkgname=libmatio
+pkgver=1.5.6
+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')
+url='http://sourceforge.net/projects/matio'
+depends=('zlib' 'hdf5')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/matio/matio-${pkgver}.tar.gz"
+ "hdf5-1.10.patch")
+changelog=ChangeLog
+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
+ make
+}
+
+package() {
+ cd "matio-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Copied: libmatio/repos/community-staging-i686/hdf5-1.10.patch (from rev 170692, libmatio/trunk/hdf5-1.10.patch)
===================================================================
--- community-staging-i686/hdf5-1.10.patch (rev 0)
+++ community-staging-i686/hdf5-1.10.patch 2016-04-12 13:27:39 UTC (rev 170693)
@@ -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);
Copied: libmatio/repos/community-staging-x86_64/ChangeLog (from rev 170692, libmatio/trunk/ChangeLog)
===================================================================
--- community-staging-x86_64/ChangeLog (rev 0)
+++ community-staging-x86_64/ChangeLog 2016-04-12 13:27:39 UTC (rev 170693)
@@ -0,0 +1,8 @@
+1.5.6-2:
+rebuild against the newest hdf5
+
+1.5.6-1:
+upstream update
+
+1.5.2-3:
+move from AUR to [community]
Copied: libmatio/repos/community-staging-x86_64/PKGBUILD (from rev 170692, libmatio/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-04-12 13:27:39 UTC (rev 170693)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
+# Contributor: Alexander Rødseth <rodseth at gmail dot com>
+# Contributor: William Rea <sillywilly at gmail dot com>
+
+pkgname=libmatio
+pkgver=1.5.6
+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')
+url='http://sourceforge.net/projects/matio'
+depends=('zlib' 'hdf5')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/matio/matio-${pkgver}.tar.gz"
+ "hdf5-1.10.patch")
+changelog=ChangeLog
+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
+ make
+}
+
+package() {
+ cd "matio-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Copied: libmatio/repos/community-staging-x86_64/hdf5-1.10.patch (from rev 170692, libmatio/trunk/hdf5-1.10.patch)
===================================================================
--- community-staging-x86_64/hdf5-1.10.patch (rev 0)
+++ community-staging-x86_64/hdf5-1.10.patch 2016-04-12 13:27:39 UTC (rev 170693)
@@ -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);
More information about the arch-commits
mailing list