Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29609
Modified Files: pil-py.info pil-py.patch Log Message: moved from unstable Index: pil-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/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 21 Nov 2006 06:10:02 -0000 1.2 +++ pil-py.info 13 Mar 2007 13:03:36 -0000 1.3 @@ -1,10 +1,10 @@ Info2: << Package: pil-py%type_pkg[python] -Type: python (2.3) +Type: python (2.3 2.4 2.5) -Version: 1.1.4 -Revision: 1027 +Version: 1.1.5 +Revision: 3 Description: Python Imaging Library DescDetail: << The Python Imaging Library (PIL) adds image processing capabilities to @@ -16,28 +16,33 @@ lots of patches to help it find fink installed libs and headers. << Source: http://effbot.org/downloads/Imaging-%v.tar.gz -Source-MD5: d2c03c25a9a0128832137dd536da88da +Source-MD5: a64512e39469213ced0d091b9eba76c0 BuildDepends: 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 Replaces: pil Provides: pil GCC: 4.0 PatchScript: sed 's|@PREFIX@|%p|g' < %a/pil-py.patch | patch -p1 CompileScript: << - (cd libImaging; ./configure %c; make) - (export CPPFLAGS=""; %p/bin/python%type_raw[python] setup.py build) + %p/bin/python%type_raw[python] setup.py build << InstallScript: << #!/bin/sh -ev %p/bin/python%type_raw[python] setup.py install --root=%d mkdir -p %i/share/doc/%n - cp -R Doc/ %i/share/doc/%n/html + cp -R Docs/ %i/share/doc/%n/html cp -R Scripts %i/share/doc/%n - cd libImaging mkdir -p %i/include/python%type_raw[python]/PIL - cp -f ImConfig.h ImPlatform.h Imaging.h %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 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-114 BUILDME CONTENTS README +DocFiles: CHANGES-115 BUILDME CONTENTS README License: OSI-Approved Homepage: http://www.pythonware.com/products/pil Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]> Index: pil-py.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/pil-py.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pil-py.patch 11 Feb 2006 16:53:31 -0000 1.1 +++ pil-py.patch 13 Mar 2007 13:03:36 -0000 1.2 @@ -1,128 +1,89 @@ ---- Imaging-1.1.4/libImaging/Makefile.in.orig Fri Dec 13 05:50:30 2002 -+++ Imaging-1.1.4/libImaging/Makefile.in Fri Dec 13 05:51:31 2002 -@@ -24,7 +24,7 @@ - - DEFS= @DEFS@ - --LIBS= @LIBS@ @LIBM@ -+LIBS= $(LDFLAGS) @LIBS@ @LIBM@ - - # -------------------------------------------------------------------- - # Other things that are customizable but not by configure ---- Imaging/PIL/Image.py.orig Wed May 7 06:59:10 2003 -+++ Imaging/PIL/Image.py Wed May 7 07:00:16 2003 -@@ -1716,7 +1716,7 @@ - format = "BMP" - if not command: - command = "start" -- elif os.environ.get("OSTYPE") == "darwin": -+ elif sys.platform == "darwin": - format = "JPEG" - if not command: - command = "open -a /Applications/Preview.app" -@@ -1742,7 +1742,7 @@ - if os.name == "nt": - os.system("%s %s" % (command, file)) - # FIXME: this leaves temporary files around... -- elif os.environ.get("OSTYPE") == "darwin": -+ elif sys.platform == "darwin": - # on darwin open returns immediately resulting in the temp - # file removal while app is opening - os.system("(%s %s; sleep 20; rm -f %s)&" % (command, file, file)) ---- Imaging-1.1.4/setup.py.orig Fri Dec 13 06:06:28 2002 -+++ Imaging-1.1.4/setup.py Fri Dec 13 06:09:38 2002 -@@ -30,7 +30,7 @@ - # on Windows, the following is used to control how and where to search - # for Tcl/Tk files. None enables automatic searching; to override, set - # this to a directory name. --TCLROOT = None -+TCLROOT = "@PREFIX@" +--- 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 @@ - from PIL.Image import VERSION + if 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") ++ add_directory(library_dirs, "@PREFIX@/lib") ++ add_directory(include_dirs, "@PREFIX@/include") -@@ -46,10 +46,10 @@ - LIBRARIES = ["Imaging"] + # FIXME: check /opt/stuff directories here? - # Add some standard search spots for MacOSX/darwin --if os.path.exists('/sw/include'): -- INCLUDE_DIRS.append('/sw/include') --if os.path.exists('/sw/lib'): -- LIBRARY_DIRS.append('/sw/lib') -+if os.path.exists('@PREFIX@/include'): -+ INCLUDE_DIRS.append('@PREFIX@/include') -+if os.path.exists('@PREFIX@/lib'): -+ LIBRARY_DIRS.append('@PREFIX@/lib') +@@ -177,11 +177,11 @@ + # + # add standard directories - HAVE_LIBJPEG = 0 - HAVE_LIBTIFF = 0 -@@ -63,6 +63,8 @@ - lib = m.group(1) - if lib == "JPEG": - HAVE_LIBJPEG = 1 -+ INCLUDE_DIRS.append("@PREFIX@/include") -+ LIBRARY_DIRS.append("@PREFIX@/lib") - if sys.platform == "win32": - LIBRARIES.append("jpeg") - INCLUDE_DIRS.append(JPEGDIR) -@@ -71,6 +73,8 @@ - LIBRARIES.append("jpeg") - elif lib == "TIFF": - HAVE_LIBTIFF = 1 -+ INCLUDE_DIRS.append("@PREFIX@/include") -+ LIBRARY_DIRS.append("@PREFIX@/lib") - LIBRARIES.append("tiff") - elif lib == "Z": - HAVE_LIBZ = 1 -@@ -204,10 +208,15 @@ - EXTRA_LINK_ARGS = frameworks - HAVE_TCLTK = 1 +- 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") -+ tk_framework_found = 0 - if not tk_framework_found: - # assume the libraries are installed in the default location - LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION]) - HAVE_TCLTK = 1 -+ INCLUDE_DIRS.append(os.path.join(TCLROOT, "include")) -+ LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib")) -+ INCLUDE_DIRS.append("/usr/X11R6/include") -+ LIBRARY_DIRS.append("/usr/X11R6/lib") +- add_directory(library_dirs, "/usr/lib") +- add_directory(include_dirs, "/usr/include") ++ #add_directory(library_dirs, "/usr/lib") ++ #add_directory(include_dirs, "/usr/include") - if HAVE_TCLTK: - MODULES.append( -@@ -260,18 +269,13 @@ - if FILES: - INCLUDE_DIRS.append(os.path.join(FREETYPEDIR, "include")) - INCLUDE_DIRS.append(os.path.join(FREETYPEDIR, "src")) -- elif os.path.isdir("/usr/include/freetype2"): -- # assume that the freetype library is installed in a -- # standard location -- # FIXME: search for libraries -- LIBRARIES.append("freetype") -- INCLUDE_DIRS.append("/usr/include/freetype2") -- elif os.path.isdir("/sw/include/freetype2"): -+ elif os.path.isdir("/usr/X11R6/include/freetype2"): - # assume that the freetype library is installed in a - # standard location - # FIXME: search for libraries - LIBRARIES.append("freetype") -- INCLUDE_DIRS.append("/sw/include/freetype2") -- LIBRARY_DIRS.append("/sw/lib") -+ INCLUDE_DIRS.append("/usr/X11R6/include/freetype2") -+ INCLUDE_DIRS.append("/usr/X11R6/include") -+ LIBRARY_DIRS.append("/usr/X11R6/lib") - else: - have_freetype = 0 - ---- Imaging-1.1.4/_imagingft.c.orig -+++ Imaging-1.1.4/_imagingft.c -@@ -17,7 +17,8 @@ - #include "Python.h" - #include "Imaging.h" - --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #if defined(PY_VERSION_HEX) && PY_VERSION_HEX < 0x01060000 - #define PyObject_DEL(op) PyMem_DEL((op)) + # + # insert new dirs *before* default libs, to avoid conflicts +@@ -286,30 +286,30 @@ + "_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"] + )) +- 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 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"], + libraries=[feature.tcl, feature.tk] ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits