From b467587f7b0fd41c79ea3beac5e5730b2aa0efa1 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mar 11 2017 15:09:10 +0000 Subject: Update to 1.11.3 Drop patch for bigendian, it is now included upstream. --- diff --git a/.gitignore b/.gitignore index 58c62b3..814edca 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /blosc-1.9.3.tar.gz /blosc-1.10.1.tar.gz /blosc-1.11.1.tar.gz +/blosc-1.11.3.tar.gz diff --git a/blosc-1.1x-bigendian.patch b/blosc-1.1x-bigendian.patch deleted file mode 100644 index eda88b5..0000000 --- a/blosc-1.1x-bigendian.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up c-blosc-1.11.1/blosc/CMakeLists.txt.orig c-blosc-1.11.1/blosc/CMakeLists.txt ---- c-blosc-1.11.1/blosc/CMakeLists.txt.orig 2016-11-07 05:34:30.052213005 -0500 -+++ c-blosc-1.11.1/blosc/CMakeLists.txt 2016-11-07 05:34:53.972629666 -0500 -@@ -161,6 +161,14 @@ if(COMPILER_SUPPORT_AVX2) - APPEND PROPERTY COMPILE_DEFINITIONS SHUFFLE_AVX2_ENABLED) - endif(COMPILER_SUPPORT_AVX2) - -+INCLUDE(TestBigEndian) -+TEST_BIG_ENDIAN(BIGENDIAN) -+IF(BIGENDIAN) -+ set_property( -+ SOURCE bitshuffle-generic.c -+ APPEND PROPERTY COMPILE_DEFINITIONS BSHUF_BIGENDIAN) -+ENDIF(BIGENDIAN) -+ - # When the option has been selected to compile the test suite, - # compile an additional version of blosc_shared which exports - # some normally-hidden symbols (to facilitate unit testing). -diff -up c-blosc-1.11.1/blosc/bitshuffle-generic.h.orig c-blosc-1.11.1/blosc/bitshuffle-generic.h ---- c-blosc-1.11.1/blosc/bitshuffle-generic.h.orig 2016-11-07 05:33:19.340981310 -0500 -+++ c-blosc-1.11.1/blosc/bitshuffle-generic.h 2016-11-07 05:34:16.881983597 -0500 -@@ -39,7 +39,14 @@ extern "C" { - - /* Transpose 8x8 bit array packed into a single quadword *x*. - * *t* is workspace. */ -+#ifdef BSHUF_BIGENDIAN -+# include -+# define BSWAP_64(x) x = bswap_64(x) -+#else -+# define BSWAP_64(x) -+#endif - #define TRANS_BIT_8X8(x, t) { \ -+ BSWAP_64(x); \ - t = (x ^ (x >> 7)) & 0x00AA00AA00AA00AALL; \ - x = x ^ t ^ (t << 7); \ - t = (x ^ (x >> 14)) & 0x0000CCCC0000CCCCLL; \ diff --git a/blosc.spec b/blosc.spec index e20de37..4f761ba 100644 --- a/blosc.spec +++ b/blosc.spec @@ -1,15 +1,15 @@ Summary: A high performance compressor optimized for binary data Name: blosc -Version: 1.11.1 -Release: 3%{?dist} +Version: 1.11.3 +Release: 1%{?dist} License: MIT Source: https://github.com/Blosc/c-blosc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz URL: https://github.com/Blosc/c-blosc -Patch1: blosc-1.1x-bigendian.patch BuildRequires: cmake BuildRequires: lz4-devel BuildRequires: snappy-devel BuildRequires: zlib-devel +BuildRequires: libzstd-devel %description Blosc is a compression library designed to transmit data to the processor @@ -45,6 +45,9 @@ sed -i '1i set\(CMAKE_SKIP_RPATH true\)' bench/CMakeLists.txt # Fix cmake detection of pthreads sed -i '1i set\(CMAKE_POSITION_INDEPENDENT_CODE TRUE\)' CMakeLists.txt +# https://github.com/Blosc/c-blosc/issues/190 +sed -i 's|lib/pkgconfig|%{_lib}/pkgconfig|' CMakeLists.txt + # Add python shebang and permission sed -i '1i #!/usr/bin/python' bench/plot-speeds.py @@ -92,6 +95,7 @@ install -p bench/plot-speeds.py %{buildroot}/%{_bindir}/%{name}-plot-times %files devel %{_libdir}/libblosc.so +%{_libdir}/pkgconfig/blosc.pc %{_includedir}/blosc.h %{_includedir}/blosc-export.h @@ -102,11 +106,16 @@ install -p bench/plot-speeds.py %{buildroot}/%{_bindir}/%{name}-plot-times %changelog +* Sat Mar 11 2017 Zbigniew Jędrzejewski-Szmek - 1.11.3-1 +- Update to latest version +- Build against external zstd +- A pkgconfig file is now provided + * Fri Feb 10 2017 Fedora Release Engineering - 1.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild * Mon Nov 07 2016 Than Ngo - 1.11.1-2 -- fix the bigendian issue which causes build failure in PyTables (bz#1379123) +- Fix the bigendian issue which causes build failure in PyTables (bz#1379123) * Sun Nov 6 2016 Orion Poplawski - 1.11.1-1 - Update to 1.11.1 (#1361777) diff --git a/sources b/sources index 212a5aa..2aaf2d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e236550640afa50155f3881f2d300206 blosc-1.11.1.tar.gz +SHA512 (blosc-1.11.3.tar.gz) = 6d2afa00e75265f550fbdf2dbeb5a51e32afd2de8ef181bb5616f569e59e72e994b2ab0e69e97ed66d6be73ae9874752e8a555df15eabffd3abebfe8a0ef768f