summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2005-10-12 14:48:44 +0000
committerdrochner <drochner@pkgsrc.org>2005-10-12 14:48:44 +0000
commitcd00f1eb318427eaa741a50fc0ef5952713e44cc (patch)
tree4f9ff0eb26270b990a48f8d6ae554b04aec542f1 /graphics
parent135b2da8f364bbee106cbee40ed191d4bc39372a (diff)
downloadpkgsrc-cd00f1eb318427eaa741a50fc0ef5952713e44cc.tar.gz
update to 1.1.5
changes: + Runs under Python 1.5.2 and newer, including 2.4. You may need additional libraries to build under 1.5.2; see instructions below. + New build procedure. The setup.py file now configures and builds the core library as well as the bindings, in one step. + Added stub drivers for BUFR, FITS, GRIB, HDF5, and WMF files. Stub drivers can identify the file format, but relies on application-provided drivers to read or write images in that format. + Added experimental "LA" mode support. An "LA" image is an "L" image with an attached transparency layer. + Added "RankFilter", "MinFilter", "MedianFilter", and "MaxFilter" classes to the ImageFilter module. + Improved support for applications using multiple threads on systems with multiple processors and/or hyperthreading processors. + Added EXIF GPSInfo read support for JPEG files. + Lots of bug fixes and performance tweaks. pkgsrc note: freetype and tiff support isn't built yet, should be separate pkgs
Diffstat (limited to 'graphics')
-rw-r--r--graphics/py-imaging/Makefile17
-rw-r--r--graphics/py-imaging/PLIST24
-rw-r--r--graphics/py-imaging/distinfo11
-rw-r--r--graphics/py-imaging/patches/patch-aa26
-rw-r--r--graphics/py-imaging/patches/patch-ab230
-rw-r--r--graphics/py-imagingtk/Makefile16
-rw-r--r--graphics/py-imagingtk/distinfo10
-rw-r--r--graphics/py-imagingtk/patches/patch-aa93
8 files changed, 120 insertions, 307 deletions
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 27c5167b5b6..542afe657dd 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/12 14:48:44 drochner Exp $
-DISTNAME= Imaging-1.1.4
-PKGNAME= ${PYPKGPREFIX}-imaging-1.1.4
-PKGREVISION= 1
+DISTNAME= Imaging-1.1.5
+PKGNAME= ${PYPKGPREFIX}-imaging-1.1.5
CATEGORIES= graphics python
MASTER_SITES= http://effbot.org/downloads/
@@ -13,19 +12,11 @@ COMMENT= PIL, the Python Imaging Library
DIST_SUBDIR= python
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-GNU_CONFIGURE= yes
-
-do-configure:
- (cd ${WRKSRC}/libImaging && ${SETENV} ${CONFIGURE_ENV} ./configure \
- ${CONFIGURE_ARGS} && ${SETENV} ${MAKE_ENV} ${MAKE})
- ${SED} "s|@JPEGDIR@|${BUILDLINK_PREFIX.jpeg}|g" <${WRKSRC}/setup.py \
- >${WRKSRC}/setup.py.tmp && ${MV} -f ${WRKSRC}/setup.py.tmp \
- ${WRKSRC}/setup.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/${PYINC}/PIL
(cd ${WRKSRC}/libImaging; ${INSTALL_DATA} \
- ImConfig.h ImPlatform.h Imaging.h \
+ ImPlatform.h Imaging.h \
${PREFIX}/${PYINC}/PIL )
.include "../../lang/python/extension.mk"
diff --git a/graphics/py-imaging/PLIST b/graphics/py-imaging/PLIST
index 68420e0cf9c..b4ffe5a6334 100644
--- a/graphics/py-imaging/PLIST
+++ b/graphics/py-imaging/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/14 16:43:50 recht Exp $
-${PYINC}/PIL/ImConfig.h
+@comment $NetBSD: PLIST,v 1.7 2005/10/12 14:48:44 drochner Exp $
${PYINC}/PIL/ImPlatform.h
${PYINC}/PIL/Imaging.h
${PYSITELIB}/PIL.pth
@@ -12,6 +11,9 @@ ${PYSITELIB}/PIL/BdfFontFile.pyo
${PYSITELIB}/PIL/BmpImagePlugin.py
${PYSITELIB}/PIL/BmpImagePlugin.pyc
${PYSITELIB}/PIL/BmpImagePlugin.pyo
+${PYSITELIB}/PIL/BufrStubImagePlugin.py
+${PYSITELIB}/PIL/BufrStubImagePlugin.pyc
+${PYSITELIB}/PIL/BufrStubImagePlugin.pyo
${PYSITELIB}/PIL/ContainerIO.py
${PYSITELIB}/PIL/ContainerIO.pyc
${PYSITELIB}/PIL/ContainerIO.pyo
@@ -27,6 +29,9 @@ ${PYSITELIB}/PIL/EpsImagePlugin.pyo
${PYSITELIB}/PIL/ExifTags.py
${PYSITELIB}/PIL/ExifTags.pyc
${PYSITELIB}/PIL/ExifTags.pyo
+${PYSITELIB}/PIL/FitsStubImagePlugin.py
+${PYSITELIB}/PIL/FitsStubImagePlugin.pyc
+${PYSITELIB}/PIL/FitsStubImagePlugin.pyo
${PYSITELIB}/PIL/FliImagePlugin.py
${PYSITELIB}/PIL/FliImagePlugin.pyc
${PYSITELIB}/PIL/FliImagePlugin.pyo
@@ -51,6 +56,15 @@ ${PYSITELIB}/PIL/GimpGradientFile.pyo
${PYSITELIB}/PIL/GimpPaletteFile.py
${PYSITELIB}/PIL/GimpPaletteFile.pyc
${PYSITELIB}/PIL/GimpPaletteFile.pyo
+${PYSITELIB}/PIL/GribStubImagePlugin.py
+${PYSITELIB}/PIL/GribStubImagePlugin.pyc
+${PYSITELIB}/PIL/GribStubImagePlugin.pyo
+${PYSITELIB}/PIL/Hdf5StubImagePlugin.py
+${PYSITELIB}/PIL/Hdf5StubImagePlugin.pyc
+${PYSITELIB}/PIL/Hdf5StubImagePlugin.pyo
+${PYSITELIB}/PIL/IcnsImagePlugin.py
+${PYSITELIB}/PIL/IcnsImagePlugin.pyc
+${PYSITELIB}/PIL/IcnsImagePlugin.pyo
${PYSITELIB}/PIL/IcoImagePlugin.py
${PYSITELIB}/PIL/IcoImagePlugin.pyc
${PYSITELIB}/PIL/IcoImagePlugin.pyo
@@ -84,6 +98,9 @@ ${PYSITELIB}/PIL/ImageFilter.pyo
${PYSITELIB}/PIL/ImageFont.py
${PYSITELIB}/PIL/ImageFont.pyc
${PYSITELIB}/PIL/ImageFont.pyo
+${PYSITELIB}/PIL/ImageGL.py
+${PYSITELIB}/PIL/ImageGL.pyc
+${PYSITELIB}/PIL/ImageGL.pyo
${PYSITELIB}/PIL/ImageGrab.py
${PYSITELIB}/PIL/ImageGrab.pyc
${PYSITELIB}/PIL/ImageGrab.pyo
@@ -171,6 +188,9 @@ ${PYSITELIB}/PIL/PsdImagePlugin.pyo
${PYSITELIB}/PIL/SgiImagePlugin.py
${PYSITELIB}/PIL/SgiImagePlugin.pyc
${PYSITELIB}/PIL/SgiImagePlugin.pyo
+${PYSITELIB}/PIL/SpiderImagePlugin.py
+${PYSITELIB}/PIL/SpiderImagePlugin.pyc
+${PYSITELIB}/PIL/SpiderImagePlugin.pyo
${PYSITELIB}/PIL/SunImagePlugin.py
${PYSITELIB}/PIL/SunImagePlugin.pyc
${PYSITELIB}/PIL/SunImagePlugin.pyo
diff --git a/graphics/py-imaging/distinfo b/graphics/py-imaging/distinfo
index e7e413490f3..a0895f77a51 100644
--- a/graphics/py-imaging/distinfo
+++ b/graphics/py-imaging/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:12 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/10/12 14:48:44 drochner Exp $
-SHA1 (python/Imaging-1.1.4.tar.gz) = 611972b63272bf4967ca966848ba8ddda970abcc
-RMD160 (python/Imaging-1.1.4.tar.gz) = c53065f5e73b2f5ac5ff132a47c157e5290f0488
-Size (python/Imaging-1.1.4.tar.gz) = 416338 bytes
-SHA1 (patch-aa) = ecca2f71e73f67d7bbd877ed7d70ba6bac22f67d
-SHA1 (patch-ab) = c5444ea51d49933d99dc568351dec7d0e0bea826
+SHA1 (python/Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f
+RMD160 (python/Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04
+Size (python/Imaging-1.1.5.tar.gz) = 429570 bytes
+SHA1 (patch-ab) = ccf70356bba6d5628d8cc40c1101dc4338bb6a55
diff --git a/graphics/py-imaging/patches/patch-aa b/graphics/py-imaging/patches/patch-aa
deleted file mode 100644
index 469ab738268..00000000000
--- a/graphics/py-imaging/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/02/26 17:43:21 drochner Exp $
-
---- libImaging/Makefile.in.orig 2003-04-22 18:11:26.000000000 +0200
-+++ libImaging/Makefile.in 2004-02-26 18:38:30.000000000 +0100
-@@ -30,10 +30,10 @@
- # Other things that are customizable but not by configure
-
- INCLDIR= $(srcdir)/.
--JPEGINCLUDE= /usr/local/include
-+JPEGINCLUDE= $(PREFIX)/include
- OPT= @OPT@
- #OPT= -g
--CFLAGS= $(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS)
-+CFLAGS= $(OPT) -I$(INCLDIR) -I$(JPEGINCLUDE) $(DEFS) -fPIC
-
- MKDEP= mkdep
- SHELL= /bin/sh
-@@ -82,7 +82,7 @@
- all: coretest $(LIB)
-
- coretest: coretest.o $(LIB)
-- $(CC) -o coretest coretest.o $(LIB) $(LIBS)
-+ $(CC) $(LDFLAGS) -o coretest coretest.o $(LIB) $(LIBS)
-
- $(LIB): $& $(OBJS)
- -rm -f $(LIB)
diff --git a/graphics/py-imaging/patches/patch-ab b/graphics/py-imaging/patches/patch-ab
index c8fe519aa5e..7e269e566df 100644
--- a/graphics/py-imaging/patches/patch-ab
+++ b/graphics/py-imaging/patches/patch-ab
@@ -1,200 +1,44 @@
-$NetBSD: patch-ab,v 1.3 2003/06/27 10:12:00 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2005/10/12 14:48:44 drochner Exp $
---- setup.py.orig 2003-05-09 14:00:56.000000000 +0200
-+++ setup.py 2003-06-24 14:34:28.000000000 +0200
-@@ -23,7 +23,7 @@
+--- setup.py.orig 2005-03-23 19:16:40.000000000 +0100
++++ setup.py
+@@ -79,10 +79,7 @@ from distutils import sysconfig
+ from distutils.core import Extension, setup
+ from distutils.command.build_ext import build_ext
- # on windows, the build script expects to find both library files and
- # include files in the directories below. tweak as necessary.
--JPEGDIR = "../../kits/jpeg-6b"
-+JPEGDIR = "/usr/pkg"
- ZLIBDIR = "../../kits/zlib-1.1.4"
- FREETYPEDIR = "../../kits/freetype-2.0"
-
-@@ -69,6 +69,8 @@
- LIBRARY_DIRS.append(JPEGDIR)
- else:
- LIBRARIES.append("jpeg")
-+ INCLUDE_DIRS.append(JPEGDIR + "/include")
-+ LIBRARY_DIRS.append(JPEGDIR + "/lib")
- elif lib == "TIFF":
- HAVE_LIBTIFF = 1
- LIBRARIES.append("tiff")
-@@ -117,177 +119,6 @@
- break
-
- # --------------------------------------------------------------------
--# configure imagingtk module
--
-try:
- import _tkinter
-- TCL_VERSION = _tkinter.TCL_VERSION[:3]
--except (ImportError, AttributeError):
-- pass
--else:
-- INCLUDE_DIRS = ["libImaging"]
-- LIBRARY_DIRS = ["libImaging"]
-- LIBRARIES = ["Imaging"]
-- EXTRA_COMPILE_ARGS = None
-- EXTRA_LINK_ARGS = None
-- if sys.platform == "win32":
-- # locate tcl/tk on windows
-- if TCLROOT:
-- path = [TCLROOT]
-- else:
-- path = [
-- os.path.join("/py" + PY_VERSION, "Tcl"),
-- os.path.join(os.environ.get("ProgramFiles", ""), "Tcl"),
-- # FIXME: add more directories here?
-- ]
-- for root in path:
-- TCLROOT = os.path.abspath(root)
-- if os.path.isfile(os.path.join(TCLROOT, "include", "tk.h")):
-- break
-- else:
-- TCLROOT = None
-- print "*** Cannot find Tcl/Tk headers and library files."
-- print "*** To build the Tkinter interface, set the TCLROOT"
-- print "*** variable in the setup.py file."
--
-- # print "using Tcl/Tk libraries at", TCLROOT
-- # print "using Tcl/Tk version", TCL_VERSION
--
-- if TCLROOT:
-- version = TCL_VERSION[0] + TCL_VERSION[2]
-- INCLUDE_DIRS.append(os.path.join(TCLROOT, "include"))
-- LIBRARY_DIRS.append(os.path.join(TCLROOT, "lib"))
-- LIBRARIES.extend(["tk" + version, "tcl" + version])
-- HAVE_TCLTK = 1
-- else:
-- tk_framework_found = 0
-- if sys.platform == 'darwin':
-- # First test for a MacOSX/darwin framework install
-- from os.path import join, exists
-- framework_dirs = [
-- '/System/Library/Frameworks/',
-- '/Library/Frameworks',
-- join(os.getenv('HOME'), '/Library/Frameworks')
-- ]
--
-- # Find the directory that contains the Tcl.framwork and Tk.framework
-- # bundles.
-- # XXX distutils should support -F!
-- for F in framework_dirs:
-- # both Tcl.framework and Tk.framework should be present
-- for fw in 'Tcl', 'Tk':
-- if not exists(join(F, fw + '.framework')):
-- break
-- else:
-- # ok, F is now directory with both frameworks. Continure
-- # building
-- tk_framework_found = 1
-- break
-- if tk_framework_found:
-- # For 8.4a2, we must add -I options that point inside the Tcl and Tk
-- # frameworks. In later release we should hopefully be able to pass
-- # the -F option to gcc, which specifies a framework lookup path.
-- #
-- tk_include_dirs = [
-- join(F, fw + '.framework', H)
-- for fw in 'Tcl', 'Tk'
-- for H in 'Headers', 'Versions/Current/PrivateHeaders'
-- ]
--
-- # For 8.4a2, the X11 headers are not included. Rather than include a
-- # complicated search, this is a hard-coded path. It could bail out
-- # if X11 libs are not found...
-- # tk_include_dirs.append('/usr/X11R6/include')
-- INCLUDE_DIRS = INCLUDE_DIRS + tk_include_dirs
-- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-- EXTRA_COMPILE_ARGS = frameworks
-- EXTRA_LINK_ARGS = frameworks
-- HAVE_TCLTK = 1
--
-- 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
--
-- if HAVE_TCLTK:
-- MODULES.append(
-- Extension(
-- "_imagingtk",
-- ["_imagingtk.c", "Tk/tkImaging.c"],
-- include_dirs=INCLUDE_DIRS,
-- library_dirs=LIBRARY_DIRS,
-- libraries=LIBRARIES
-- )
-- )
--
--# --------------------------------------------------------------------
--# configure imagingft module
--
--if os.path.isdir(FREETYPEDIR) or os.name == "posix":
--
-- FILES = []
-- INCLUDE_DIRS = ["libImaging"]
-- LIBRARY_DIRS = []
-- LIBRARIES = []
-- have_freetype = 1 # Assume we have it, unless proven otherwise
--
-- # use source distribution, if available
-- for file in [
-- "src/autohint/autohint.c",
-- "src/base/ftbase.c",
-- #"src/cache/ftcache.c",
-- "src/cff/cff.c",
-- "src/cid/type1cid.c",
-- "src/psaux/psaux.c",
-- "src/psnames/psnames.c",
-- "src/raster/raster.c",
-- "src/sfnt/sfnt.c",
-- "src/smooth/smooth.c",
-- "src/truetype/truetype.c",
-- "src/type1/type1.c",
-- "src/winfonts/winfnt.c",
-- "src/base/ftsystem.c",
-- "src/base/ftinit.c",
-- "src/base/ftglyph.c"
-- ]:
-- file = os.path.join(FREETYPEDIR, file)
-- if os.path.isfile(file):
-- FILES.append(file)
-- else:
-- FILES = []
-- break
--
-- 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"):
-- # 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")
-- else:
-- have_freetype = 0
+-except ImportError:
+- _tkinter = None
++_tkinter = None
+
+ def add_directory(path, dir, where=None):
+ if dir and os.path.isdir(dir) and dir not in path:
+@@ -177,9 +174,6 @@ class pil_build_ext(build_ext):
+ #
+ # add standard directories
+
+- add_directory(library_dirs, "/usr/local/lib")
+- add_directory(include_dirs, "/usr/local/include")
-
-- if have_freetype:
-- MODULES.append(
-- Extension(
-- "_imagingft",
-- ["_imagingft.c"] + FILES,
-- include_dirs=INCLUDE_DIRS,
-- library_dirs=LIBRARY_DIRS,
-- libraries=LIBRARIES,
-- extra_compile_args=EXTRA_COMPILE_ARGS,
-- extra_link_args=EXTRA_LINK_ARGS
-- )
-- )
+ add_directory(library_dirs, "/usr/lib")
+ add_directory(include_dirs, "/usr/include")
- # build!
+@@ -210,7 +204,7 @@ class pil_build_ext(build_ext):
+ if find_library_file(self, "tiff"):
+ feature.tiff = "tiff"
+- if find_library_file(self, "freetype"):
++ if 0:
+ # look for freetype2 include files
+ freetype_version = 0
+ for dir in include_dirs:
+@@ -433,7 +427,7 @@ if __name__ == "__main__":
+ package_dir={"": "PIL"},
+ packages=[""],
+ platforms="Python 1.5.2 and later.",
+- scripts = glob.glob("Scripts/pil*.py"),
++# scripts = glob.glob("Scripts/pil*.py"),
+ url=HOMEPAGE,
+ version=VERSION,
+ )
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index f7237690832..250a8985bbf 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/10/12 14:48:44 drochner Exp $
#
-DISTNAME= Imaging-1.1.4
-PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.4
-PKGREVISION= 1
+DISTNAME= Imaging-1.1.5
+PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.5
CATEGORIES= graphics python
MASTER_SITES= http://effbot.org/downloads/
@@ -14,17 +13,10 @@ COMMENT= Tk support for the Python Imaging Library (PIL)
DIST_SUBDIR= python
PYDISTUTILSPKG= yes
BUILDLINK_DEPENDS.python20= python20>=2.0.1nb4
-GNU_CONFIGURE= yes
+PY_PATCHPLIST= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-do-configure:
- (cd ${WRKSRC}/libImaging && ${SETENV} ${CONFIGURE_ENV} ./configure \
- ${CONFIGURE_ARGS} && ${SETENV} ${MAKE_ENV} ${MAKE})
- ${SED} "s|@JPEGDIR@|${BUILDLINK_PREFIX.jpeg}|g" <${WRKSRC}/setup.py \
- >${WRKSRC}/setup.py.tmp && ${MV} -f ${WRKSRC}/setup.py.tmp \
- ${WRKSRC}/setup.py
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging
(cd ${WRKSRC}/Scripts; \
diff --git a/graphics/py-imagingtk/distinfo b/graphics/py-imagingtk/distinfo
index 6222fe62544..40dd38018db 100644
--- a/graphics/py-imagingtk/distinfo
+++ b/graphics/py-imagingtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 08:45:12 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/10/12 14:48:44 drochner Exp $
-SHA1 (python/Imaging-1.1.4.tar.gz) = 611972b63272bf4967ca966848ba8ddda970abcc
-RMD160 (python/Imaging-1.1.4.tar.gz) = c53065f5e73b2f5ac5ff132a47c157e5290f0488
-Size (python/Imaging-1.1.4.tar.gz) = 416338 bytes
-SHA1 (patch-aa) = fbaf2e06237535ec52094bf6eb43e6a471f3966a
+SHA1 (python/Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f
+RMD160 (python/Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04
+Size (python/Imaging-1.1.5.tar.gz) = 429570 bytes
+SHA1 (patch-aa) = 1576267cd4274307d7f680c1e834930477e7603f
diff --git a/graphics/py-imagingtk/patches/patch-aa b/graphics/py-imagingtk/patches/patch-aa
index ab628437b36..9c6a1114d57 100644
--- a/graphics/py-imagingtk/patches/patch-aa
+++ b/graphics/py-imagingtk/patches/patch-aa
@@ -1,58 +1,51 @@
-$NetBSD: patch-aa,v 1.1 2003/08/18 10:15:43 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/12 14:48:44 drochner Exp $
---- setup.py.orig Fri May 9 14:00:56 2003
-+++ setup.py Sun Aug 17 00:55:09 2003
-@@ -85,16 +85,16 @@
- # standard windows libraries
- LIBRARIES.extend(["kernel32", "user32", "gdi32"])
+--- setup.py.orig 2005-03-23 19:16:40.000000000 +0100
++++ setup.py
+@@ -177,9 +177,6 @@ class pil_build_ext(build_ext):
+ #
+ # add standard directories
--MODULES.append(
-- Extension(
-- "_imaging",
-- ["_imaging.c", "decode.c", "encode.c", "map.c", "display.c",
-- "outline.c", "path.c"],
-- include_dirs=INCLUDE_DIRS,
-- library_dirs=LIBRARY_DIRS,
-- libraries=LIBRARIES
-- )
-- )
-+#MODULES.append(
-+# Extension(
-+# "_imaging",
-+# ["_imaging.c", "decode.c", "encode.c", "map.c", "display.c",
-+# "outline.c", "path.c"],
-+# include_dirs=INCLUDE_DIRS,
-+# library_dirs=LIBRARY_DIRS,
-+# libraries=LIBRARIES
-+# )
-+# )
+- 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")
- # security check
+@@ -210,7 +207,7 @@ class pil_build_ext(build_ext):
+ if find_library_file(self, "tiff"):
+ feature.tiff = "tiff"
-@@ -121,7 +121,7 @@
+- if find_library_file(self, "freetype"):
++ if 0:
+ # look for freetype2 include files
+ freetype_version = 0
+ for dir in include_dirs:
+@@ -265,9 +262,10 @@ class pil_build_ext(build_ext):
+ if struct.unpack("h", "\0\1")[0] == 1:
+ defs.append(("WORDS_BIGENDIAN", None))
- try:
- import _tkinter
-- TCL_VERSION = _tkinter.TCL_VERSION[:3]
-+ TCL_VERSION = ''.join(_tkinter.TCL_VERSION[:3].split('.'))
- except (ImportError, AttributeError):
- pass
- else:
-@@ -206,7 +206,7 @@
+- exts = [(Extension(
+- "_imaging", files, libraries=libs, define_macros=defs
+- ))]
++# exts = [(Extension(
++# "_imaging", files, libraries=libs, define_macros=defs
++# ))]
++ exts = []
- if not tk_framework_found:
- # assume the libraries are installed in the default location
-- LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION])
-+ LIBRARIES.extend(["tk" + TCL_VERSION, "tcl" + TCL_VERSION, "X11"])
- HAVE_TCLTK = 1
-
- if HAVE_TCLTK:
-@@ -300,7 +300,7 @@
- author_email=AUTHOR[1],
- description=DESCRIPTION,
- url=HOMEPAGE,
+ #
+ # additional libraries
+@@ -430,10 +428,10 @@ if __name__ == "__main__":
+ license="Python (MIT style)",
+ long_description=DESCRIPTION,
+ name=NAME,
+- package_dir={"": "PIL"},
- packages=[""],
++# package_dir={"": "PIL"},
+# packages=[""],
- extra_path = "PIL",
- package_dir={"": "PIL"},
- ext_modules = MODULES,
+ platforms="Python 1.5.2 and later.",
+- scripts = glob.glob("Scripts/pil*.py"),
++# scripts = glob.glob("Scripts/pil*.py"),
+ url=HOMEPAGE,
+ version=VERSION,
+ )