Skip to content
Snippets Groups Projects
Commit 7f0af6e4 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by Anthony Mallet
Browse files

[wip/matio] update to v1.5.26

Changes in v1.5.26:

     Fixed testsuite (regression of v1.5.25)

Changes in v1.5.25:

    Fixed reading struct array with null padded class name from HDF5 MAT file
    Fixed memory leak in Mat_VarFree for function class
    CMake: Silence MSVC compiler warnings

Changes in v1.5.24:

    Added predicated iteration API functions Mat_VarReadNextInfoPredicate and Mat_VarReadNextPredicate to speed-up reading variables from HDF5 MAT file (contributed by @Ri0n)
    Added new API function Mat_GetFileAccessMode to retrieve the file access mode of a MAT file
    Changed: Mat_VarDelete returns error if MAT file is opened in read-only mode
    Changed: Reduced memory foot-print of matvar_t.internal
    Fixed read performance of cell/struct array from HDF5 MAT file
    Fixed reference counting of HDF5 MAT file in Mat_VarDuplicate
    Fixed file access mode of created v4 MAT file
    Fixed read performance of Mat_GetDir for HDF5 MAT file
    Fixed bug reading struct array from v5 MAT file (contributed by @Ri0n)
    Fixed bug adding field to struct array of v5 MAT file (contributed by @Ri0n)
    Fixed heap-based buffer overflow when reading HDF5 MAT file (contributed by by @sashashura)
    Confirmed compatibility with HDF5 v1.14.x
    autoconf: Enabled system extensions (contributed by @fweimer)
    autoconf: Fixed getopt_long check (contributed by by @niclasr)
    autoconf: Fixed pkg-config file for static linking
    CMake: Updated cmake-conan to version 0.18.1
    CMake: Fixed version comparison (contributed by @nim65s)
    CMake: Fixed properties for CMake < 3.11 (contributed by @nim65s)
    CMake: Fixed linker error on OpenBSD
    CMake: Fixed checks of linker options (contributed by @MaartenBent)
    Several other fixes, for example for memory leaks

Packaging changes:

    removed patches 191 & 192, applied upstream
parent 6b3b5276
No related branches found
No related tags found
No related merge requests found
......@@ -4,8 +4,7 @@
ORG= tbeu
NAME= matio
VERSION= 1.5.23
PKGREVISION= 1
VERSION= 1.5.26
DISTNAME= ${NAME}-${VERSION}
GITHUB_RELEASE= v${VERSION}
......
......@@ -4,4 +4,4 @@ include/matio.h
include/matio_pubconf.h
lib/libmatio.so
lib/libmatio.so.11
lib/libmatio.so.11.0.4
lib/libmatio.so.11.1.1
......@@ -11,11 +11,10 @@ endif
ifeq (+,$(MATIO_DEPEND_MK)) # ------------------------------------------
# TODO: system is available, we just need to install it on the buildfarm
PREFER.matio?= robotpkg
# system is available. TODO: check it's ok everywhere and remove this pkg
PREFER.matio?= system
SYSTEM_SEARCH.matio=\
'bin/matdump' \
'include/matio_pubconf.h:/MATIO_VERSION_STR /s/[^0-9.]//gp' \
'lib/libmatio.so'
......
SHA1 (matio-1.5.23.tar.gz) = 5a5893462cf00eb3c138a825cb52fa09de17a43b
RMD160 (matio-1.5.23.tar.gz) = ebb38fa95f4512345b58cb774a55eaf29fdb6f1d
Size (matio-1.5.23.tar.gz) = 10115808 bytes
SHA1 (patch-191) = e7876da97d7ffd13b12dd520b9048b29317ec0a4
SHA1 (patch-192) = 9064224f0fc98dca8413f76214ff97a064b1681f
SHA1 (matio-1.5.26.tar.gz) = c9b93a3c7ca39a6684d5796971a69776013c5220
RMD160 (matio-1.5.26.tar.gz) = 9f038621212c902bd2fc0efcc63de548d6ba1596
Size (matio-1.5.26.tar.gz) = 10122705 bytes
From 383c1e80fd5ad8721638ed26509732e8c4dbb9eb Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 27 Sep 2022 13:09:22 +0200
Subject: [PATCH] fix CMake properties
---
cmake/thirdParties.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/thirdParties.cmake b/cmake/thirdParties.cmake
index 0b3652f7..ae8b4ce3 100644
--- cmake/thirdParties.cmake
+++ cmake/thirdParties.cmake
@@ -68,7 +68,7 @@ endif()
macro(matio_create_zlib target)
add_library(MATIO::ZLIB INTERFACE IMPORTED)
- target_link_libraries(MATIO::ZLIB INTERFACE ${target})
+ set_target_properties(MATIO::ZLIB PROPERTIES INTERFACE_LINK_LIBRARIES ${target})
set(ZLIB_FOUND TRUE)
endmacro()
From 327ddbe8918632953f171cb9eacd8d4597e88d11 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 27 Sep 2022 18:43:40 +0200
Subject: [PATCH] CMake: fix version comparison
---
cmake/compilerOptions.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/compilerOptions.cmake b/cmake/compilerOptions.cmake
index f097dafe..3b832325 100644
--- cmake/compilerOptions.cmake
+++ cmake/compilerOptions.cmake
@@ -89,7 +89,7 @@ check_c_source_compiles("${TEST_CODE_THOUSANDS_SEP}" HAVE_STRUCT_LCONV_THOUSANDS
set(USE_GNU_LINK_FLAGS 0)
set(USE_LLVM_MACOS_LINK_FLAGS 0)
if (NOT MSVC)
- if(${CMAKE_VERSION} GREATER "3.17")
+ if(${CMAKE_VERSION} VERSION_GREATER "3.17")
include(CheckLinkerFlag)
check_linker_flag(C "-Wl,--no-undefined" HAVE_LINK_NO_UNDEFINED)
check_linker_flag(C "-Wl,-undefined,error" HAVE_LINK_UNDEFINED_ERROR)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment