From 17eaff59b6ca6fa69a60dbe557a8934fdd55ff7f Mon Sep 17 00:00:00 2001 From: leot Date: Thu, 21 Apr 2016 08:13:50 +0000 Subject: Update graphics/py-Pillow to 3.2.0 pkgsrc changes: o Simplify MASTER_SITES o Add LICENSE o Disable the tests for now (that were also broken for 3.1.2 version). All the modules are builded in build/lib.*/PIL/ while selftest.py just checks in PIL/. Manually cp(1)-ing all the build/lib.*/PIL/ files in PIL/ work as a workaround (and all test are passed) although implementing a similar (distutils.cmd) logic will be easily buggy. Changes: 3.2.0 (2016-04-01) ------------------ - Added install docs for Fedora 23 and FreeBSD #1729, #1739, #1792 [koobs, zandermartin, wiredfool] - Fixed TIFF multiframe load when the frames have different compression types #1782 [radarhere, geka000] - Added __copy__ method to Image #1772 [radarhere] - Updated dates in PIL license in OleFileIO README #1787 [radarhere] - Corrected Tiff tag names #1786 [radarhere] - Fixed documented name of JPEG property #1783 [radarhere] - Fixed UnboundLocalErrorwhen loading a corrupt jpeg2k file #1780 [wiredfool] - Fixed integer overflow in path.c #1773 [wiredfool, nedwill] - Added debug to command line help text for pilprint #1766 [radarhere] - Expose many more fields in ICC Profiles #1756 [lambdafu] - Documentation changes, URL update, transpose, release checklist [radarhere] - Fixed saving to nonexistant files specified by pathlib.Path objects, fixes #1747 [radarhere] - Round Image.crop arguments to the nearest integer, fixes #1744 [hugovk] - Fix uninitialized variable warning in _imaging.c:getink, fixes #486 [wiredfool] - Disable multiprocessing install on cygwin, fixes #1690 [wiredfool] - Fix the error reported when libz is not found #1764 [wiredfool] - More general error check to avoid Symbol not found: _PyUnicodeUCS2_AsLatin1String on OS X #1761 [wiredfool] - Added py35 to tox envlist #1724 [radarhere] - Fix EXIF tag name typos #1736 [zarlant, radarhere] - Updated freetype to 2.6.3, Tk/Tcl to 8.6.5 and 8.5.19 [radarhere] - Add a loader for the FTEX format from Independence War 2: Edge of Chaos #1688 [jleclanche] - Improved alpha_composite documentation #1698 [radarhere] - Extend ImageDraw.text method to pass on multiline_text method specific arguments #1647 [radarhere] - Allow ImageSequence to seek to zero #1686 [radarhere] - ImageSequence Iterator is now an iterator #1649 [radarhere] - Updated windows test builds to jpeg9b [radarhere] - Fixed support for .gbr version 1 images, added support for version 2 in GbrImagePlugin #1653 [wiredfool] - Clarified which YCbCr format is used #1677 [radarhere] - Added TiffTags documentation, Moved windows build documentation to winbuild/ #1667 [wiredfool] - Add tests for OLE file based formats #1678 [radarhere] - Add TIFF IFD test #1671 [radarhere] - Add a basic DDS image plugin with more tests #1654 [jleclanche, hugovk, wiredfool] - Fix incorrect conditional in encode.c #1638 [manisandro] --- graphics/py-Pillow/Makefile | 15 ++++++++++----- graphics/py-Pillow/PLIST | 18 ++++++++++++------ graphics/py-Pillow/distinfo | 12 ++++++------ graphics/py-Pillow/patches/patch-setup.py | 25 +++++++++++++------------ 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile index 325e39e37cb..3e38c25aedc 100644 --- a/graphics/py-Pillow/Makefile +++ b/graphics/py-Pillow/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.24 2016/04/12 16:31:36 adam Exp $ +# $NetBSD: Makefile,v 1.25 2016/04/21 08:13:50 leot Exp $ -DISTNAME= Pillow-3.1.2 +DISTNAME= Pillow-3.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= graphics python -MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/} +MASTER_SITES= ${MASTER_SITE_PYPI} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://python-pillow.github.io/ COMMENT= Python Imaging Library (Fork) +LICENSE= hpnd CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* @@ -23,8 +24,12 @@ SUBST_SED.fix-path+= -e 's,TIFF_ROOT = None,TIFF_ROOT = _lib_include("${BUILDLIN SUBST_SED.fix-path+= -e 's,FREETYPE_ROOT = None,FREETYPE_ROOT = _lib_include("${BUILDLINK_PREFIX.freetype2}"),' SUBST_SED.fix-path+= -e 's,LCMS_ROOT = None,LCMS_ROOT = _lib_include("${BUILDLINK_PREFIX.lcms2}"),' -do-test: - ${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py +# XXX: (automatically) testing Pillow fails because it is builded on a +# separate directory (build/lib.*/PIL/). Manually cp(1) all the files to PIL/ +# fixes that (but implementing a similar distutils.cmd logic here can easily +# leads to a buggy one). Disable the test for now. +#do-test: +# ${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/graphics/py-Pillow/PLIST b/graphics/py-Pillow/PLIST index 7bfea78b8db..17d915f3dd7 100644 --- a/graphics/py-Pillow/PLIST +++ b/graphics/py-Pillow/PLIST @@ -1,9 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2015/10/18 15:47:10 adam Exp $ -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt -${PYSITELIB}/${EGG_INFODIR}/zip-safe +@comment $NetBSD: PLIST,v 1.9 2016/04/21 08:13:50 leot Exp $ ${PYSITELIB}/PIL/BdfFontFile.py ${PYSITELIB}/PIL/BdfFontFile.pyc ${PYSITELIB}/PIL/BdfFontFile.pyo @@ -22,6 +17,9 @@ ${PYSITELIB}/PIL/CurImagePlugin.pyo ${PYSITELIB}/PIL/DcxImagePlugin.py ${PYSITELIB}/PIL/DcxImagePlugin.pyc ${PYSITELIB}/PIL/DcxImagePlugin.pyo +${PYSITELIB}/PIL/DdsImagePlugin.py +${PYSITELIB}/PIL/DdsImagePlugin.pyc +${PYSITELIB}/PIL/DdsImagePlugin.pyo ${PYSITELIB}/PIL/EpsImagePlugin.py ${PYSITELIB}/PIL/EpsImagePlugin.pyc ${PYSITELIB}/PIL/EpsImagePlugin.pyo @@ -40,6 +38,9 @@ ${PYSITELIB}/PIL/FontFile.pyo ${PYSITELIB}/PIL/FpxImagePlugin.py ${PYSITELIB}/PIL/FpxImagePlugin.pyc ${PYSITELIB}/PIL/FpxImagePlugin.pyo +${PYSITELIB}/PIL/FtexImagePlugin.py +${PYSITELIB}/PIL/FtexImagePlugin.pyc +${PYSITELIB}/PIL/FtexImagePlugin.pyo ${PYSITELIB}/PIL/GbrImagePlugin.py ${PYSITELIB}/PIL/GbrImagePlugin.pyc ${PYSITELIB}/PIL/GbrImagePlugin.pyo @@ -269,3 +270,8 @@ ${PYSITELIB}/PIL/_webp.so ${PYSITELIB}/PIL/features.py ${PYSITELIB}/PIL/features.pyc ${PYSITELIB}/PIL/features.pyo +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/${EGG_INFODIR}/zip-safe diff --git a/graphics/py-Pillow/distinfo b/graphics/py-Pillow/distinfo index cd0105f0d21..f0a2e075dfe 100644 --- a/graphics/py-Pillow/distinfo +++ b/graphics/py-Pillow/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2016/04/12 16:31:36 adam Exp $ +$NetBSD: distinfo,v 1.19 2016/04/21 08:13:50 leot Exp $ -SHA1 (Pillow-3.1.2.tar.gz) = d7d00e04e79e08fe259995a662987e34dd5d11bb -RMD160 (Pillow-3.1.2.tar.gz) = 8e1c43c19af076fa75478d2c1de269ab701cfa26 -SHA512 (Pillow-3.1.2.tar.gz) = 82c14dacd49b041d7f2fed4acd9ab1d422d49bab8e6af78e90c5d8b1e987b833a19198ba74fe964ed0e4aa2bb0c2516c3b43fee443b388c0f467038396c187ce -Size (Pillow-3.1.2.tar.gz) = 10131238 bytes -SHA1 (patch-setup.py) = c4a3eae74db27f58a6d2c52114b3be13daf4207a +SHA1 (Pillow-3.2.0.tar.gz) = 5381cdd06dc00a86b0221110c768d7b49c27dc56 +RMD160 (Pillow-3.2.0.tar.gz) = 939da559db631891347adbeb27c81b531b9dd602 +SHA512 (Pillow-3.2.0.tar.gz) = 3ce55370a63fa2edd8b471f81aa7696f39d02a4a171d5f1f44cc19a31eb670e311e7f7aee166604958ed8817a890115bf6c783099747cabc311cac8ac7e03f79 +Size (Pillow-3.2.0.tar.gz) = 10306543 bytes +SHA1 (patch-setup.py) = 00c18f45f50cd88e39aa57f2c5ec1db59fde1b15 diff --git a/graphics/py-Pillow/patches/patch-setup.py b/graphics/py-Pillow/patches/patch-setup.py index c5490e71967..68f438136a1 100644 --- a/graphics/py-Pillow/patches/patch-setup.py +++ b/graphics/py-Pillow/patches/patch-setup.py @@ -1,14 +1,15 @@ -$NetBSD: patch-setup.py,v 1.5 2015/10/18 15:47:10 adam Exp $ +$NetBSD: patch-setup.py,v 1.6 2016/04/21 08:13:50 leot Exp $ * Prevent to detect optional tkinter. * Disable demo programs. ---- setup.py.orig 2015-10-01 15:27:21.000000000 +0000 +--- setup.py.orig 2016-04-01 13:10:57.000000000 +0000 +++ setup.py -@@ -82,11 +82,7 @@ def _lib_include(root): +@@ -80,12 +80,7 @@ def _lib_include(root): def _read(file): return open(file, 'rb').read() +- -try: - import _tkinter -except (ImportError, OSError): @@ -16,13 +17,13 @@ $NetBSD: patch-setup.py,v 1.5 2015/10/18 15:47:10 adam Exp $ - _tkinter = None +_tkinter = None - NAME = 'Pillow' -@@ -760,7 +756,6 @@ setup( - ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], - include_package_data=True, - packages=find_packages(), -- scripts=glob.glob("Scripts/*.py"), - test_suite='nose.collector', - keywords=["Imaging", ], - license='Standard PIL License', + PILLOW_VERSION = '3.2.0' +@@ -760,7 +755,6 @@ setup(name=NAME, + ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], + include_package_data=True, + packages=find_packages(), +- scripts=glob.glob("Scripts/*.py"), + test_suite='nose.collector', + keywords=["Imaging", ], + license='Standard PIL License', -- cgit v1.2.3