update to py-Pillow 2.7.0 and remove subpackages, py-sane distribution has
now been separated.
This commit is contained in:
sthen
parent
bce687caa7
commit
70adfb5e97
@ -1,77 +1,55 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2015/01/06 17:24:00 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2015/03/26 12:09:15 sthen Exp $
|
||||
|
||||
COMMENT-main= Python Imaging Library (fork)
|
||||
COMMENT-sane= Python SANE module
|
||||
COMMENT= Python Imaging Library (fork)
|
||||
|
||||
MODPY_EGG_VERSION= 2.6.2
|
||||
MODPY_EGG_VERSION= 2.7.0
|
||||
DISTNAME= Pillow-${MODPY_EGG_VERSION}
|
||||
PKGNAME-main= py-${DISTNAME}
|
||||
PKGNAME-sane= py-sane-${MODPY_EGG_VERSION}
|
||||
PKGNAME= py-${DISTNAME}
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= https://github.com/python-imaging/Pillow
|
||||
HOMEPAGE= http://python-pillow.github.io/
|
||||
|
||||
# PIL Software License
|
||||
# Permission to use, copy, modify and distribute freely.
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MULTI_PACKAGES= -main -sane
|
||||
|
||||
FLAVORS= python3
|
||||
FLAVOR?=
|
||||
.if ${FLAVOR:Mpython3}
|
||||
FULLPKGNAME-main= py3-${DISTNAME}
|
||||
FULLPKGNAME-sane= py3-sane-${MODPY_EGG_VERSION}
|
||||
FULLPKGPATH-main= graphics/py-Pillow,-main,python3
|
||||
FULLPKGPATH-sane= graphics/py-Pillow,-sane,python3
|
||||
.endif
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_PYPI:=P/Pillow/}
|
||||
EXTRACT_SUFX= .zip
|
||||
|
||||
WANTLIB-main= freetype jpeg lcms2 pthread tiff webp z \
|
||||
WANTLIB= freetype jpeg lcms2 pthread tiff webp z \
|
||||
webpdemux webpmux \
|
||||
${MODPY_WANTLIB} ${MODTK_WANTLIB}
|
||||
|
||||
WANTLIB-sane= pthread sane ${MODPY_WANTLIB}
|
||||
|
||||
MODULES= lang/python \
|
||||
x11/tk
|
||||
|
||||
BUILD_DEPENDS= ${MODPY_TKINTER_DEPENDS}
|
||||
TEST_DEPENDS= ${FULLPKGNAME-main}:${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
|
||||
TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}
|
||||
RUN_DEPENDS= ${MODPY_RUN_DEPENDS} \
|
||||
${MODPY_TKINTER_DEPENDS}
|
||||
# XXX can we get rid of tkinter dep for the library?
|
||||
|
||||
# Enable JPEG2000 support via openjpeg?
|
||||
LIB_DEPENDS-main= graphics/lcms2 \
|
||||
LIB_DEPENDS= graphics/lcms2 \
|
||||
graphics/libwebp \
|
||||
${MODTK_LIB_DEPENDS}
|
||||
|
||||
RUN_DEPENDS-sane= ${BASE_PKGPATH},-main
|
||||
LIB_DEPENDS-sane= ${MODPY_LIB_DEPENDS} \
|
||||
graphics/sane-backends
|
||||
|
||||
MODPY_SETUPTOOLS= Yes
|
||||
|
||||
INCL_DIR= ${PREFIX}/include/python${MODPY_VERSION}
|
||||
|
||||
MODPY_ADJ_FILES= Scripts/*.py
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/Sane/setup.py
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}/Sane && ${MODPY_BIN} setup.py build
|
||||
SUBST_VARS+= INCL_DIR
|
||||
INCL_DIR= ${MODPY_INCDIR:S/${LOCALBASE}\///}
|
||||
|
||||
post-install:
|
||||
cd ${WRKSRC}/Sane && \
|
||||
${MODPY_BIN} setup.py install --skip-build --root ${WRKINST}
|
||||
for s in ${WRKSRC}/Scripts/*.py; do \
|
||||
${INSTALL_SCRIPT} $$s ${PREFIX}/bin/`basename $$s .py`; \
|
||||
done
|
||||
${INSTALL_DATA_DIR} ${INCL_DIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/libImaging/{ImPlatform,Imaging}.h ${INCL_DIR}
|
||||
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_INCDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/libImaging/{ImPlatform,Imaging}.h ${WRKINST}${MODPY_INCDIR}
|
||||
.if ${FLAVOR:Mpython3}
|
||||
for s in ${PREFIX}/bin/*; do mv $$s $$s${MODPY_BIN_SUFFIX}; done
|
||||
.endif
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (Pillow-2.6.2.zip) = BlKCUmXekc3wx5F9FEKPNUhEkt6KTKdDbA9dVT1O/DM=
|
||||
SIZE (Pillow-2.6.2.zip) = 7533183
|
||||
SHA256 (Pillow-2.7.0.zip) = M6XQFF6CMm54Hd7hrTdfksuE+M+v6lbpUEaCrf9kpe4=
|
||||
SIZE (Pillow-2.7.0.zip) = 7597159
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-Sane_setup_py,v 1.1 2014/08/14 07:04:22 ajacoutot Exp $
|
||||
--- Sane/setup.py.orig Wed Aug 6 16:04:10 2014
|
||||
+++ Sane/setup.py Wed Aug 6 16:04:31 2014
|
||||
@@ -11,9 +11,9 @@ except ImportError:
|
||||
pass
|
||||
|
||||
sane = Extension('_sane',
|
||||
- include_dirs = [PIL_IMAGING_DIR],
|
||||
+ include_dirs = [PIL_IMAGING_DIR, '${LOCALBASE}/include'],
|
||||
libraries = ['sane'],
|
||||
- library_dirs = [PIL_IMAGING_DIR],
|
||||
+ library_dirs = [PIL_IMAGING_DIR, '${LOCALBASE}/lib'],
|
||||
define_macros = defs,
|
||||
sources = ['_sane.c'])
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
The Python SANE module provides an interface to the SANE scanner and
|
||||
frame grabber interface.
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2014/11/28 22:20:01 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2015/03/26 12:09:15 sthen Exp $
|
||||
@conflict py-Imaging-*
|
||||
@pkgpath graphics/py-Pillow${MODPY_FLAVOR}
|
||||
@pkgpath graphics/py-Pillow,-main${MODPY_FLAVOR}
|
||||
@pkgpath graphics/py-Imaging,-bin[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@pkgpath graphics/py-Imaging,-docs[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@pkgpath graphics/py-Imaging,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
|
||||
@ -18,9 +18,8 @@ bin/pilprint${MODPY_BIN_SUFFIX}
|
||||
bin/player${MODPY_BIN_SUFFIX}
|
||||
bin/thresholder${MODPY_BIN_SUFFIX}
|
||||
bin/viewer${MODPY_BIN_SUFFIX}
|
||||
include/python${MODPY_VERSION}/
|
||||
include/python${MODPY_VERSION}/ImPlatform.h
|
||||
include/python${MODPY_VERSION}/Imaging.h
|
||||
${INCL_DIR}/ImPlatform.h
|
||||
${INCL_DIR}/Imaging.h
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/BdfFontFile.py
|
||||
lib/python${MODPY_VERSION}/site-packages/PIL/BmpImagePlugin.py
|
||||
@ -1,5 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-sane,v 1.2 2014/11/28 22:20:01 sthen Exp $
|
||||
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sane.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/_sane.so
|
||||
lib/python${MODPY_VERSION}/site-packages/pysane-2.0-py${MODPY_VERSION}.egg-info
|
||||
lib/python${MODPY_VERSION}/site-packages/sane.py
|
||||
Loading…
Reference in New Issue
Block a user