update to py-Pillow 3.3.1

This commit is contained in:
sthen 2016-09-04 10:53:40 +00:00
parent 46daba2c62
commit 466de4ccf8
4 changed files with 9 additions and 34 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2016/04/02 14:03:58 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2016/09/04 10:53:40 sthen Exp $
COMMENT= Python Imaging Library (maintained fork of PIL)
MODPY_EGG_VERSION= 3.2.0
MODPY_EGG_VERSION= 3.3.1
DISTNAME= Pillow-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= graphics
@ -38,6 +38,8 @@ LIB_DEPENDS= graphics/lcms2 \
${MODTK_LIB_DEPENDS}
MODPY_SETUPTOOLS= Yes
MAKE_ENV= C_INCLUDE_PATH="${X11BASE}/include:${LOCALBASE}/include:${MODTK_INCDIR}:${MODTCL_INCDIR}" \
LIBRARY_PATH="${X11BASE}/lib:${LOCALBASE}/lib"
MODPY_ADJ_FILES= Scripts/*.py

View File

@ -1,2 +1,2 @@
SHA256 (Pillow-3.2.0.zip) = zETFS0MrJ8WePQvASKWnWBsTlEwUxWyUY0z+jV6rreU=
SIZE (Pillow-3.2.0.zip) = 10529195
SHA256 (Pillow-3.3.1.zip) = zaZZ4vBYYuvALpmVPuXMHnK6/epoJ6I8eeaqFlx6NwI=
SIZE (Pillow-3.3.1.zip) = 10809658

View File

@ -1,29 +0,0 @@
$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]
+ TK_VERSION = _tkinter.TK_VERSION[:3]
+ _add_directory(include_dirs,
+ os.path.join(os.getenv("LOCALBASE"),
+ "include/tcl%s" % TCL_VERSION))
+ _add_directory(include_dirs,
+ os.path.join(os.getenv("LOCALBASE"),
+ "include/tk%s" % TK_VERSION))
if _tkinter and not TCL_ROOT:
# we have Tkinter but the TCL_ROOT variable was not set;
@@ -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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2016/04/02 14:03:58 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2016/09/04 10:53:41 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]
@ -194,6 +194,7 @@ lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}XbmImagePlugin.${MO
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}XpmImagePlugin.${MODPY_PYC_MAGIC_TAG}pyc
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}_tkinter_finder.${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
@ -203,6 +204,7 @@ lib/python${MODPY_VERSION}/site-packages/PIL/_imagingft.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingmath.so
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/_tkinter_finder.py
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