[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fink-commits
Subject:    [cvs] dists/10.7/stable/main/finkinfo/graphics pil-py.info, NONE,
From:       Daniel Johnson <danielj7 () users ! sourceforge ! net>
Date:       2011-07-31 0:24:18
Message-ID: E1QnJpM-00087g-2g () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv19699

Added Files:
	pil-py.info pil-py.patch 
Log Message:
Move to 10.7.


--- NEW FILE: pil-py.info ---
Info2: <<

Package: pil-py%type_pkg[python]
Type: python (2.6 2.7)

Version: 1.1.7
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: http://effbot.org/downloads/Imaging-%v.tar.gz
Source-MD5: fc14a54e1ce02a0225be8854bfba478e
BuildDepends: <<
	fink (>= 0.24.12-1),
	freetype219 (>= 2.3.7-7),
	lcms,
	libjpeg8,
	tcltk-dev (>= 8.4.1-1)
<<
Depends: <<
	freetype219-shlibs (>= 2.3.7-7),
	lcms-shlibs,
	libjpeg8-shlibs,
	python%type_pkg[python],
	tcltk (>= 8.4.1-1)
<<
Replaces: pil
Provides: pil
PatchFile: %{ni}.patch
PatchFile-MD5: e4183e4422ba2b65bc4780bd6fa30a9e
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
NoSetCPPFLAGS: true
CompileScript: <<
 %p/bin/python%type_raw[python] setup.py build
<<
InfoTest: <<
	TestScript: <<
		#!/bin/bash -ev
        export PYTHONPATH=`ls -d %b/build/lib*`

		%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
 mkdir -p %i/share/doc/%n
 cp -R Docs/ %i/share/doc/%n/html
 cp -R Scripts %i/share/doc/%n
 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 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 README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: Daniel Johnson <daniel@daniel-johnson.org>
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
<<

--- NEW FILE: pil-py.patch ---
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,10 @@
                 ))
 
         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")
             # 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?
 
         prefix = sysconfig.get_config_var("prefix")
@@ -208,9 +201,6 @@
                 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/lib")
         add_directory(include_dirs, "/usr/include")
 
@@ -262,7 +252,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)
 
         if find_include_file(self, "lcms.h"):
             if find_library_file(self, "lcms"):
@@ -331,30 +322,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]


------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic