Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2297
Modified Files:
pil-py.info pil-py.patch
Log Message:
New upstream pil-py 2.1.0.
Index: pil-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pil-py.info 9 May 2013 01:32:54 -0000 1.13
+++ pil-py.info 16 Aug 2013 01:46:07 -0000 1.14
@@ -1,25 +1,25 @@
Info2: <<
Package: pil-py%type_pkg[python]
-Type: python (2.6 2.7 3.1 3.2)
+Type: python (2.6 2.7 3.1 3.2 3.3)
-Version: 2.0.0
-Revision: 2
+Version: 2.1.0
+Revision: 1
Description: Python Imaging Library
DescDetail: <<
The Python Imaging Library (PIL) adds image processing capabilities to
your Python interpreter. This library supports many file formats, and
provides powerful image processing and graphics capabilities.
<<
-Source: https://nodeload.github.com/python-imaging/Pillow/tar.gz/%v
-Source-MD5: e67a4ae0946527c78f7c64cc3cd3202a
+Source: https://codeload.github.com/python-imaging/Pillow/tar.gz/%v
+Source-MD5: d316f9b4452a1e7d4140133897a066ba
SourceRename: Pillow-%v.tar.gz
BuildDepends: <<
- distribute-py%type_pkg[python],
+ setuptools-tng-py%type_pkg[python],
fink (>= 0.24.12-1),
freetype219 (>= 2.3.7-7),
lcms,
- libjpeg8,
+ libjpeg9,
libtiff5,
libwebp4,
tcltk-dev (>= 8.4.1-1)
@@ -27,7 +27,7 @@
Depends: <<
freetype219-shlibs (>= 2.3.7-7),
lcms-shlibs,
- libjpeg8-shlibs,
+ libjpeg9-shlibs,
libtiff5-shlibs,
libwebp4-shlibs,
python%type_pkg[python],
@@ -36,7 +36,7 @@
Replaces: pil
Provides: pil
PatchFile: %{ni}.patch
-PatchFile-MD5: e246b18de49ace76fbc46743ccd2c148
+PatchFile-MD5: 2b912beb4de317256bc01b83832035e3
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
NoSetCPPFLAGS: true
CompileScript: <<
@@ -46,8 +46,9 @@
TestScript: <<
#!/bin/bash -ev
export PYTHONPATH=`ls -d %b/build/lib*`
-
+ %p/bin/python%type_raw[python] setup.py build_ext --inplace
%p/bin/python%type_raw[python] selftest.py || exit 2
+ %p/bin/python%type_raw[python] Tests/run.py || exit 2
<<
<<
InstallScript: <<
Index: pil-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/pil-py.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pil-py.patch 22 Mar 2013 13:25:01 -0000 1.5
+++ pil-py.patch 16 Aug 2013 01:46:07 -0000 1.6
@@ -1,8 +1,8 @@
diff --git a/setup.py b/setup.py
-index bdf6bc9..63f63d1 100644
+index 67b859b..b07f96e 100644
--- a/setup.py
+++ b/setup.py
-@@ -100,15 +100,9 @@ class pil_build_ext(build_ext):
+@@ -157,15 +157,9 @@ class pil_build_ext(build_ext):
"/usr/lib", "python%s" % sys.version[:3], "config"))
elif sys.platform == "darwin":
@@ -20,7 +20,7 @@
# 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):
+@@ -193,7 +187,6 @@ class pil_build_ext(build_ext):
# work ;-)
self.add_multiarch_paths()
@@ -28,7 +28,7 @@
# FIXME: check /opt/stuff directories here?
prefix = sysconfig.get_config_var("prefix")
-@@ -187,9 +180,6 @@ class pil_build_ext(build_ext):
+@@ -240,9 +233,6 @@ class pil_build_ext(build_ext):
_add_directory(include_dirs, tcl_dir)
# standard locations
@@ -38,19 +38,19 @@
_add_directory(library_dirs, "/usr/lib")
_add_directory(include_dirs, "/usr/include")
-@@ -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)
-+ # ft also needs its subdir; place after the one local -I
flag
-+ _add_directory(self.compiler.include_dirs, dir, 1)
+@@ -302,7 +292,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)
++ # ft also needs its subdir; place after the one local
-I flag
++ _add_directory(self.compiler.include_dirs, dir, 1)
- if _find_include_file(self, "lcms.h"):
- if _find_library_file(self, "lcms"):
-@@ -307,28 +298,7 @@ class pil_build_ext(build_ext):
+ if feature.want('lcms'):
+ if _find_include_file(self, "lcms.h"):
+@@ -389,29 +380,7 @@ class pil_build_ext(build_ext):
exts.append(Extension(
- "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra))
+ "PIL._webp", ["_webp.c"], libraries=["webp"]))
- if sys.platform == "darwin":
- # locate Tcl/Tk frameworks
@@ -59,8 +59,9 @@
- "/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"))):
+- if (
+- os.path.exists(os.path.join(root, "Tcl.framework"))
and
+- os.path.exists(os.path.join(root, "Tk.framework"))):
- print("--- using frameworks at %s" % root)
- frameworks = ["-framework", "Tcl", "-framework", "Tk"]
- dir = os.path.join(root, "Tcl.framework", "Headers")
@@ -70,11 +71,11 @@
- break
- if frameworks:
- exts.append(Extension(
-- "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
+- "PIL._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"],
+ "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
libraries=[feature.tcl, feature.tk]))
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
