diff --git a/.gitignore b/.gitignore index 63b753c..07746ab 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ matio-1.3.4.tar.gz /matio-1.5.2.tar.gz /matio-1.5.3.tar.gz /matio-1.5.7.tar.gz +/matio-1.5.14.tar.gz diff --git a/matio-1.5.7-endian.patch b/matio-1.5.7-endian.patch deleted file mode 100644 index 26684e9..0000000 --- a/matio-1.5.7-endian.patch +++ /dev/null @@ -1,100 +0,0 @@ -From edbb802ae3dc21f316487e04f043c1707dd85461 Mon Sep 17 00:00:00 2001 -From: tbeu -Date: Thu, 30 Jun 2016 00:18:33 +0200 -Subject: [PATCH] Fix writing of byteswap indicator to v4 MAT file - -As reported by https://sourceforge.net/p/matio/bugs/36/ ---- - src/mat4.c | 54 +++++++++++++++++++++++++++--------------------------- - 1 file changed, 27 insertions(+), 27 deletions(-) - -diff --git a/src/mat4.c b/src/mat4.c -index bba1e7e..559c789 100644 ---- a/src/mat4.c -+++ b/src/mat4.c -@@ -56,31 +56,6 @@ Mat_Create4(const char* matname) - { - FILE *fp = NULL; - mat_t *mat = NULL; -- int byteswap; -- --#if defined(__GLIBC__) --#if (__BYTE_ORDER == __LITTLE_ENDIAN) -- byteswap = 0; --#elif (__BYTE_ORDER == __BIG_ENDIAN) -- byteswap = 1; --#else -- return NULL; --#endif --#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) -- byteswap = 1; --#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) -- byteswap = 0; --#elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || \ -- defined(__ppc__) || defined(__hpux) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) -- byteswap = 1; --#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || \ -- defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || \ -- defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || \ -- defined(_M_X64) || defined(__bfin__) -- byteswap = 0; --#else -- return NULL; --#endif - - fp = fopen(matname,"w+b"); - if ( !fp ) -@@ -97,7 +72,7 @@ Mat_Create4(const char* matname) - mat->subsys_offset = NULL; - mat->fp = fp; - mat->version = MAT_FT_MAT4; -- mat->byteswap = byteswap; -+ mat->byteswap = 0; - mat->bof = 0; - mat->next_index = 0; - mat->refs_id = -1; -@@ -132,10 +107,35 @@ Mat_VarWrite4(mat_t *mat,matvar_t *matvar) - - mat_int32_t nmemb = 1, i; - Fmatrix x; -+ int byteswap; - - if ( NULL == mat || NULL == matvar || NULL == matvar->name || matvar->rank != 2 ) - return -1; - -+#if defined(__GLIBC__) -+#if (__BYTE_ORDER == __LITTLE_ENDIAN) -+ byteswap = 0; -+#elif (__BYTE_ORDER == __BIG_ENDIAN) -+ byteswap = 1; -+#else -+ return NULL; -+#endif -+#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) -+ byteswap = 1; -+#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) -+ byteswap = 0; -+#elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || \ -+ defined(__ppc__) || defined(__hpux) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) -+ byteswap = 1; -+#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || \ -+ defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || \ -+ defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || \ -+ defined(_M_X64) || defined(__bfin__) -+ byteswap = 0; -+#else -+ return -1; -+#endif -+ - /* FIXME: SEEK_END is not Guaranteed by the C standard */ - (void)fseek((FILE*)mat->fp,0,SEEK_END); /* Always write at end of file */ - -@@ -162,7 +162,7 @@ Mat_VarWrite4(mat_t *mat,matvar_t *matvar) - return 2; - } - -- if ( mat->byteswap ) -+ if ( byteswap ) - x.type += 1000; - - x.namelen = (mat_int32_t)strlen(matvar->name) + 1; diff --git a/matio.spec b/matio.spec index ab25e85..8e8c87d 100644 --- a/matio.spec +++ b/matio.spec @@ -1,13 +1,11 @@ Name: matio -Version: 1.5.7 -Release: 10%{?dist} +Version: 1.5.14 +Release: 1%{?dist} Summary: Library for reading/writing Matlab MAT files License: BSD URL: http://sourceforge.net/projects/matio Source0: http://downloads.sourceforge.net/matio/matio-%{version}.tar.gz -# https://sourceforge.net/p/matio/bugs/36/ -Patch0: %{name}-1.5.7-endian.patch BuildRequires: doxygen #According to the README - zlib 1.2.2 is possible but require a patch @@ -38,7 +36,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .endian %build @@ -77,7 +74,7 @@ export LD_LIBRARY_PATH=%{_builddir}/%{?buildsubdir}/src/.libs/ ; make check %files %license COPYING -%doc NEWS README.md +%doc NEWS README %{_bindir}/matdump %{_libdir}/*.so.* @@ -89,6 +86,9 @@ export LD_LIBRARY_PATH=%{_builddir}/%{?buildsubdir}/src/.libs/ ; make check %changelog +* Sat Mar 16 2019 Orion Poplawski - 1.5.14-1 +- Update to 1.5.14 + * Fri Feb 01 2019 Fedora Release Engineering - 1.5.7-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e27218e..97dc7ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -736f37808842a0f2a2344cb5543cde18 matio-1.5.7.tar.gz +SHA512 (matio-1.5.14.tar.gz) = 528eb8a3dfa35dd001b54ac4c26042b2cee525186b8b7c78bc6e56c6f6e648015b3fb0f8784627c10da140e3d0f3b18760689f53e25e4466e1eca06c720e2499