[pytables] 10/14: Use packaged blosc library

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pytables.

commit 48f52e8a79863974ffed65fcf055fa9db1c18984
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Oct 31 13:13:20 2016 +0000

    Use packaged blosc library
---
 debian/changelog                           |  1 +
 debian/control                             |  1 +
 debian/patches/0006-Use-system-blosc.patch | 32 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 4 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8400fe8..891a327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pytables (3.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Use packaged blosc library
   * debian/watch
     - add compatibility to the new tagging schema
   * debian/patches
diff --git a/debian/control b/debian/control
index 9b33434..0139574 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 9.0.0),
                cython3-dbg,
                zlib1g-dev,
                liblzo2-dev,
+               libblosc-dev,
                liblz4-dev (>= 0.0~r122),
                libsnappy-dev,
                libbz2-dev,
diff --git a/debian/patches/0006-Use-system-blosc.patch b/debian/patches/0006-Use-system-blosc.patch
new file mode 100644
index 0000000..7c79997
--- /dev/null
+++ b/debian/patches/0006-Use-system-blosc.patch
@@ -0,0 +1,32 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 31 Oct 2016 13:16:45 +0000
+Subject: Use system blosc
+
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 6d0fbae..1e35645 100755
+--- a/setup.py
++++ b/setup.py
+@@ -773,8 +773,8 @@ blosc_sources = ["hdf5-blosc/src/blosc_filter.c"]
+ if 'BLOSC' not in optional_libs:
+     # Compiling everything from sources
+     # Blosc + BloscLZ sources
+-    blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
+-                      if 'avx2' not in f and 'sse2' not in f]
++    #blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
++    #                  if 'avx2' not in f and 'sse2' not in f]
+     # LZ4 sources
+     #blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
+     # Snappy sources
+@@ -785,7 +785,7 @@ if 'BLOSC' not in optional_libs:
+     #blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
+     ADDLIBS.extend(['lz4', 'snappy', 'zstd', 'z'])
+     # Finally, add all the include dirs...
+-    inc_dirs += [os.path.join('c-blosc', 'blosc')]
++    #inc_dirs += [os.path.join('c-blosc', 'blosc')]
+     #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
+     #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
+     #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
diff --git a/debian/patches/series b/debian/patches/series
index 692ccbc..f37b082 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Never-use-the-msse2-flag-explicitly.patch
 0004-Do-not-fetch-icons-for-external-web-sites.patch
 0005-fix-compatibility-with-HDF5-1.10.patch
+0006-Use-system-blosc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git