From 5cae6217d05d0fde3ce94adaf865a68640a7af75 Mon Sep 17 00:00:00 2001 From: Martin Lambers Date: Fri, 25 Jan 2013 23:17:26 +0100 Subject: [PATCH] update package matio --- index.html | 2 +- src/matio-1-portability.patch | 14 ++++++++++++++ src/matio.mk | 10 ++++------ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 src/matio-1-portability.patch diff --git a/index.html b/index.html index 37dd9ca4..24edf47b 100644 --- a/index.html +++ b/index.html @@ -1628,7 +1628,7 @@ USE_OSGPLUGIN(<plugin2>) matio - 1.3.4 + 1.5.0 matio diff --git a/src/matio-1-portability.patch b/src/matio-1-portability.patch new file mode 100644 index 00000000..8949ab84 --- /dev/null +++ b/src/matio-1-portability.patch @@ -0,0 +1,14 @@ +This file is part of MXE. +See index.html for further information. + +--- a/src/matio_private.h 2013-01-25 22:56:35.791936384 +0100 ++++ b/src/matio_private.h 2013-01-25 22:56:48.915937755 +0100 +@@ -60,7 +60,7 @@ + * @endif + */ + struct _mat_t { +- void *fp; /**< File pointer for the MAT file */ ++ FILE *fp; /**< File pointer for the MAT file */ + char *header; /**< MAT File header string */ + char *subsys_offset; /**< offset */ + char *filename; /**< Filename of the MAT file */ diff --git a/src/matio.mk b/src/matio.mk index 68064e53..366d470c 100644 --- a/src/matio.mk +++ b/src/matio.mk @@ -3,11 +3,11 @@ PKG := matio $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 721b9b57f2437850dd114acca1f422622e2c47e2 +$(PKG)_CHECKSUM := b2e4f5524a9d7ce1fb268a67bb5b1a7427d047d4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib +$(PKG)_DEPS := gcc zlib hdf5 define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/matio/files/matio/' | \ @@ -19,9 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ - --disable-test \ - --disable-docs + --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef