diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/py-pillow/package.py')
-rw-r--r-- | var/spack/repos/builtin/packages/py-pillow/package.py | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 3b54ee32ae..2bce199940 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -1,27 +1,8 @@ -############################################################################## -# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. # -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/spack/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack import * import sys @@ -33,17 +14,10 @@ class PyPillow(PythonPackage): capabilities.""" homepage = "https://python-pillow.org/" - url = "https://pypi.io/packages/source/P/Pillow/Pillow-3.0.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') + url = "https://pypi.io/packages/source/P/Pillow/Pillow-5.1.0.tar.gz" - version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510', preferred=True) + version('5.1.0', '308f9c13b376abce96ab6ebd6c889cc4') + version('3.2.0', '7cfd093c11205d9e2ebe3c51dfcad510') version('3.0.0', 'fc8ac44e93da09678eac7e30c9b7377d') provides('pil') @@ -54,8 +28,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 +67,8 @@ class PyPillow(PythonPackage): 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', |