Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv31709

Added Files:
        pil-1.1.4-2.info pil-1.1.4-2.patch 
Log Message:
Installs header files needed by sketch.


--- NEW FILE: pil-1.1.4-2.info ---
Package: pil
Version: 1.1.4
Revision: 2
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.
<<
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-%va2.tar.gz
Source-MD5: 57494e139bcd292dcc66341dfa31370f
BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng, libjpeg, dlcompat-dev, freetype2
Depends: python (>= 2.2.1-8), tcltk (>= 8.4.1-1), libpng-shlibs, libjpeg-shlibs, 
freetype2-shlibs
GCC: 3.1
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1
CompileScript: <<
 (cd libImaging; ./configure %c; make)
 python setup.py build
<<
InstallScript: <<
 #!/bin/sh
 python setup.py install --prefix=%i
 mkdir -p %i/share/doc/%n
 cp -R Doc/ %i/share/doc/%n/html
 cp -R Scripts %i/share/doc/%n
 cd libImaging
 pymajorver=`python -V 2>&1 | cut -f2 -d" " | cut -f1 -d"."`
 pyminorver=`python -V 2>&1 | cut -f2 -d" " | cut -f2 -d"."`
 pyver=$pymajorver"."$pyminorver
 mkdir -p %i/include/python${pyver}/PIL
 cp -f ImConfig.h ImPlatform.h Imaging.h %i/include/python${pyver}/PIL
<<
DocFiles: CHANGES-114 BUILDME CONTENTS README
License: OSI-Approved
Homepage: http://www.pythonware.com/products/pil
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

--- NEW FILE: pil-1.1.4-2.patch ---
--- 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-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@"
 
 from PIL.Image import VERSION
 
@@ -62,9 +62,13 @@
                 LIBRARY_DIRS.append(JPEGDIR)
             else:
                 LIBRARIES.append("jpeg")
+                INCLUDE_DIRS.append("@PREFIX@/include")
+                LIBRARY_DIRS.append("@PREFIX@/lib")
         elif lib == "TIFF":
             HAVE_LIBTIFF = 1
             LIBRARIES.append("tiff")
+            INCLUDE_DIRS.append("@PREFIX@/include")
+            LIBRARY_DIRS.append("@PREFIX@/lib")
         elif lib == "Z":
             HAVE_LIBZ = 1
             if sys.platform == "win32":
@@ -148,6 +152,11 @@
         LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib"))
         LIBRARIES.extend(["tk" + version, "tcl" + version])
     else:
+        version = TCL_VERSION[0] + TCL_VERSION[2]
+        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")
         # assume the libraries are installed in the default location
         LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])

@@ -205,7 +214,7 @@
         # standard location
         # FIXME: search for libraries
         LIBRARIES.append("freetype")
-        INCLUDE_DIRS.append("/usr/include/freetype2")
+        INCLUDE_DIRS.append("@PREFIX@/include/freetype2")
 
     MODULES.append(
         Extension(
--- Imaging-1.1.4/Tk/tkImaging.c.orig   Fri Dec 13 06:31:18 2002
+++ Imaging-1.1.4/Tk/tkImaging.c        Fri Dec 13 06:33:15 2002
@@ -162,7 +162,7 @@
                     if (w > 0) {
                         run.width = w;
                         run.pixelPtr = s;
-                        Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
+                        Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1, 
+TK_PHOTO_COMPOSITE_SET);
                     }
                     w = 0;
                 }
@@ -172,14 +172,14 @@
                 /* copy final run, if any */
                 run.width = w;
                 run.pixelPtr = s;
-                Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
+                Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1, 
+TK_PHOTO_COMPOSITE_SET);
           }
         }
 
     } else
 
         /* Copy opaque block to photo image, and leave the rest to TK */
-        Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
+        Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height, 
+TK_PHOTO_COMPOSITE_SET);
 
     return TCL_OK;
 }



-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility 
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to