[78072] trunk/dports/python/py-pil
jmr at macports.org
jmr at macports.org
Fri Apr 22 06:43:16 PDT 2011
Revision: 78072
http://trac.macports.org/changeset/78072
Author: jmr at macports.org
Date: 2011-04-22 06:43:14 -0700 (Fri, 22 Apr 2011)
Log Message:
-----------
py-pil: update to 1.1.7, depend on lcms (#23980)
Modified Paths:
--------------
trunk/dports/python/py-pil/Portfile
trunk/dports/python/py-pil/files/patch-setup.py
Added Paths:
-----------
trunk/dports/python/py-pil/files/pil-2009-raclette-fb7ce579f5f9.diff
Modified: trunk/dports/python/py-pil/Portfile
===================================================================
--- trunk/dports/python/py-pil/Portfile 2011-04-22 08:51:38 UTC (rev 78071)
+++ trunk/dports/python/py-pil/Portfile 2011-04-22 13:43:14 UTC (rev 78072)
@@ -4,8 +4,7 @@
PortGroup python24 1.0
name py-pil
-version 1.1.6
-revision 3
+version 1.1.7
maintainers nomaintainer
description Python Imaging Library
long_description The Python Imaging Library (PIL) adds image \
@@ -18,12 +17,13 @@
homepage http://www.pythonware.com/
master_sites http://effbot.org/downloads/
distname Imaging-${version}
-checksums md5 3a9b5c20ca52f0a9900512d2c7347622
-patchfiles patch-setup.py
+checksums md5 fc14a54e1ce02a0225be8854bfba478e \
+ sha1 76c37504251171fda8da8e63ecb8bc42a69a5c81 \
+ rmd160 9af570fe100e250a4860314341fe3e6d695d7fde
+patchfiles patch-setup.py pil-2009-raclette-fb7ce579f5f9.diff
-depends_lib-append port:jpeg \
- port:freetype \
- port:zlib \
+depends_lib-append port:freetype \
+ port:lcms \
port:py-tkinter
post-patch {
Modified: trunk/dports/python/py-pil/files/patch-setup.py
===================================================================
--- trunk/dports/python/py-pil/files/patch-setup.py 2011-04-22 08:51:38 UTC (rev 78071)
+++ trunk/dports/python/py-pil/files/patch-setup.py 2011-04-22 13:43:14 UTC (rev 78072)
@@ -1,19 +1,53 @@
---- setup.py 2005-03-23 19:16:40.000000000 +0100
-+++ setup.py 2005-07-11 18:50:55.000000000 +0200
-@@ -28,11 +28,11 @@
+--- setup.py.orig 2006-12-03 04:37:29.000000000 -0700
++++ setup.py 2009-09-18 19:58:45.000000000 -0600
+@@ -33,12 +33,12 @@
#
# TIFF_ROOT = libinclude("/opt/tiff")
--FREETYPE_ROOT = None
+-TCL_ROOT = None
-JPEG_ROOT = None
+-ZLIB_ROOT = None
-TIFF_ROOT = None
--ZLIB_ROOT = None
--TCL_ROOT = None
-+FREETYPE_ROOT = "__PREFIX__/lib/", "__PREFIX__/include/freetype2/"
+-FREETYPE_ROOT = None
+-LCMS_ROOT = None
++TCL_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
+JPEG_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
++ZLIB_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
+TIFF_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
-+ZLIB_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
-+TCL_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
++FREETYPE_ROOT = "__PREFIX__/lib/", "__PREFIX__/include/freetype2/"
++LCMS_ROOT = "__PREFIX__/lib", "__PREFIX__/include"
# FIXME: add mechanism to explicitly *disable* the use of a library
+@@ -331,30 +331,7 @@
+ "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra
+ ))
+
+- if sys.platform == "darwin":
+- # locate Tcl/Tk frameworks
+- frameworks = []
+- framework_roots = [
+- "/Library/Frameworks",
+- "/System/Library/Frameworks"
+- ]
+- for root in framework_roots:
+- if (os.path.exists(os.path.join(root, "Tcl.framework")) and
+- os.path.exists(os.path.join(root, "Tk.framework"))):
+- print "--- using frameworks at", root
+- frameworks = ["-framework", "Tcl", "-framework", "Tk"]
+- dir = os.path.join(root, "Tcl.framework", "Headers")
+- add_directory(self.compiler.include_dirs, dir, 0)
+- dir = os.path.join(root, "Tk.framework", "Headers")
+- add_directory(self.compiler.include_dirs, dir, 1)
+- break
+- if frameworks:
+- exts.append(Extension(
+- "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+- extra_compile_args=frameworks, extra_link_args=frameworks
+- ))
+- feature.tcl = feature.tk = 1 # mark as present
+- elif feature.tcl and feature.tk:
++ if feature.tcl and feature.tk:
+ exts.append(Extension(
+ "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+ libraries=[feature.tcl, feature.tk]
Copied: trunk/dports/python/py-pil/files/pil-2009-raclette-fb7ce579f5f9.diff (from rev 78070, trunk/dports/python/py26-pil/files/pil-2009-raclette-fb7ce579f5f9.diff)
===================================================================
--- trunk/dports/python/py-pil/files/pil-2009-raclette-fb7ce579f5f9.diff (rev 0)
+++ trunk/dports/python/py-pil/files/pil-2009-raclette-fb7ce579f5f9.diff 2011-04-22 13:43:14 UTC (rev 78072)
@@ -0,0 +1,24 @@
+# HG changeset patch -- Bitbucket.org
+# Project pil-2009-raclette
+# URL http://bitbucket.org/effbot/pil-2009-raclette/overview
+# User Fredrik Lundh <fredrik at effbot.org>
+# Date 1272193085 -7200
+# Node ID fb7ce579f5f96f7d9008f72ab03eef4f1c6db609
+# Parent 45c2debe0fc3d9632372a15826b1b64a35ff43c4
+Fixed split after open bug (regression in 1.1.7).
+
+--- PIL/Image.py
++++ PIL/Image.py
+@@ -1494,11 +1494,11 @@ class Image:
+ def split(self):
+ "Split image into bands"
+
++ self.load()
+ if self.im.bands == 1:
+ ims = [self.copy()]
+ else:
+ ims = []
+- self.load()
+ for i in range(self.im.bands):
+ ims.append(self._new(self.im.getband(i)))
+ return tuple(ims)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110422/c81162ec/attachment.html>
More information about the macports-changes
mailing list