Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32192
Modified Files:
pil-py.info pil-py.patch
Log Message:
latest version to stable
Index: pil-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pil-py.info 22 Aug 2009 23:02:45 -0000 1.9
+++ pil-py.info 25 Jan 2010 16:50:09 -0000 1.10
@@ -1,10 +1,10 @@
Info2: <<
Package: pil-py%type_pkg[python]
-Type: python (2.3 2.4 2.5)
+Type: python (2.3 2.4 2.5 2.6)
-Version: 1.1.5
-Revision: 3
+Version: 1.1.6
+Revision: 6
Distribution: (%type_pkg[python] = 23) 10.4, (%type_pkg[python] = 24) 10.4,
(%type_pkg[python] = 24) 10.5
Description: Python Imaging Library
DescDetail: <<
@@ -12,23 +12,30 @@
your Python interpreter. This library supports many file formats, and
provides powerful image processing and graphics capabilities.
<<
-DescPort: <<
- tk 8.4 not supported, needs a patch to tkImaging.c to compile.
- lots of patches to help it find fink installed libs and headers.
-<<
Source: http://effbot.org/downloads/Imaging-%v.tar.gz
-Source-MD5: a64512e39469213ced0d091b9eba76c0
-BuildDepends: fink (>= 0.24.12-1), tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg
-Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs,
libjpeg-shlibs
-SetCFLAGS: -I/usr/X11R6/include
+Source-MD5: 3a9b5c20ca52f0a9900512d2c7347622
+BuildDepends: <<
+ fink (>= 0.24.12-1),
+ freetype219 (>= 2.3.7-7),
+ libjpeg,
+ tcltk-dev (>= 8.4.1-1)
+<<
+Depends: <<
+ freetype219-shlibs (>= 2.3.7-7),
+ libjpeg-shlibs,
+ python%type_pkg[python],
+ tcltk (>= 8.4.1-1)
+<<
Replaces: pil
Provides: pil
PatchFile: %{ni}.patch
-PatchFile-MD5: 2df23ecdd59187b8c7185d52022e8fa5
+PatchFile-MD5: 09d07243029c29ab23e3fd97d1ac3ae4
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+NoSetCPPFLAGS: true
CompileScript: <<
%p/bin/python%type_raw[python] setup.py build
<<
+InfoTest: TestScript: %p/bin/python%type_raw[python] selftest.py || exit 2
InstallScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py install --root=%d
@@ -38,16 +45,26 @@
mkdir -p %i/include/python%type_raw[python]/PIL
cp -f libImaging/ImPlatform.h libImaging/Imaging.h
%i/include/python%type_raw[python]/PIL
cd %i/bin
- mv pilfont.py pifont%type_raw[python].py
+ mv pilfont.py pilfont%type_raw[python].py
mv pildriver.py pildriver%type_raw[python].py
mv pilconvert.py pilconvert%type_raw[python].py
mv pilprint.py pilprint%type_raw[python].py
mv pilfile.py pilfile%type_raw[python].py
<<
-DocFiles: CHANGES-115 BUILDME CONTENTS README
+DocFiles: CHANGES README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: None <fink-de...@lists.sourceforge.net>
+DescPackaging: <<
+ Uses the tcl that matches python's tkinter
+
+ Avoid un-needed -I and -L paths
+
+ python build system seems to put CPPFLAGS before custom
+ 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.
+<<
# Info2
<<
Index: pil-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/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 13 Mar 2007 13:03:36 -0000 1.2
+++ pil-py.patch 25 Jan 2010 16:50:09 -0000 1.3
@@ -1,38 +1,46 @@
---- Imaging/setup.py.orig 2006-09-24 06:20:39.000000000 -0600
-+++ Imaging/setup.py 2006-09-24 06:21:30.000000000 -0600
-@@ -119,11 +119,11 @@
+diff -Nurd -x'*~' Imaging-1.1.6.orig/setup.py Imaging-1.1.6/setup.py
+--- Imaging-1.1.6.orig/setup.py 2006-12-03 06:37:29.000000000 -0500
++++ Imaging-1.1.6/setup.py 2008-11-20 11:28:06.000000000 -0500
+@@ -130,17 +130,10 @@
+ ))
- if sys.platform == "darwin":
- # attempt to make sure we pick freetype2 over other versions
+ 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, "@PREFIX@/include/freetype2")
-+ add_directory(include_dirs, "@PREFIX@/lib/freetype2/include")
# fink installation directories
- 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(library_dirs, "/usr/local/lib")
# FIXME: check /opt/stuff directories here?
-@@ -177,11 +177,11 @@
+ prefix = sysconfig.get_config_var("prefix")
+@@ -193,8 +186,6 @@
#
# add standard directories
- 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")
+ add_directory(library_dirs, "/usr/lib")
+ add_directory(include_dirs, "/usr/include")
+@@ -245,7 +236,8 @@
+ 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)
- #
- # insert new dirs *before* default libs, to avoid conflicts
-@@ -286,30 +286,30 @@
+ if _tkinter:
+ # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
+@@ -302,30 +294,7 @@
"_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]
))
@@ -60,29 +68,6 @@
- ))
- feature.tcl = feature.tk = 1 # mark as present
- elif feature.tcl and feature.tk:
-+ #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
+ if feature.tcl and feature.tk:
exts.append(Extension(
"_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
