[pytables] 09/11: Use system compression libs

[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 8def0c2dedf898133cc17214782fde153f58be7c
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Jan 19 17:18:22 2014 +0000

    Use system compression libs
---
 debian/changelog                                   |  2 ++
 .../patches/0002-Use-system-compression-libs.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4855885..563f889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ pytables (3.1.0-1) UNRELEASED; urgency=low
     - removed 0003-disable-extended-float-support.patch no more
       necessary
     - remaining patches have been refreshed
+    - new patch (0002-Use-system-compression-libs.patch) to use
+      system compression libraries instead of internal copies
   * debian/control
     - add build dependencies form liblz4-dev and snappy-dev 
 
diff --git a/debian/patches/0002-Use-system-compression-libs.patch b/debian/patches/0002-Use-system-compression-libs.patch
new file mode 100644
index 0000000..96d4935
--- /dev/null
+++ b/debian/patches/0002-Use-system-compression-libs.patch
@@ -0,0 +1,35 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 19 Jan 2014 17:13:17 +0000
+Subject: Use system compression libs
+
+Now Blosc supports different compressors (fastlz, zlib, snappy and lz4).
+This patch enables the use of system libraries rather then the internal
+copies bundled with blosc itself.
+---
+ setup.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4bb28ce..6fe9c02 100755
+--- a/setup.py
++++ b/setup.py
+@@ -724,14 +724,15 @@ if 'BLOSC' not in optional_libs:
+     # Blosc + BloscLZ sources
+     blosc_files += glob.glob('c-blosc/blosc/*.c')
+     # LZ4 sources
+-    blosc_files += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
++    #blosc_files += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
+     # Snappy sources
+-    blosc_files += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
++    #blosc_files += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
+     # Zlib sources
+-    blosc_files += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
++    #blosc_files += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
++    ADDLIBS.extend(['lz4', 'snappy', 'z'])
+     # Finally, add all the include dirs...
+     inc_dirs += [os.path.join('c-blosc', 'blosc')]
+-    inc_dirs += glob.glob('c-blosc/internal-complibs/*')
++    #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
+     # ...and the macros for all the compressors supported
+     def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1)]
+     # Add -msse2 flag for optimizing shuffle in include Blosc
diff --git a/debian/patches/series b/debian/patches/series
index 537d922..7e7c3c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-use-dynamic-lib.patch
+0002-Use-system-compression-libs.patch

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