cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to py-Pillow 2.4.0. Commits to move py-Imaging users over to py-Pillow will follow (words of encouragement from landry@)

Browse Source
This commit is contained in:
sthen 2014-04-06 21:10:19 +00:00
parent d3f9ee2dd3
commit 5218958b53
7 changed files with 76 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/py-Pillow/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2013/03/11 11:10:55 espie Exp $
# $OpenBSD: Makefile,v 1.3 2014/04/06 21:10:19 sthen Exp $
COMMENT= Python Imaging Library (fork)
MODPY_EGG_VERSION= 1.7.8
MODPY_EGG_VERSION= 2.4.0
DISTNAME= Pillow-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= graphics
@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/}
EXTRACT_SUFX= .zip
WANTLIB= freetype jpeg lcms pthread z \
WANTLIB= freetype jpeg lcms2 pthread tiff webp z \
${MODPY_WANTLIB} ${MODTK_WANTLIB}
MODULES= lang/python \
@ -25,13 +25,12 @@ MODULES= lang/python \
# ${MODPY_TKINTER_DEPENDS} appends ,tkinter to devel/setuptools too.
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= lang/python/${MODPY_VERSION},-tkinter
LIB_DEPENDS= graphics/lcms \
LIB_DEPENDS= graphics/lcms2 \
graphics/libwebp \
${MODTK_LIB_DEPENDS}
MODPY_SETUPTOOLS= Yes
NO_TEST= Yes
INCL_DIR= ${PREFIX}/include/python${MODPY_VERSION}
MODPY_ADJ_FILES= Scripts/*.py
@ -43,4 +42,7 @@ post-install:
${INSTALL_DATA_DIR} ${INCL_DIR}
${INSTALL_DATA} ${WRKSRC}/libImaging/{ImPlatform,Imaging}.h ${INCL_DIR}
do-test:
cd ${WRKSRC}; ${MODPY_BIN} ./selftest.py
.include <bsd.port.mk>

4
graphics/py-Pillow/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Pillow-1.7.8.zip) = kH9TQrHfHSd9zBDfKuq8YQmeWgfgZ2ufzRu3N5iQwO4=
SIZE (Pillow-1.7.8.zip) = 410745
SHA256 (Pillow-2.4.0.zip) = KGXGizpWOEZrGDe/SmfER+DP33RjMJoGiq0OkKoD9Yo=
SIZE (Pillow-2.4.0.zip) = 6519873

8
graphics/py-Pillow/patches/patch-Scripts_pilfont_py
View File

@ -1,8 +0,0 @@
$OpenBSD: patch-Scripts_pilfont_py,v 1.1.1.1 2013/01/28 07:55:58 jasper Exp $
--- Scripts/pilfont.py.orig Thu Nov 1 17:08:52 2012
+++ Scripts/pilfont.py Wed Jan 23 09:32:50 2013
@@ -1,3 +1,4 @@
+# /usr/local/bin/python
#
# The Python Imaging Library
# $Id: patch-Scripts_pilfont_py,v 1.1.1.1 2013/01/28 07:55:58 jasper Exp $

12
graphics/py-Pillow/patches/patch-Scripts_player_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Scripts_player_py,v 1.1 2014/04/06 21:10:19 sthen Exp $
--- Scripts/player.py.orig Sun Apr 6 20:32:01 2014
+++ Scripts/player.py Sun Apr 6 20:32:08 2014
@@ -21,7 +21,7 @@ Image.DEBUG = 0
# --------------------------------------------------------------------
# experimental: support ARG animation scripts
-import ArgImagePlugin
+from PIL import ArgImagePlugin
def applet_hook(animation, images):
app = animation(animation_display, images)

15
graphics/py-Pillow/patches/patch-_imagingft_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-_imagingft_c,v 1.1 2014/01/09 12:42:33 naddy Exp $
--- _imagingft.c.orig Thu Nov 1 17:08:52 2012
+++ _imagingft.c Thu Jan 9 03:31:49 2014
@@ -70,7 +70,11 @@ struct {
const char* message;
} ft_errors[] =
+#if defined(USE_FREETYPE_2_1)
+#include FT_ERRORS_H
+#else
#include <freetype/fterrors.h>
+#endif
/* -------------------------------------------------------------------- */
/* font objects */

