Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18551
Modified Files:
pil-py.info pil-py.patch
Log Message:
New upstream pil-py 1.7.8.
This is the Pillow fork of the original PIL, which is actually being maintained.
Index: pil-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pil-py.info 11 Jan 2013 22:58:15 -0000 1.2
+++ pil-py.info 12 Jan 2013 00:00:14 -0000 1.3
@@ -3,7 +3,7 @@
Package: pil-py%type_pkg[python]
Type: python (2.6 2.7)
-Version: 1.1.7
+Version: 1.7.8
Revision: 1
Description: Python Imaging Library
DescDetail: <<
@@ -11,9 +11,11 @@
your Python interpreter. This library supports many file formats, and
provides powerful image processing and graphics capabilities.
<<
-Source: http://effbot.org/downloads/Imaging-%v.tar.gz
-Source-MD5: fc14a54e1ce02a0225be8854bfba478e
+Source: https://nodeload.github.com/python-imaging/Pillow/tar.gz/%v
+Source-MD5: 3bfb039a038277ea4f0c12e43903b1f2
+SourceRename: Pillow-%v.tar.gz
BuildDepends: <<
+ distribute-py%type_pkg[python],
fink (>= 0.24.12-1),
freetype219 (>= 2.3.7-7),
lcms,
@@ -30,7 +32,7 @@
Replaces: pil
Provides: pil
PatchFile: %{ni}.patch
-PatchFile-MD5: 5dd974e1334fe5f3512e2b6294e0e3d9
+PatchFile-MD5: e246b18de49ace76fbc46743ccd2c148
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
NoSetCPPFLAGS: true
CompileScript: <<
@@ -59,9 +61,9 @@
mv pilprint.py pilprint%type_raw[python].py
mv pilfile.py pilfile%type_raw[python].py
<<
-DocFiles: CHANGES README
+DocFiles: README.rst
License: OSI-Approved
-Homepage: http://www.pythonware.com/products/pil
+Homepage: https://github.com/python-imaging/Pillow
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
DescPackaging: <<
Uses the tcl that matches python's tkinter
@@ -72,6 +74,10 @@
include_dirs (python bug?): NoSetCPPFLAGS so that local -I
takes precedence. Especially need to find libImaging/Zip.h
rather than libzip1's zip.h on case-insensitive FS.
+
+ This is the Pillow fork of PIL maintained by the plone community.
+ Unlike PIL, it is under active development but is a otherwise a
+ drop-in replacement.
<<
# Info2
Index: pil-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/pil-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pil-py.patch 11 Jan 2013 22:58:15 -0000 1.2
+++ pil-py.patch 12 Jan 2013 00:00:14 -0000 1.3
@@ -1,76 +1,80 @@
-diff -ru Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py
---- Imaging-1.1.7.orig/setup.py 2009-11-15 11:06:10.000000000 -0500
-+++ Imaging-1.1.7/setup.py 2010-07-09 17:22:47.000000000 -0400
-@@ -137,17 +137,11 @@
- ))
+diff --git a/setup.py b/setup.py
+index bdf6bc9..63f63d1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -100,15 +100,9 @@ class pil_build_ext(build_ext):
+ "/usr/lib", "python%s" % sys.version[:3], "config"))
elif sys.platform == "darwin":
- # attempt to make sure we pick freetype2 over other versions
-- add_directory(include_dirs, "/sw/include/freetype2")
-- add_directory(include_dirs, "/sw/lib/freetype2/include")
+- _add_directory(include_dirs, "/sw/include/freetype2")
+- _add_directory(include_dirs, "/sw/lib/freetype2/include")
# fink installation directories
-- add_directory(library_dirs, "/sw/lib")
-- add_directory(include_dirs, "/sw/include")
+- _add_directory(library_dirs, "/sw/lib")
+- _add_directory(include_dirs, "/sw/include")
- # darwin ports installation directories
-- add_directory(library_dirs, "/opt/local/lib")
-- add_directory(include_dirs, "/opt/local/include")
-+ add_directory(library_dirs, "@PREFIX@/lib")
-+ add_directory(include_dirs, "@PREFIX@/include")
-+ add_directory(include_dirs, "/usr/X11/include")
+- _add_directory(library_dirs, "/opt/local/lib")
+- _add_directory(include_dirs, "/opt/local/include")
++ _add_directory(library_dirs, "@PREFIX@/lib")
++ _add_directory(include_dirs, "@PREFIX@/include")
+ # freetype2 ships with X11
+ _add_directory(library_dirs, "/usr/X11/lib")
+ _add_directory(include_dirs, "/usr/X11/include")
+@@ -126,7 +120,6 @@ class pil_build_ext(build_ext):
+ # work ;-)
+ self.add_multiarch_paths()
-- add_directory(library_dirs, "/usr/local/lib")
+- _add_directory(library_dirs, "/usr/local/lib")
# FIXME: check /opt/stuff directories here?
prefix = sysconfig.get_config_var("prefix")
-@@ -208,9 +201,6 @@
- add_directory(include_dirs, tcl_dir)
+@@ -187,9 +180,6 @@ 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, "/usr/local/lib")
+- _add_directory(include_dirs, "/usr/local/include")
-
- add_directory(library_dirs, "/usr/lib")
- add_directory(include_dirs, "/usr/include")
+ _add_directory(library_dirs, "/usr/lib")
+ _add_directory(include_dirs, "/usr/include")
-@@ -262,7 +252,8 @@
+@@ -242,7 +232,8 @@ class pil_build_ext(build_ext):
feature.freetype = "freetype"
feature.freetype_version = freetype_version
if dir:
-- add_directory(self.compiler.include_dirs, dir, 0)
+- _add_directory(self.compiler.include_dirs, dir, 0)
+ # ft also needs its subdir; place after the one local -I
flag
-+ add_directory(self.compiler.include_dirs, dir, 1)
++ _add_directory(self.compiler.include_dirs, dir, 1)
- if find_include_file(self, "lcms.h"):
- if find_library_file(self, "lcms"):
-@@ -331,30 +322,7 @@
- "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra
- ))
+ if _find_include_file(self, "lcms.h"):
+ if _find_library_file(self, "lcms"):
+@@ -307,28 +298,7 @@ class pil_build_ext(build_ext):
+ exts.append(Extension(
+ "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
- if sys.platform == "darwin":
- # locate Tcl/Tk frameworks
- frameworks = []
- framework_roots = [
- "/Library/Frameworks",
-- "/System/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
+- print("--- using frameworks at %s" % root)
- frameworks = ["-framework", "Tcl", "-framework", "Tk"]
- dir = os.path.join(root, "Tcl.framework", "Headers")
-- add_directory(self.compiler.include_dirs, dir, 0)
+- _add_directory(self.compiler.include_dirs, dir, 0)
- dir = os.path.join(root, "Tk.framework", "Headers")
-- add_directory(self.compiler.include_dirs, dir, 1)
+- _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
+- 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]
+ libraries=[feature.tcl, feature.tk]))
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
