zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-pillow : update version and fix jpeg dependency (#8300)

Browse Source 
* 	modified:   package.py

* as requested.
This commit is contained in:
Sajid Ali 2018-05-28 20:15:18 -05:00 committed by Adam J. Stewart
parent 627df0bcc1
commit 80564fae5d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
var/spack/repos/builtin/packages/py-pillow/package.py
View File

@ -33,17 +33,10 @@ class PyPillow(PythonPackage):
capabilities."""
homepage = "https://python-pillow.org/"
url = "https://pypi.io/packages/source/P/Pillow/Pillow-3.0.0.tar.gz"
url = "https://pypi.io/packages/source/P/Pillow/Pillow-5.1.0.tar.gz"
# TODO: This version should be deleted once the next release comes out.
# TODO: It fixes a bug that prevented us from linking to Tk/Tcl.
# TODO: Tk/Tcl support is necessary for tkinter bitmap and photo images.
# TODO: If you require this support, run the following command:
# TODO: `spack install py-pillow@3.3.0.dev0 ^python+tk`
version('3.3.0.dev0', git='https://github.com/python-pillow/Pillow.git',
commit='30eced62868141a6c859a4370efd40b9434a7c3f')
version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510', preferred=True)
version('5.1.0', '04d2b1d1ce8b9f6831e33fb85b34316d')
version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510')
version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d')
provides('pil')
@ -54,8 +47,7 @@ class PyPillow(PythonPackage):
variant('tiff', default=False, description='Access to TIFF files')
variant('freetype', default=False, description='Font related services')
variant('lcms', default=False, description='Color management')
variant('jpeg2000', default=False,
description='Provide JPEG 2000 functionality')
variant('jpeg2000', default=False, description='Provide JPEG 2000 functionality')
# Spack does not (yet) support these modes of building
# variant('webp', default=False, description='Provide the WebP format')
@ -94,8 +86,8 @@ def patch(self):
if '+jpeg' in spec:
setup.filter('JPEG_ROOT = None',
'JPEG_ROOT = ("{0}", "{1}")'.format(
spec['jpeg'].prefix.lib,
'JPEG_ROOT=("{0}","{1}")'.format(
spec['jpeg'].libs.directories[0],
spec['jpeg'].prefix.include))
if '+zlib' in spec:
setup.filter('ZLIB_ROOT = None',