From ccb82c0128344d60ec6ec1ffca7ffebc9b8a2026 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 12 Oct 2005 14:48:44 +0000 Subject: update to 1.1.5 changes: + Runs under Python 1.5.2 and newer, including 2.4. You may need additional libraries to build under 1.5.2; see instructions below. + New build procedure. The setup.py file now configures and builds the core library as well as the bindings, in one step. + Added stub drivers for BUFR, FITS, GRIB, HDF5, and WMF files. Stub drivers can identify the file format, but relies on application-provided drivers to read or write images in that format. + Added experimental "LA" mode support. An "LA" image is an "L" image with an attached transparency layer. + Added "RankFilter", "MinFilter", "MedianFilter", and "MaxFilter" classes to the ImageFilter module. + Improved support for applications using multiple threads on systems with multiple processors and/or hyperthreading processors. + Added EXIF GPSInfo read support for JPEG files. + Lots of bug fixes and performance tweaks. pkgsrc note: freetype and tiff support isn't built yet, should be separate pkgs --- graphics/py-imagingtk/Makefile | 16 ++---- graphics/py-imagingtk/distinfo | 10 ++-- graphics/py-imagingtk/patches/patch-aa | 93 ++++++++++++++++------------------ 3 files changed, 52 insertions(+), 67 deletions(-) (limited to 'graphics/py-imagingtk') diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index f7237690832..250a8985bbf 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:57 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/10/12 14:48:44 drochner Exp $ # -DISTNAME= Imaging-1.1.4 -PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.4 -PKGREVISION= 1 +DISTNAME= Imaging-1.1.5 +PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.5 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/downloads/ @@ -14,17 +13,10 @@ COMMENT= Tk support for the Python Imaging Library (PIL) DIST_SUBDIR= python PYDISTUTILSPKG= yes BUILDLINK_DEPENDS.python20= python20>=2.0.1nb4 -GNU_CONFIGURE= yes +PY_PATCHPLIST= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} -do-configure: - (cd ${WRKSRC}/libImaging && ${SETENV} ${CONFIGURE_ENV} ./configure \ - ${CONFIGURE_ARGS} && ${SETENV} ${MAKE_ENV} ${MAKE}) - ${SED} "s|@JPEGDIR@|${BUILDLINK_PREFIX.jpeg}|g" <${WRKSRC}/setup.py \ - >${WRKSRC}/setup.py.tmp && ${MV} -f ${WRKSRC}/setup.py.tmp \ - ${WRKSRC}/setup.py - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging (cd ${WRKSRC}/Scripts; \ diff --git a/graphics/py-imagingtk/distinfo b/graphics/py-imagingtk/distinfo index 6222fe62544..40dd38018db 100644 --- a/graphics/py-imagingtk/distinfo +++ b/graphics/py-imagingtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 08:45:12 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/10/12 14:48:44 drochner Exp $ -SHA1 (python/Imaging-1.1.4.tar.gz) = 611972b63272bf4967ca966848ba8ddda970abcc -RMD160 (python/Imaging-1.1.4.tar.gz) = c53065f5e73b2f5ac5ff132a47c157e5290f0488 -Size (python/Imaging-1.1.4.tar.gz) = 416338 bytes -SHA1 (patch-aa) = fbaf2e06237535ec52094bf6eb43e6a471f3966a +SHA1 (python/Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f +RMD160 (python/Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04 +Size (python/Imaging-1.1.5.tar.gz) = 429570 bytes +SHA1 (patch-aa) = 1576267cd4274307d7f680c1e834930477e7603f diff --git a/graphics/py-imagingtk/patches/patch-aa b/graphics/py-imagingtk/patches/patch-aa index ab628437b36..9c6a1114d57 100644 --- a/graphics/py-imagingtk/patches/patch-aa +++ b/graphics/py-imagingtk/patches/patch-aa @@ -1,58 +1,51 @@ -$NetBSD: patch-aa,v 1.1 2003/08/18 10:15:43 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $ ---- setup.py.orig Fri May 9 14:00:56 2003 -+++ setup.py Sun Aug 17 00:55:09 2003 -@@ -85,16 +85,16 @@ - # standard windows libraries - LIBRARIES.extend(["kernel32", "user32", "gdi32"]) +--- setup.py.orig 2005-03-23 19:16:40.000000000 +0100 ++++ setup.py +@@ -177,9 +177,6 @@ class pil_build_ext(build_ext): + # + # add standard directories --MODULES.append( -- Extension( -- "_imaging", -- ["_imaging.c", "decode.c", "encode.c", "map.c", "display.c", -- "outline.c", "path.c"], -- include_dirs=INCLUDE_DIRS, -- library_dirs=LIBRARY_DIRS, -- libraries=LIBRARIES -- ) -- ) -+#MODULES.append( -+# Extension( -+# "_imaging", -+# ["_imaging.c", "decode.c", "encode.c", "map.c", "display.c", -+# "outline.c", "path.c"], -+# include_dirs=INCLUDE_DIRS, -+# library_dirs=LIBRARY_DIRS, -+# libraries=LIBRARIES -+# ) -+# ) +- add_directory(library_dirs, "/usr/local/lib") +- add_directory(include_dirs, "/usr/local/include") +- + add_directory(library_dirs, "/usr/lib") + add_directory(include_dirs, "/usr/include") - # security check +@@ -210,7 +207,7 @@ class pil_build_ext(build_ext): + if find_library_file(self, "tiff"): + feature.tiff = "tiff" -@@ -121,7 +121,7 @@ +- if find_library_file(self, "freetype"): ++ if 0: + # look for freetype2 include files + freetype_version = 0 + for dir in include_dirs: +@@ -265,9 +262,10 @@ class pil_build_ext(build_ext): + if struct.unpack("h", "\0\1")[0] == 1: + defs.append(("WORDS_BIGENDIAN", None)) - try: - import _tkinter -- TCL_VERSION = _tkinter.TCL_VERSION[:3] -+ TCL_VERSION = ''.join(_tkinter.TCL_VERSION[:3].split('.')) - except (ImportError, AttributeError): - pass - else: -@@ -206,7 +206,7 @@ +- exts = [(Extension( +- "_imaging", files, libraries=libs, define_macros=defs +- ))] ++# exts = [(Extension( ++# "_imaging", files, libraries=libs, define_macros=defs ++# ))] ++ exts = [] - if not tk_framework_found: - # assume the libraries are installed in the default location -- LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION]) -+ LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION, "X11"]) - HAVE_TCLTK = 1 - - if HAVE_TCLTK: -@@ -300,7 +300,7 @@ - author_email=AUTHOR[1], - description=DESCRIPTION, - url=HOMEPAGE, + # + # additional libraries +@@ -430,10 +428,10 @@ if __name__ == "__main__": + license="Python (MIT style)", + long_description=DESCRIPTION, + name=NAME, +- package_dir={"": "PIL"}, - packages=[""], ++# package_dir={"": "PIL"}, +# packages=[""], - extra_path = "PIL", - package_dir={"": "PIL"}, - ext_modules = MODULES, + platforms="Python 1.5.2 and later.", +- scripts = glob.glob("Scripts/pil*.py"), ++# scripts = glob.glob("Scripts/pil*.py"), + url=HOMEPAGE, + version=VERSION, + ) -- cgit v1.2.3