update to py-Pillow 3.1.1
This commit is contained in:
sthen
parent
99d5f42fce
commit
71a1704724
@ -1,14 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2016/02/02 23:08:40 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2016/03/01 01:02:30 sthen Exp $
|
||||
|
||||
COMMENT= Python Imaging Library (fork)
|
||||
|
||||
MODPY_EGG_VERSION= 2.8.1
|
||||
MODPY_EGG_VERSION= 3.1.1
|
||||
DISTNAME= Pillow-${MODPY_EGG_VERSION}
|
||||
PKGNAME= py-${DISTNAME}
|
||||
CATEGORIES= graphics
|
||||
REVISION= 1
|
||||
|
||||
HOMEPAGE= http://python-pillow.github.io/
|
||||
HOMEPAGE= http://python-pillow.org/
|
||||
|
||||
# PIL Software License
|
||||
# Permission to use, copy, modify and distribute freely.
|
||||
@ -46,9 +45,6 @@ SUBST_VARS+= INCL_DIR MODPY_FLAVOR
|
||||
INCL_DIR= ${MODPY_INCDIR:S/${LOCALBASE}\///}
|
||||
|
||||
post-install:
|
||||
for s in ${WRKSRC}/Scripts/*.py; do \
|
||||
${INSTALL_SCRIPT} $$s ${PREFIX}/bin/`basename $$s .py`; \
|
||||
done
|
||||
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_INCDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/libImaging/{ImPlatform,Imaging}.h ${WRKINST}${MODPY_INCDIR}
|
||||
.if ${FLAVOR:Mpython3}
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Pillow-2.8.1.zip) = Q2O1JSfCY+d/WxjD3//RWuRU7fDERXGX7L4phjplGTg=
|
||||
SIZE (Pillow-2.8.1.zip) = 9275663
|
||||
SHA256 (Pillow-3.1.1.zip) = 54SxqfxUroinFxrvYKOMLsDcRj8GZpF2XRF0jgFM4qA=
|
||||
SIZE (Pillow-3.1.1.zip) = 10351808
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-libImaging_PcdDecode_c,v 1.1 2016/02/02 23:08:40 sthen Exp $
|
||||
|
||||
From ae453aa18b66af54e7ff716f4ccb33adca60afd4 Mon Sep 17 00:00:00 2001
|
||||
From: wiredfool <eric-github@soroos.net>
|
||||
Date: Tue, 2 Feb 2016 05:46:26 -0800
|
||||
Subject: [PATCH] PCD decoder overruns the shuffle buffer, Fixes #568
|
||||
|
||||
--- libImaging/PcdDecode.c.orig Tue Feb 2 23:05:01 2016
|
||||
+++ libImaging/PcdDecode.c Tue Feb 2 23:05:20 2016
|
||||
@@ -47,7 +47,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state,
|
||||
out[0] = ptr[x];
|
||||
out[1] = ptr[(x+4*state->xsize)/2];
|
||||
out[2] = ptr[(x+5*state->xsize)/2];
|
||||
- out += 4;
|
||||
+ out += 3;
|
||||
}
|
||||
|
||||
state->shuffle((UINT8*) im->image[state->y],
|
||||
@@ -62,7 +62,7 @@ ImagingPcdDecode(Imaging im, ImagingCodecState state,
|
||||
out[0] = ptr[x+state->xsize];
|
||||
out[1] = ptr[(x+4*state->xsize)/2];
|
||||
out[2] = ptr[(x+5*state->xsize)/2];
|
||||
- out += 4;
|
||||
+ out += 3;
|
||||
}
|
||||
|
||||
state->shuffle((UINT8*) im->image[state->y],
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-setup_py,v 1.5 2015/06/05 14:26:22 sthen Exp $
|
||||
--- setup.py.orig Thu Apr 2 11:05:22 2015
|
||||
+++ setup.py Fri Jun 5 11:54:21 2015
|
||||
@@ -312,6 +312,13 @@ class pil_build_ext(build_ext):
|
||||
$OpenBSD: patch-setup_py,v 1.6 2016/03/01 01:02:30 sthen Exp $
|
||||
--- setup.py.orig Thu Feb 4 08:30:14 2016
|
||||
+++ setup.py Sun Feb 28 21:18:38 2016
|
||||
@@ -320,6 +320,13 @@ class pil_build_ext(build_ext):
|
||||
|
||||
if _tkinter:
|
||||
TCL_VERSION = _tkinter.TCL_VERSION[:3]
|
||||
@ -15,32 +15,15 @@ $OpenBSD: patch-setup_py,v 1.5 2015/06/05 14:26:22 sthen Exp $
|
||||
|
||||
if _tkinter and not TCL_ROOT:
|
||||
# we have Tkinter but the TCL_ROOT variable was not set;
|
||||
@@ -352,6 +359,11 @@ class pil_build_ext(build_ext):
|
||||
@@ -359,6 +366,11 @@ class pil_build_ext(build_ext):
|
||||
|
||||
_add_directory(library_dirs, "/usr/lib")
|
||||
_add_directory(include_dirs, "/usr/include")
|
||||
|
||||
+
|
||||
+ _add_directory(library_dirs, os.path.join(os.getenv("LOCALBASE"), "lib"))
|
||||
+ _add_directory(include_dirs, os.path.join(os.getenv("LOCALBASE"), "include"))
|
||||
+ _add_directory(library_dirs, os.path.join(os.getenv("X11BASE"), "lib"))
|
||||
+ _add_directory(include_dirs, os.path.join(os.getenv("X11BASE"), "include"))
|
||||
+
|
||||
|
||||
# on Windows, look for the OpenJPEG libraries in the location that
|
||||
# the official installer puts them
|
||||
if sys.platform == "win32":
|
||||
@@ -547,7 +559,7 @@ class pil_build_ext(build_ext):
|
||||
if feature.freetype_version == 20:
|
||||
defs.append(("USE_FREETYPE_2_0", None))
|
||||
exts.append(Extension(
|
||||
- "PIL._imagingft", ["_imagingft.c"], libraries=["freetype"],
|
||||
+ "PIL._imagingft", ["_imagingft.c"], libraries=["freetype", "z"],
|
||||
define_macros=defs))
|
||||
|
||||
if os.path.isfile("_imagingtiff.c") and feature.tiff:
|
||||
@@ -753,7 +765,6 @@ setup(
|
||||
ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
|
||||
include_package_data=True,
|
||||
packages=find_packages(),
|
||||
- scripts=glob.glob("Scripts/pil*.py"),
|
||||
test_suite='nose.collector',
|
||||
keywords=["Imaging", ],
|
||||
license='Standard PIL License',
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2015/03/26 12:09:15 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2016/03/01 01:02:30 sthen Exp $
|
||||
@conflict py-Imaging-*
|
||||
@pkgpath graphics/py-Pillow,-main${MODPY_FLAVOR}
|
||||
@pkgpath graphics/py-Imaging,-bin[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@pkgpath graphics/py-Imaging,-docs[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@pkgpath graphics/py-Imaging,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@pkgpath graphics/py-Imaging,-main[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
bin/createfontdatachunk${MODPY_BIN_SUFFIX}
|
||||
bin/enhancer${MODPY_BIN_SUFFIX}
|
||||
bin/explode${MODPY_BIN_SUFFIX}
|
||||
bin/gifmaker${MODPY_BIN_SUFFIX}
|
||||
bin/painter${MODPY_BIN_SUFFIX}
|
||||
bin/pilconvert${MODPY_BIN_SUFFIX}
|
||||
bin/pildriver${MODPY_BIN_SUFFIX}
|
||||
bin/pilfile${MODPY_BIN_SUFFIX}
|
||||
bin/pilfont${MODPY_BIN_SUFFIX}
|
||||
bin/pilprint${MODPY_BIN_SUFFIX}
|
||||
bin/player${MODPY_BIN_SUFFIX}
|
||||
bin/thresholder${MODPY_BIN_SUFFIX}
|
||||
bin/viewer${MODPY_BIN_SUFFIX}
|
||||
bin/createfontdatachunk.py${MODPY_BIN_SUFFIX}
|
||||
bin/enhancer.py${MODPY_BIN_SUFFIX}
|
||||
bin/explode.py${MODPY_BIN_SUFFIX}
|
||||
bin/gifmaker.py${MODPY_BIN_SUFFIX}
|
||||
bin/painter.py${MODPY_BIN_SUFFIX}
|
||||
bin/pilconvert.py${MODPY_BIN_SUFFIX}
|
||||
bin/pildriver.py${MODPY_BIN_SUFFIX}
|
||||
bin/pilfile.py${MODPY_BIN_SUFFIX}
|
||||
bin/pilfont.py${MODPY_BIN_SUFFIX}
|
||||
bin/pilprint.py${MODPY_BIN_SUFFIX}
|
||||
bin/player.py${MODPY_BIN_SUFFIX}
|
||||
bin/thresholder.py${MODPY_BIN_SUFFIX}
|
||||
bin/viewer.py${MODPY_BIN_SUFFIX}
|
||||
${INCL_DIR}/ImPlatform.h
|
||||
${INCL_DIR}/Imaging.h
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/
|
||||
@ -51,7 +51,6 @@ lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw2.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageEnhance.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFile.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFileIO.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFilter.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFont.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.py
|
||||
@ -137,7 +136,6 @@ lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageDraw.${MODPY_P
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageDraw2.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageEnhance.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageFile.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageFileIO.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageFilter.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageFont.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}ImageGrab.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
@ -193,6 +191,7 @@ lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}XpmImagePlugin.${MO
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_binary.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}features.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_binary.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingcms.so
|
||||
@ -202,6 +201,7 @@ lib/python${MODPY_VERSION}/site-packages/PIL/_imagingmorph.so
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingtk.so
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_util.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/_webp.so
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/features.py
|
||||
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user