42
graphics/py-Pillow/patches/patch-setup_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2013/01/28 07:55:58 jasper Exp $
--- setup.py.orig Thu Nov 1 17:09:06 2012
+++ setup.py Mon Jan 14 09:43:04 2013
@@ -139,6 +139,13 @@ class pil_build_ext(build_ext):
$OpenBSD: patch-setup_py,v 1.2 2014/04/06 21:10:19 sthen Exp $
--- setup.py.orig Tue Apr 1 18:21:44 2014
+++ setup.py Sun Apr 6 16:47:32 2014
@@ -290,6 +290,13 @@ class pil_build_ext(build_ext):
if _tkinter:
TCL_VERSION = _tkinter.TCL_VERSION[:3]
@ -15,36 +15,32 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2013/01/28 07:55:58 jasper Exp $
if _tkinter and not TCL_ROOT:
# we have Tkinter but the TCL_ROOT variable was not set;
@@ -187,12 +194,15 @@ class pil_build_ext(build_ext):
_add_directory(include_dirs, tcl_dir)
# standard locations
- _add_directory(library_dirs, "/usr/local/lib")
- _add_directory(include_dirs, "/usr/local/include")
+ _add_directory(library_dirs, os.path.join(os.getenv("LOCALBASE"), "lib"))
+ _add_directory(include_dirs, os.path.join(os.getenv("LOCALBASE"), "include"))
@@ -330,6 +337,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"))
+
#
# insert new dirs *before* default libs, to avoid conflicts
# between Python PYD stub libs and real libraries
@@ -293,7 +303,7 @@ class pil_build_ext(build_ext):
# on Windows, look for the OpenJPEG libraries in the location that
# the official installed puts them
if sys.platform == "win32":
@@ -481,7 +493,7 @@ class pil_build_ext(build_ext):
if feature.freetype_version == 20:
defs.append(("USE_FREETYPE_2_0", None))
exts.append(Extension(
- "_imagingft", ["_imagingft.c"], libraries=["freetype"],
+ "_imagingft", ["_imagingft.c"], libraries=["freetype", "z"],
- "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:
@@ -466,5 +476,4 @@ setup(
cmdclass={"build_ext": pil_build_ext},
ext_modules=[Extension("_imaging", ["_imaging.c"])],
@@ -673,7 +685,6 @@ setup(
ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
include_package_data=True,
packages=find_packages(),
- scripts=glob.glob("Scripts/pil*.py"),
)
test_suite='PIL.tests',
keywords=["Imaging",],
license='Standard PIL License',

43
graphics/py-Pillow/pkg/PLIST
View File

@ -1,10 +1,22 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/01/28 07:55:58 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/04/06 21:10:19 sthen Exp $
@conflict py-Imaging-*
@pkgpath graphics/py-Imaging
@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/enhancer
bin/explode
bin/gifmaker
bin/painter
bin/pilconvert
bin/pildriver
bin/pilfile
bin/pilfont
bin/pilprint
bin/player
bin/thresholder
bin/viewer
include/python${MODPY_VERSION}/ImPlatform.h
include/python${MODPY_VERSION}/Imaging.h
lib/python${MODPY_VERSION}/site-packages/PIL/
@ -76,8 +88,6 @@ lib/python${MODPY_VERSION}/site-packages/PIL/ImageFilter.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFilter.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFont.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFont.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGL.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGL.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageMath.py
@ -108,8 +118,12 @@ lib/python${MODPY_VERSION}/site-packages/PIL/ImtImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImtImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/IptcImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/IptcImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/Jpeg2KImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/Jpeg2KImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/JpegImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/JpegImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/JpegPresets.py
lib/python${MODPY_VERSION}/site-packages/PIL/JpegPresets.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/McIdasImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/McIdasImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/MicImagePlugin.py
@ -118,6 +132,7 @@ lib/python${MODPY_VERSION}/site-packages/PIL/MpegImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/MpegImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/MspImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/MspImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/OleFileIO-README.md
lib/python${MODPY_VERSION}/site-packages/PIL/OleFileIO.py
lib/python${MODPY_VERSION}/site-packages/PIL/OleFileIO.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/PSDraw.py
@ -142,6 +157,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/PpmImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/PpmImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/PsdImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/PsdImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/PyAccess.py
lib/python${MODPY_VERSION}/site-packages/PIL/PyAccess.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/SgiImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/SgiImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/SpiderImagePlugin.py
@ -158,6 +175,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/TiffTags.py
lib/python${MODPY_VERSION}/site-packages/PIL/TiffTags.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/WalImageFile.py
lib/python${MODPY_VERSION}/site-packages/PIL/WalImageFile.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/WebPImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/WebPImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/WmfImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/WmfImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/XVThumbImagePlugin.py
@ -168,13 +187,21 @@ lib/python${MODPY_VERSION}/site-packages/PIL/XpmImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/XpmImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/__init__.py
lib/python${MODPY_VERSION}/site-packages/PIL/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_binary.py
lib/python${MODPY_VERSION}/site-packages/PIL/_binary.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingcms.so
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/_imagingtk.so
lib/python${MODPY_VERSION}/site-packages/PIL/_util.py
lib/python${MODPY_VERSION}/site-packages/PIL/_util.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_webp.so
lib/python${MODPY_VERSION}/site-packages/PIL/tests.py
lib/python${MODPY_VERSION}/site-packages/PIL/tests.pyc
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
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/_imaging.so
lib/python${MODPY_VERSION}/site-packages/_imagingcms.so
lib/python${MODPY_VERSION}/site-packages/_imagingft.so
lib/python${MODPY_VERSION}/site-packages/_imagingmath.so
lib/python${MODPY_VERSION}/site-packages/_imagingtk.so
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe