- Update to 1.1.5

- Remove -examples subpackage
This commit is contained in:
alek 2005-11-20 13:59:50 +00:00
parent f8967194ca
commit 183026ac1d
14 changed files with 144 additions and 175 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.26 2005/01/25 14:25:46 alek Exp $
# $OpenBSD: Makefile,v 1.27 2005/11/20 13:59:50 alek Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
SHARED_ONLY= Yes
COMMENT= "Python imaging library"
COMMENT-examples= "examples for Python imaging library"
COMMENT= "Python imaging library"
VERSION= 1.1.4
DISTNAME= Imaging-${VERSION}
PKGNAME= py-${DISTNAME}p0
CATEGORIES= graphics
DISTNAME= Imaging-1.1.5
PKGNAME= py-${DISTNAME}
CATEGORIES= graphics
HOMEPAGE= http://www.pythonware.com/products/pil/
HOMEPAGE= http://www.pythonware.com/products/pil/
MAINTAINER= Aleksander Piotrowski <alek@openbsd.org>
@ -20,57 +18,32 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= freetype tcl84 z
WANTLIB= freetype tcl84 z
MASTER_SITES= http://www.pythonware.net/storage/
MASTER_SITES= http://www.pythonware.net/storage/
MODULES= lang/python
MODULES= lang/python
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${MODPY_TKINTER_DEPENDS}
LIB_DEPENDS= jpeg.62::graphics/jpeg \
tk84:tk-8.4.*:x11/tk/8.4
MULTI_PACKAGES= -examples
SUBPACKAGE?=
PKGNAME-examples= py-Imaging-examples-${VERSION}
.if defined(PACKAGING) && ${SUBPACKAGE} == "-examples"
RUN_DEPENDS= :py-Imaging-*:graphics/py-Imaging
LIB_DEPENDS=
PKG_ARCH= *
WANTLIB=
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE}/lib
LIB_IMAGING= ${WRKSRC}/libImaging
PIL_INCLUDES= ImConfig.h ImPlatform.h Imaging.h
RUN_DEPENDS= ${MODPY_TKINTER_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= jpeg.62::graphics/jpeg \
tk84:tk-8.4.*:x11/tk/8.4
do-configure:
@perl -pi -e "s|!LOCALBASE!|${LOCALBASE}|g; s|!X11BASE!|${X11BASE}|g" \
${WRKSRC}/setup.py
@cd ${LIB_IMAGING}; ${SETENV} ${CONFIGURE_ENV} \
./configure ${CONFIGURE_ARGS}
pre-build:
@cd ${LIB_IMAGING} && \
${MAKE_ENV} ${MAKE_PROGRAM} CC="${CC}" OPT="${CFLAGS}"
@perl -pi -e "s|!LOCALBASE!|${LOCALBASE}|g; s|!X11BASE!|${X11BASE}|g; s|!MODPY_VERSION!|${MODPY_VERSION}|g" \
${WRKSRC}/setup.py ${WRKSRC}/Scripts/pil*.py
post-install:
${INSTALL_SCRIPT_DIR} ${PREFIX}/share/examples/py-Imaging
for file in ${WRKSRC}/Scripts/*; do \
${INSTALL_SCRIPT} $$file \
${PREFIX}/share/examples/py-Imaging; \
${INSTALL_SCRIPT} ${WRKSRC}/Scripts/*.py \
${PREFIX}/share/examples/py-Imaging
${INSTALL_DATA} ${WRKSRC}/Scripts/README \
${PREFIX}/share/examples/py-Imaging
for file in ${WRKSRC}/Scripts/pil*.py; do \
${INSTALL_SCRIPT} $$file ${PREFIX}/bin/`basename $$file .py`; \
done
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_INCDIR}
.for a in ${PIL_INCLUDES}
${INSTALL_DATA} ${LIB_IMAGING}/$a ${WRKINST}${MODPY_INCDIR}
.endfor
do-regress: fake
@cd ${LIB_IMAGING} && ./coretest
@cd ${WRKSRC} && \
${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG}/PIL \
${MODPY_BIN} ./selftest.py

View File

@ -1,4 +1,4 @@
MD5 (Imaging-1.1.4.tar.gz) = d2c03c25a9a0128832137dd536da88da
RMD160 (Imaging-1.1.4.tar.gz) = c53065f5e73b2f5ac5ff132a47c157e5290f0488
SHA1 (Imaging-1.1.4.tar.gz) = 611972b63272bf4967ca966848ba8ddda970abcc
SIZE (Imaging-1.1.4.tar.gz) = 416338
MD5 (Imaging-1.1.5.tar.gz) = a64512e39469213ced0d091b9eba76c0
RMD160 (Imaging-1.1.5.tar.gz) = 99ca581f2f96d1112f6c36eccdf96da1ac014a04
SHA1 (Imaging-1.1.5.tar.gz) = 06705b31b534a15aef827bccc87dceb9ebc51b9f
SIZE (Imaging-1.1.5.tar.gz) = 429570

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Scripts_pilconvert_py,v 1.1 2005/11/20 13:59:50 alek Exp $
--- Scripts/pilconvert.py.orig Sun Nov 20 13:14:05 2005
+++ Scripts/pilconvert.py Sun Nov 20 13:14:31 2005
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! !LOCALBASE!/bin/python!MODPY_VERSION!
#
# The Python Imaging Library.
# $Id: patch-Scripts_pilconvert_py,v 1.1 2005/11/20 13:59:50 alek Exp $

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Scripts_pildriver_py,v 1.1 2005/11/20 13:59:50 alek Exp $
--- Scripts/pildriver.py.orig Sun Nov 20 13:14:05 2005
+++ Scripts/pildriver.py Sun Nov 20 13:15:01 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!!LOCALBASE!/bin/python!MODPY_VERSION!
"""PILdriver, an image-processing calculator using PIL.
An instance of class PILDriver is essentially a software stack machine

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Scripts_pilfile_py,v 1.1 2005/11/20 13:59:50 alek Exp $
--- Scripts/pilfile.py.orig Sun Nov 20 13:14:05 2005
+++ Scripts/pilfile.py Sun Nov 20 13:15:11 2005
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! !LOCALBASE!/bin/python!MODPY_VERSION!
#
# The Python Imaging Library.
# $Id: patch-Scripts_pilfile_py,v 1.1 2005/11/20 13:59:50 alek Exp $

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Scripts_pilfont_py,v 1.1 2005/11/20 13:59:50 alek Exp $
--- Scripts/pilfont.py.orig Sun Nov 20 13:14:05 2005
+++ Scripts/pilfont.py Sun Nov 20 13:15:22 2005
@@ -1,4 +1,4 @@
-#
+#! !LOCALBASE!/bin/python!MODPY_VERSION!
# The Python Imaging Library
# $Id: patch-Scripts_pilfont_py,v 1.1 2005/11/20 13:59:50 alek Exp $
#

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Scripts_pilprint_py,v 1.1 2005/11/20 13:59:50 alek Exp $
--- Scripts/pilprint.py.orig Sun Nov 20 13:14:05 2005
+++ Scripts/pilprint.py Sun Nov 20 13:15:33 2005
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#! !LOCALBASE!/bin/python!MODPY_VERSION!
#
# The Python Imaging Library.
# $Id: patch-Scripts_pilprint_py,v 1.1 2005/11/20 13:59:50 alek Exp $

View File

@ -1,11 +1,14 @@
$OpenBSD: patch-Tk_tkImaging_c,v 1.2 2004/05/23 15:58:01 xsa Exp $
--- Tk/tkImaging.c.orig 2004-05-20 11:41:23.000000000 +0200
+++ Tk/tkImaging.c 2004-05-20 11:57:56.000000000 +0200
@@ -194,6 +194,6 @@ PyImagingPhoto(ClientData clientdata, Tc
$OpenBSD: patch-Tk_tkImaging_c,v 1.3 2005/11/20 13:59:50 alek Exp $
--- Tk/tkImaging.c.orig Sat Sep 11 22:05:11 2004
+++ Tk/tkImaging.c Fri Nov 11 15:03:32 2005
@@ -240,8 +240,8 @@ PyImagingPhotoGet(ClientData clientdata,
void
TkImaging_Init(Tcl_Interp* interp)
{
- Tcl_CreateCommand(interp, "PyImagingPhoto", PyImagingPhoto,
+ Tcl_CreateCommand(interp, "PyImagingPhoto", (Tcl_CmdProc *)PyImagingPhoto,
- Tcl_CreateCommand(interp, "PyImagingPhoto", PyImagingPhotoPut,
+ Tcl_CreateCommand(interp, "PyImagingPhoto", (Tcl_CmdProc *) PyImagingPhotoPut,
(ClientData) 0, (Tcl_CmdDeleteProc*) NULL);
- Tcl_CreateCommand(interp, "PyImagingPhotoGet", PyImagingPhotoGet,
+ Tcl_CreateCommand(interp, "PyImagingPhotoGet", (Tcl_CmdProc *) PyImagingPhotoGet,
(ClientData) 0, (Tcl_CmdDeleteProc*) NULL);
}

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-_imagingft_c,v 1.1 2004/11/07 14:34:42 naddy Exp $
--- _imagingft.c.orig Sun Nov 7 12:59:41 2004
+++ _imagingft.c Sun Nov 7 13:00:17 2004
@@ -15,7 +15,8 @@
#include "Python.h"
#include "Imaging.h"
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#if PY_VERSION_HEX < 0x01060000
#define PyObject_DEL(op) PyMem_DEL((op))

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-libImaging_Makefile_in,v 1.3 2004/05/23 15:58:01 xsa Exp $
--- libImaging/Makefile.in.orig 2003-04-22 18:11:26.000000000 +0200
+++ libImaging/Makefile.in 2004-05-12 22:37:20.000000000 +0200
@@ -30,10 +30,10 @@ LIBS= @LIBS@ @LIBM@
# Other things that are customizable but not by configure
INCLDIR= $(srcdir)/.
-JPEGINCLUDE= /usr/local/include
+JPEGINCLUDE= ${LOCALBASE}/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 @@ LIB= libImaging.a
all: coretest $(LIB)
coretest: coretest.o $(LIB)
- $(CC) -o coretest coretest.o $(LIB) $(LIBS)
+ $(CC) -o coretest coretest.o -L${LOCALBASE}/lib $(LIB) $(LIBS)
$(LIB): $& $(OBJS)
-rm -f $(LIB)
@@ -121,7 +121,7 @@ Imaging_wrap.c:
wrap -python -dnone Imaging.i
exercise: Imaging_wrap.c
- gcc -I../../../Include Imaging_wrap.c -c
+ ${CC} -I../../../Include Imaging_wrap.c -c
ld -shared -expect_unresolved "*" Imaging_wrap.o\
libImaging.a -o Imaging.so
python exerciseImaging.py

View File

@ -1,46 +1,31 @@
$OpenBSD: patch-setup_py,v 1.1 2004/05/23 16:00:18 xsa Exp $
--- setup.py.orig 2003-05-09 14:00:56.000000000 +0200
+++ setup.py 2004-03-31 16:39:04.000000000 +0200
@@ -41,8 +41,8 @@ PY_VERSION = sys.version[0] + sys.versio
$OpenBSD: patch-setup_py,v 1.2 2005/11/20 13:59:50 alek Exp $
--- setup.py.orig Wed Mar 23 19:16:40 2005
+++ setup.py Sun Nov 20 13:20:20 2005
@@ -183,6 +183,9 @@ class pil_build_ext(build_ext):
add_directory(library_dirs, "/usr/lib")
add_directory(include_dirs, "/usr/include")
MODULES = []
+ add_directory(library_dirs, "/usr/X11R6/lib")
+ add_directory(include_dirs, "/usr/X11R6/include")
+
#
# insert new dirs *before* default libs, to avoid conflicts
# between Python PYD stub libs and real libraries
@@ -312,7 +315,8 @@ class pil_build_ext(build_ext):
elif feature.tcl and feature.tk:
exts.append(Extension(
"_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
- libraries=[feature.tcl, feature.tk]
+ libraries=[feature.tcl, feature.tk],
+ include_dirs=["/usr/local/include/tk8.4", "/usr/local/include/tcl8.4", "/usr/X11R6/include"]
))
-INCLUDE_DIRS = ["libImaging"]
-LIBRARY_DIRS = ["libImaging"]
+INCLUDE_DIRS = ["libImaging", "!LOCALBASE!/include"]
+LIBRARY_DIRS = ["libImaging", "!LOCALBASE!/lib"]
LIBRARIES = ["Imaging"]
# Add some standard search spots for MacOSX/darwin
@@ -121,12 +121,12 @@ if HAVE_LIBZ:
try:
import _tkinter
- TCL_VERSION = _tkinter.TCL_VERSION[:3]
+ TCL_VERSION = _tkinter.TCL_VERSION[:3].replace('.', '')
except (ImportError, AttributeError):
pass
else:
- INCLUDE_DIRS = ["libImaging"]
- LIBRARY_DIRS = ["libImaging"]
+ INCLUDE_DIRS = ["libImaging", "!LOCALBASE!/include/tk8.4/", "!LOCALBASE!/include/tcl8.4/", "!X11BASE!/include/"]
+ LIBRARY_DIRS = ["libImaging", "!LOCALBASE!/lib/", "!X11BASE!/lib/"]
LIBRARIES = ["Imaging"]
EXTRA_COMPILE_ARGS = None
EXTRA_LINK_ARGS = None
@@ -260,12 +260,13 @@ if os.path.isdir(FREETYPEDIR) or os.name
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"):
+ elif os.path.isdir("!X11BASE!/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")
+ INCLUDE_DIRS += ["!X11BASE!/include/freetype2", "!X11BASE!/include"]
+ LIBRARY_DIRS.append("!X11BASE!/lib")
elif os.path.isdir("/sw/include/freetype2"):
# assume that the freetype library is installed in a
# standard location
if os.path.isfile("_pilmath.c"):
@@ -433,7 +437,6 @@ if __name__ == "__main__":
package_dir={"": "PIL"},
packages=[""],
platforms="Python 1.5.2 and later.",
- scripts = glob.glob("Scripts/pil*.py"),
url=HOMEPAGE,
version=VERSION,
)

View File

@ -1,4 +0,0 @@
The Python Imaging Library (PIL) adds image processing
capabilities to your Python interpreter.
These are some example scripts for PIL.

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 00:50:10 espie Exp $
include/python${MODPY_VERSION}/ImConfig.h
include/python${MODPY_VERSION}/ImPlatform.h
include/python${MODPY_VERSION}/Imaging.h
@comment $OpenBSD: PLIST,v 1.7 2005/11/20 13:59:50 alek Exp $
bin/pilconvert
bin/pildriver
bin/pilfile
bin/pilfont
bin/pilprint
lib/python${MODPY_VERSION}/site-packages/PIL/
lib/python${MODPY_VERSION}/site-packages/PIL.pth
lib/python${MODPY_VERSION}/site-packages/PIL/ArgImagePlugin.py
@ -10,6 +12,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/BdfFontFile.py
lib/python${MODPY_VERSION}/site-packages/PIL/BdfFontFile.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/BmpImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/BmpImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/BufrStubImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/BufrStubImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ContainerIO.py
lib/python${MODPY_VERSION}/site-packages/PIL/ContainerIO.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/CurImagePlugin.py
@ -20,6 +24,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/EpsImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/EpsImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ExifTags.py
lib/python${MODPY_VERSION}/site-packages/PIL/ExifTags.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/FitsStubImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/FitsStubImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/FliImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/FliImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/FontFile.py
@ -36,6 +42,12 @@ lib/python${MODPY_VERSION}/site-packages/PIL/GimpGradientFile.py
lib/python${MODPY_VERSION}/site-packages/PIL/GimpGradientFile.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/GimpPaletteFile.py
lib/python${MODPY_VERSION}/site-packages/PIL/GimpPaletteFile.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/GribStubImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/GribStubImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/Hdf5StubImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/Hdf5StubImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/IcnsImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/IcnsImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/IcoImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/IcoImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImImagePlugin.py
@ -58,6 +70,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/ImageFilter.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFilter.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFont.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageFont.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGL.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGL.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.py
lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/ImageOps.py
@ -116,6 +130,8 @@ lib/python${MODPY_VERSION}/site-packages/PIL/PsdImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/PsdImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/SgiImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/SgiImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/SpiderImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/SpiderImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/SunImagePlugin.py
lib/python${MODPY_VERSION}/site-packages/PIL/SunImagePlugin.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/TarIO.py
@ -141,3 +157,18 @@ lib/python${MODPY_VERSION}/site-packages/PIL/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingft.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingtk.so
share/examples/py-Imaging/
share/examples/py-Imaging/README
share/examples/py-Imaging/enhancer.py
share/examples/py-Imaging/explode.py
share/examples/py-Imaging/gifmaker.py
share/examples/py-Imaging/image2py.py
share/examples/py-Imaging/painter.py
share/examples/py-Imaging/pilconvert.py
share/examples/py-Imaging/pildriver.py
share/examples/py-Imaging/pilfile.py
share/examples/py-Imaging/pilfont.py
share/examples/py-Imaging/pilprint.py
share/examples/py-Imaging/player.py
share/examples/py-Imaging/thresholder.py
share/examples/py-Imaging/viewer.py

View File

@ -1,17 +0,0 @@
@comment $OpenBSD: PLIST-examples,v 1.3 2004/09/15 00:50:10 espie Exp $
share/examples/py-Imaging/
share/examples/py-Imaging/README
share/examples/py-Imaging/bdf2pil.py
share/examples/py-Imaging/enhancer.py
share/examples/py-Imaging/explode.py
share/examples/py-Imaging/gifmaker.py
share/examples/py-Imaging/image2py.py
share/examples/py-Imaging/painter.py
share/examples/py-Imaging/pilconvert.py
share/examples/py-Imaging/pildriver.py
share/examples/py-Imaging/pilfile.py
share/examples/py-Imaging/pilfont.py
share/examples/py-Imaging/pilprint.py
share/examples/py-Imaging/player.py
share/examples/py-Imaging/thresholder.py
share/examples/py-Imaging/viewer.py