py-pillow: Updated for variants, but still having trouble getting it to use Spack-supplied libjpeg.

1 files changed, 62 insertions, 1 deletions

diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py
index adc8507bd5..66d9bb4382 100644
--- a/var/spack/repos/builtin/packages/py-pillow/package.py
+++ b/var/spack/repos/builtin/packages/py-pillow/package.py
@@ -1,4 +1,5 @@
 from spack import *
+import os
 
 class PyPillow(Package):
     """Pillow is the friendly PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors. The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities."""
@@ -7,8 +8,68 @@ class PyPillow(Package):
     url      = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
 
     version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d')
+    provides('PIL')
+
+    # These defaults correspond to Pillow defaults
+    variant('jpeg', default=True, description='Provide JPEG functionality')
+    variant('zlib', default=True, description='Access to compressed PNGs')
+    variant('tiff', default=False, description='Access to TIFF files')
+    variant('freetype', default=False, description='Font related services')
+    variant('tk', default=False, description='Support for tkinter bitmap and photo images')
+    variant('lcms', default=False, description='Color management')
+
+    # Spack does not (yet) support these modes of building
+    # variant('webp', default=False, description='')
+    # variant('webpmux', default=False, description='')
+    # variant('jpeg2000', default=False, description='')
+
     extends('python')
+    depends_on('binutils')
     depends_on('py-setuptools')
 
+    depends_on('jpeg', when='+jpeg')   # BUG: It will use the system libjpeg anyway
+    depends_on('zlib', when='+zlib')
+    depends_on('tiff', when='+tiff')
+    depends_on('freetype', when='+freetype')
+    depends_on('lcms', when='+lcms')
+    depends_on('tcl', when='+tk')
+    depends_on('tk', when='+tk')
+
     def install(self, spec, prefix):
-        python('setup.py', 'install', '--prefix=%s' % prefix)
+        libpath=[]
+
+        if '+jpeg' in spec:
+            libpath.append(join_path(spec['jpeg'].prefix, 'lib'))
+        if '+zlib' in spec:
+            libpath.append(join_path(spec['zlib'].prefix, 'lib'))
+        if '+tiff' in spec:
+            libpath.append(join_path(spec['tiff'].prefix, 'lib'))
+        if '+freetype' in spec:
+            libpath.append(join_path(spec['freetype'].prefix, 'lib'))
+        if '+lcms' in spec:
+            libpath.append(join_path(spec['lcms'].prefix, 'lib'))
+
+        # This has not been tested, and likely needs some other treatment.
+        #if '+tk' in spec:
+        #    libpath.append(join_path(spec['tcl'].prefix, 'lib'))
+        #    libpath.append(join_path(spec['tk'].prefix, 'lib'))
+
+        # -------- Building
+        cmd = ['build_ext',
+            '--%s-jpeg' % ('enable' if '+jpeg' in spec else 'disable'),
+            '--%s-zlib' % ('enable' if '+zlib' in spec else 'disable'),
+            '--%s-tiff' % ('enable' if '+tiff' in spec else 'disable'),
+            '--%s-freetype' % ('enable' if '+freetype' in spec else 'disable'),
+            '--%s-lcms' % ('enable' if '+lcms' in spec else 'disable'),
+            '-L'+':'.join(libpath)    # NOTE: This does not make it find libjpeg
+            ]
+
+        #if '+tk' in spec:
+        #    cmd.extend(['--enable-tcl', '--enable-tk'])
+        #else:
+        #    cmd.extend(['--disable-tcl', '--disable-tk'])
+
+        # --------- Installation
+        cmd.extend(['install', '--prefix=%s' % prefix])
+
+        python('setup.py', *cmd)