Changes 3.0.0: * Saving Multipage Images * Tiff ImageFileDirectory Rewrite * Deprecated Methods * LibJpeg and Zlib are Required by Defaultdiff -r1.19 -r1.20 pkgsrc/graphics/py-Pillow/Makefile
(adam)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2015/07/07 14:29:50 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2015/10/18 15:47:10 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= Pillow-2.9.0 | 3 | DISTNAME= Pillow-3.0.0 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
5 | CATEGORIES= graphics python | 5 | CATEGORIES= graphics python | |
6 | MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/} | 6 | MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/} | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://python-pillow.github.io/ | 9 | HOMEPAGE= http://python-pillow.github.io/ | |
10 | COMMENT= Python Imaging Library (Fork) | 10 | COMMENT= Python Imaging Library (Fork) | |
11 | 11 | |||
12 | CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* | 12 | CONFLICTS+= ${PYPKGPREFIX}-imaging-[0-9]* | |
13 | 13 | |||
14 | SUBST_CLASSES+= fix-path | 14 | SUBST_CLASSES+= fix-path | |
15 | SUBST_MESSAGE.fix-path= Fixing paths. | 15 | SUBST_MESSAGE.fix-path= Fixing paths. | |
16 | SUBST_STAGE.fix-path= pre-configure | 16 | SUBST_STAGE.fix-path= pre-configure |
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.7 2015/07/07 14:29:50 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.8 2015/10/18 15:47:10 adam Exp $ | |
2 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | 2 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | |
3 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | 3 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | |
4 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | 4 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | |
5 | ${PYSITELIB}/${EGG_INFODIR}/pbr.json | |||
6 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | 5 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | |
7 | ${PYSITELIB}/${EGG_INFODIR}/zip-safe | 6 | ${PYSITELIB}/${EGG_INFODIR}/zip-safe | |
8 | ${PYSITELIB}/PIL/BdfFontFile.py | 7 | ${PYSITELIB}/PIL/BdfFontFile.py | |
9 | ${PYSITELIB}/PIL/BdfFontFile.pyc | 8 | ${PYSITELIB}/PIL/BdfFontFile.pyc | |
10 | ${PYSITELIB}/PIL/BdfFontFile.pyo | 9 | ${PYSITELIB}/PIL/BdfFontFile.pyo | |
11 | ${PYSITELIB}/PIL/BmpImagePlugin.py | 10 | ${PYSITELIB}/PIL/BmpImagePlugin.py | |
12 | ${PYSITELIB}/PIL/BmpImagePlugin.pyc | 11 | ${PYSITELIB}/PIL/BmpImagePlugin.pyc | |
13 | ${PYSITELIB}/PIL/BmpImagePlugin.pyo | 12 | ${PYSITELIB}/PIL/BmpImagePlugin.pyo | |
14 | ${PYSITELIB}/PIL/BufrStubImagePlugin.py | 13 | ${PYSITELIB}/PIL/BufrStubImagePlugin.py | |
15 | ${PYSITELIB}/PIL/BufrStubImagePlugin.pyc | 14 | ${PYSITELIB}/PIL/BufrStubImagePlugin.pyc | |
16 | ${PYSITELIB}/PIL/BufrStubImagePlugin.pyo | 15 | ${PYSITELIB}/PIL/BufrStubImagePlugin.pyo | |
17 | ${PYSITELIB}/PIL/ContainerIO.py | 16 | ${PYSITELIB}/PIL/ContainerIO.py | |
18 | ${PYSITELIB}/PIL/ContainerIO.pyc | 17 | ${PYSITELIB}/PIL/ContainerIO.pyc | |
@@ -85,29 +84,26 @@ ${PYSITELIB}/PIL/ImageColor.pyc | @@ -85,29 +84,26 @@ ${PYSITELIB}/PIL/ImageColor.pyc | |||
85 | ${PYSITELIB}/PIL/ImageColor.pyo | 84 | ${PYSITELIB}/PIL/ImageColor.pyo | |
86 | ${PYSITELIB}/PIL/ImageDraw.py | 85 | ${PYSITELIB}/PIL/ImageDraw.py | |
87 | ${PYSITELIB}/PIL/ImageDraw.pyc | 86 | ${PYSITELIB}/PIL/ImageDraw.pyc | |
88 | ${PYSITELIB}/PIL/ImageDraw.pyo | 87 | ${PYSITELIB}/PIL/ImageDraw.pyo | |
89 | ${PYSITELIB}/PIL/ImageDraw2.py | 88 | ${PYSITELIB}/PIL/ImageDraw2.py | |
90 | ${PYSITELIB}/PIL/ImageDraw2.pyc | 89 | ${PYSITELIB}/PIL/ImageDraw2.pyc | |
91 | ${PYSITELIB}/PIL/ImageDraw2.pyo | 90 | ${PYSITELIB}/PIL/ImageDraw2.pyo | |
92 | ${PYSITELIB}/PIL/ImageEnhance.py | 91 | ${PYSITELIB}/PIL/ImageEnhance.py | |
93 | ${PYSITELIB}/PIL/ImageEnhance.pyc | 92 | ${PYSITELIB}/PIL/ImageEnhance.pyc | |
94 | ${PYSITELIB}/PIL/ImageEnhance.pyo | 93 | ${PYSITELIB}/PIL/ImageEnhance.pyo | |
95 | ${PYSITELIB}/PIL/ImageFile.py | 94 | ${PYSITELIB}/PIL/ImageFile.py | |
96 | ${PYSITELIB}/PIL/ImageFile.pyc | 95 | ${PYSITELIB}/PIL/ImageFile.pyc | |
97 | ${PYSITELIB}/PIL/ImageFile.pyo | 96 | ${PYSITELIB}/PIL/ImageFile.pyo | |
98 | ${PYSITELIB}/PIL/ImageFileIO.py | |||
99 | ${PYSITELIB}/PIL/ImageFileIO.pyc | |||
100 | ${PYSITELIB}/PIL/ImageFileIO.pyo | |||
101 | ${PYSITELIB}/PIL/ImageFilter.py | 97 | ${PYSITELIB}/PIL/ImageFilter.py | |
102 | ${PYSITELIB}/PIL/ImageFilter.pyc | 98 | ${PYSITELIB}/PIL/ImageFilter.pyc | |
103 | ${PYSITELIB}/PIL/ImageFilter.pyo | 99 | ${PYSITELIB}/PIL/ImageFilter.pyo | |
104 | ${PYSITELIB}/PIL/ImageFont.py | 100 | ${PYSITELIB}/PIL/ImageFont.py | |
105 | ${PYSITELIB}/PIL/ImageFont.pyc | 101 | ${PYSITELIB}/PIL/ImageFont.pyc | |
106 | ${PYSITELIB}/PIL/ImageFont.pyo | 102 | ${PYSITELIB}/PIL/ImageFont.pyo | |
107 | ${PYSITELIB}/PIL/ImageGrab.py | 103 | ${PYSITELIB}/PIL/ImageGrab.py | |
108 | ${PYSITELIB}/PIL/ImageGrab.pyc | 104 | ${PYSITELIB}/PIL/ImageGrab.pyc | |
109 | ${PYSITELIB}/PIL/ImageGrab.pyo | 105 | ${PYSITELIB}/PIL/ImageGrab.pyo | |
110 | ${PYSITELIB}/PIL/ImageMath.py | 106 | ${PYSITELIB}/PIL/ImageMath.py | |
111 | ${PYSITELIB}/PIL/ImageMath.pyc | 107 | ${PYSITELIB}/PIL/ImageMath.pyc | |
112 | ${PYSITELIB}/PIL/ImageMath.pyo | 108 | ${PYSITELIB}/PIL/ImageMath.pyo | |
113 | ${PYSITELIB}/PIL/ImageMode.py | 109 | ${PYSITELIB}/PIL/ImageMode.py |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2015/07/07 14:29:50 adam Exp $ | 1 | $NetBSD: distinfo,v 1.13 2015/10/18 15:47:10 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (Pillow-2.9.0.tar.gz) = fac0b2b2534385f34912ccdceafaeca4127dcdc1 | 3 | SHA1 (Pillow-3.0.0.tar.gz) = ab6959e090848590e910aaf1521d4a49ca79be3d | |
4 | RMD160 (Pillow-2.9.0.tar.gz) = 2904892f29065de0f42f561d6e0478d7aa68fec8 | 4 | RMD160 (Pillow-3.0.0.tar.gz) = 4bb60362d90dbcc4821fa008d5b01370eaac7261 | |
5 | Size (Pillow-2.9.0.tar.gz) = 9289617 bytes | 5 | SHA512 (Pillow-3.0.0.tar.gz) = 8b19e0a354f2feff69fa18ccb58d68df1eb9d374c9a8717c7315a741fc6cbbda679e5244211ec3e38d10bff330a0958950fa1e9d7ba7728d6dcf575026269e1f | |
6 | SHA1 (patch-setup.py) = f3f3d39906314f2ef925547ce634cb226d520ef5 | 6 | Size (Pillow-3.0.0.tar.gz) = 9621462 bytes | |
7 | SHA1 (patch-setup.py) = c4a3eae74db27f58a6d2c52114b3be13daf4207a |
@@ -1,37 +1,28 @@ | @@ -1,37 +1,28 @@ | |||
1 | $NetBSD: patch-setup.py,v 1.4 2015/04/17 15:10:02 adam Exp $ | 1 | $NetBSD: patch-setup.py,v 1.5 2015/10/18 15:47:10 adam Exp $ | |
2 | 2 | |||
3 | * Prevent to detect optional tkinter. | 3 | * Prevent to detect optional tkinter. | |
4 | * Disable demo programs. | 4 | * Disable demo programs. | |
5 | 5 | |||
6 | --- setup.py.orig 2015-04-02 09:05:22.000000000 +0000 | 6 | --- setup.py.orig 2015-10-01 15:27:21.000000000 +0000 | |
7 | +++ setup.py | 7 | +++ setup.py | |
8 | @@ -82,11 +82,7 @@ def _lib_include(root): | 8 | @@ -82,11 +82,7 @@ def _lib_include(root): | |
9 | def _read(file): | 9 | def _read(file): | |
10 | return open(file, 'rb').read() | 10 | return open(file, 'rb').read() | |
11 | 11 | |||
12 | -try: | 12 | -try: | |
13 | - import _tkinter | 13 | - import _tkinter | |
14 | -except (ImportError, OSError): | 14 | -except (ImportError, OSError): | |
15 | - # pypy emits an oserror | 15 | - # pypy emits an oserror | |
16 | - _tkinter = None | 16 | - _tkinter = None | |
17 | +_tkinter = None | 17 | +_tkinter = None | |
18 | 18 | |||
19 | 19 | |||
20 | NAME = 'Pillow' | 20 | NAME = 'Pillow' | |
21 | @@ -575,7 +571,7 @@ class pil_build_ext(build_ext): | 21 | @@ -760,7 +756,6 @@ setup( | |
22 | exts.append(Extension( | |||
23 | "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs)) | |||
24 | ||||
25 | - if sys.platform == "darwin": | |||
26 | + if _tkinter and sys.platform == "darwin": | |||
27 | # locate Tcl/Tk frameworks | |||
28 | frameworks = [] | |||
29 | framework_roots = [ | |||
30 | @@ -753,7 +749,6 @@ setup( | |||
31 | ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], | 22 | ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], | |
32 | include_package_data=True, | 23 | include_package_data=True, | |
33 | packages=find_packages(), | 24 | packages=find_packages(), | |
34 | - scripts=glob.glob("Scripts/pil*.py"), | 25 | - scripts=glob.glob("Scripts/*.py"), | |
35 | test_suite='nose.collector', | 26 | test_suite='nose.collector', | |
36 | keywords=["Imaging", ], | 27 | keywords=["Imaging", ], | |
37 | license='Standard PIL License', | 28 | license='Standard PIL License', |