Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zfp for openSUSE:Factory checked in at 2022-10-10 18:47:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zfp (Old) and /work/SRC/openSUSE:Factory/.zfp.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zfp" Mon Oct 10 18:47:03 2022 rev:2 rq:1008946 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/zfp/zfp.changes 2020-08-13 10:26:27.426898587 +0200 +++ /work/SRC/openSUSE:Factory/.zfp.new.2275/zfp.changes 2022-10-10 18:47:28.879246678 +0200 @@ -1,0 +2,10 @@ +Sat Oct 1 02:55:45 UTC 2022 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Update to version 1.0.0 + https://github.com/LLNL/zfp/releases/tag/1.0.0 +- Fix incorrect libm check when LTO is enabled, add + fix_math_check.patch +- Fix compilation on ILP32 archs, add + 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch + +------------------------------------------------------------------- Old: ---- zfp-0.5.5.tar.gz New: ---- 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch fix_math_check.patch zfp-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zfp.spec ++++++ --- /var/tmp/diff_new_pack.sBZZne/_old 2022-10-10 18:47:29.407247825 +0200 +++ /var/tmp/diff_new_pack.sBZZne/_new 2022-10-10 18:47:29.411247834 +0200 @@ -1,7 +1,7 @@ # # spec file for package zfp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,23 @@ # -%define major 0 -%define minor 5 +%define major 1 +%define minor 0 %define libname libzfp%{major} Name: zfp -Version: %{major}.%{minor}.5 +Version: %{major}.%{minor}.0 Release: 0 Summary: Read and write numerical arrays License: BSD-3-Clause Group: Productivity/Archiving/Compression -URL: https://github.com/LLNL/zfp -Source0: https://github.com/LLNL/zfp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: https://computing.llnl.gov/projects/zfp +Source0: https://github.com/LLNL/zfp/releases/download/1.0.0/zfp-1.0.0.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: https://github.com/LLNL/zfp/commit/6d7d2424ed082eb41d696036b26831636650a614.patch#/fix_math_check.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch BuildRequires: cmake BuildRequires: gcc-c++ -ExcludeArch: i586 %description Library for compressed numerical arrays that support high @@ -54,7 +57,7 @@ Development package for zfp. %prep -%autosetup +%autosetup -p1 %build %cmake @@ -69,6 +72,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %ctest +%files +%{_bindir}/zfp + %files -n %{libname} %{_libdir}/lib%{name}.so.%{version} %{_libdir}/lib%{name}.so.%{major} @@ -77,6 +83,7 @@ %doc README.md %license LICENSE %{_includedir}/*.h +%{_includedir}/*.hpp %{_includedir}/zfp/ %{_libdir}/lib%{name}.so %{_libdir}/cmake/zfp/ ++++++ 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch ++++++ >From c6b630d84833d20dcbf1bae7c218ba17a6610fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sat, 1 Oct 2022 05:39:05 +0200 Subject: [PATCH] Fix 64 bit integer types on 32 bit archs In case the code is built with C89 on Linux LP32, 64 bit integers should be defined as long long types. limits.h can be used to differentiate between LP64 and LP32. --- include/zfp/internal/zfp/types.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/zfp/internal/zfp/types.h b/include/zfp/internal/zfp/types.h index b209f37..a51260b 100644 --- a/include/zfp/internal/zfp/types.h +++ b/include/zfp/internal/zfp/types.h @@ -55,6 +55,7 @@ typedef unsigned long ulong; typedef int64_t int64; typedef uint64_t uint64; #else + #include <limits.h> /* C89: assume common integer types */ typedef signed char int8; typedef unsigned char uint8; @@ -69,9 +70,11 @@ typedef unsigned long ulong; #if defined(_WIN32) || defined(_WIN64) /* assume ILP32 or LLP64 (MSVC, MinGW) */ #define ZFP_LLP64 1 - #else + #elif ULONG_MAX > UINT_MAX /* assume LP64 (Linux, macOS, ...) */ #define ZFP_LP64 1 + #else + #define ZFP_LP32 1 #endif /* concatenation for literal suffixes */ @@ -89,7 +92,7 @@ typedef unsigned long ulong; #define INT64PRId "ld" #define INT64PRIi "li" typedef signed long int64; - #elif ZFP_LLP64 + #elif ZFP_LLP64 || ZFP_LP32 #define INT64C(x) x ## ll #define INT64PRId "lld" #define INT64PRIi "lli" @@ -115,7 +118,7 @@ typedef unsigned long ulong; #define UINT64PRIu "lu" #define UINT64PRIx "lx" typedef unsigned long uint64; - #elif ZFP_LLP64 + #elif ZFP_LLP64 || ZFP_LP32 #define UINT64C(x) x ## ull #define UINT64PRIo "llo" #define UINT64PRIu "llu" -- 2.37.3 ++++++ fix_math_check.patch ++++++ >From 6d7d2424ed082eb41d696036b26831636650a614 Mon Sep 17 00:00:00 2001 From: lindstro <p...@llnl.gov> Date: Wed, 10 Aug 2022 13:35:59 -0700 Subject: [PATCH] Prevent LTO in libm dependency check (resolves #169) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d0615aca..27d21f810 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,10 +257,10 @@ list(APPEND ppm_private_defs PPM_CHROMA=${PPM_CHROMA}) # Link libm only if necessary include(CheckCSourceCompiles) -check_c_source_compiles("#include<math.h>\nfloat f; int main(){sqrt(f);return 0;}" HAVE_MATH) +check_c_source_compiles("#include<math.h>\nint main(int n,char*v[]){return sqrt(n);}" HAVE_MATH) if(NOT HAVE_MATH) set(CMAKE_REQUIRED_LIBRARIES m) - check_c_source_compiles("#include<math.h>\nfloat f; int main(){sqrt(f);return 0;}" HAVE_LIBM_MATH) + check_c_source_compiles("#include<math.h>\nint main(int n,char*v[]){return sqrt(n);}" HAVE_LIBM_MATH) unset(CMAKE_REQUIRED_LIBRARIES) if(NOT HAVE_LIBM_MATH) message(FATAL_ERROR "Unable to use C math library functions (with or without -lm)") ++++++ zfp-0.5.5.tar.gz -> zfp-1.0.0.tar.gz ++++++ ++++ 34834 lines of diff (skipped)
