Attachment #142066 for bug #189029

View | Details | Raw Unified | Return to bug 189029
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	pillow
PORTVERSION=	2.4.0
PORTREVISION=	1
CATEGORIES=	graphics python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=	${PORTNAME:C/p/P/}-${PORTVERSION}


TIFF_LIB_DEPENDs=	libtiff.so:${PORTSDIR}/graphics/tiff
WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp

USES=	zip:infozip
USE_PYTHON=		yes
USE_PYDISTUTILS=	yes


PYDISTUTILS_AUTOPLIST=		yes
PYDISTUTILS_BUILD_TARGET=	build_ext

GH_ACCOUNT=	python-imaging
GH_PROJECT=	${PORTNAME:C/p/P/}
GH_COMMIT=	b1b88cf

CONFLICTS_INSTALL=	py*-imaging-*

.include <bsd.port.options.mk>

PYDISTUTILS_BUILDARGS+=	--disable-webp
.endif

post-patch:
# OpenJPEG header inside ${LOCALBASE}/include (no subdirectory)
	${REINPLACE_CMD} -e 's|openjpeg-2.0/||' \
		${WRKSRC}/libImaging/Jpeg2K.h

regression-test: extract
	@cd ${WRKSRC} && \
	${PYTHON_CMD} ${PYSETUP} build_ext -i && \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Pillow-2.3.0.tar.gz) = 635e366eaaf7b81d7a5d5818af50d42ca1247c42b5e4ad896473fb2d6e3a038f	1	SHA256 (Pillow-2.4.0.zip) = 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
2	SIZE (Pillow-2.3.0.tar.gz) = 2224984	2	SIZE (Pillow-2.4.0.zip) = 6519873




--- ./setup.py.orig	2014-04-01 18:21:44.000000000 +0000
+++ ./setup.py	2014-04-26 18:30:44.000000000 +0000
@@ -369,9 +369,18 @@
                     feature.jpeg = "libjpeg"  # alternative name
 
         if feature.want('jpeg2000'):
-            if _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
-                if _find_library_file(self, "openjp2"):
-                    feature.jpeg2000 = "openjp2"
+            if sys.platform.startswith("dragonfly") or sys.platform.startswith("freebsd"): 
+                # needs graphics/openjpeg > 1.5.x
+                if _find_include_file(self, "openjpeg.h"):
+                    if _find_library_file(self, "openjp2"):
+                        feature.jpeg2000 = "openjp2"
+                elif _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
+                    if _find_library_file(self, "openjp2"):
+                        feature.jpeg2000 = "openjp2"
+            else:
+                if _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
+                    if _find_library_file(self, "openjp2"):
+                        feature.jpeg2000 = "openjp2"
                     
         if feature.want('tiff'):
             if _find_library_file(self, "tiff"):

Lines 2-5 Link Here

(-)pkg-descr (-1 / +1 lines)
2	was started for and is currently maintained by the Plone community. But it is	2	was started for and is currently maintained by the Plone community. But it is
3	used by many other folks in the Python web community.	3	used by many other folks in the Python web community.
4		4
5	WWW: http://github.com/python-imaging/Pillow/	5	WWW: http://python-imaging.github.io/

Return to bug 189029

Lines 2-10 Link Here

(-)Makefile (-7 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pillow	4	PORTNAME= pillow
5	PORTVERSION= 2.3.0	5	PORTVERSION= 2.4.0
6	PORTREVISION= 1
7	CATEGORIES= graphics python	6	CATEGORIES= graphics python
		7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9	DISTNAME= ${PORTNAME:C/p/P/}-${PORTVERSION}	9	DISTNAME= ${PORTNAME:C/p/P/}-${PORTVERSION}
10		10
Lines 27-33 Link Here
27	TIFF_LIB_DEPENDs= libtiff.so:${PORTSDIR}/graphics/tiff	27	TIFF_LIB_DEPENDs= libtiff.so:${PORTSDIR}/graphics/tiff
28	WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp	28	WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
29		29
30	USE_GITHUB= yes	30	USES= zip:infozip
31	USE_PYTHON= yes	31	USE_PYTHON= yes
32	USE_PYDISTUTILS= yes	32	USE_PYDISTUTILS= yes
33		33
Lines 34-43 Link Here
34	PYDISTUTILS_AUTOPLIST= yes	34	PYDISTUTILS_AUTOPLIST= yes
35	PYDISTUTILS_BUILD_TARGET= build_ext	35	PYDISTUTILS_BUILD_TARGET= build_ext
36		36
37	GH_ACCOUNT= python-imaging
38	GH_PROJECT= ${PORTNAME:C/p/P/}
39	GH_COMMIT= b1b88cf
40
41	CONFLICTS_INSTALL= py-imaging-	37	CONFLICTS_INSTALL= py-imaging-
42		38
43	.include <bsd.port.options.mk>	39	.include <bsd.port.options.mk>
Lines 78-83 Link Here
78	PYDISTUTILS_BUILDARGS+= --disable-webp	74	PYDISTUTILS_BUILDARGS+= --disable-webp
79	.endif	75	.endif
80		76
		77	post-patch:
		78	# OpenJPEG header inside ${LOCALBASE}/include (no subdirectory)
		79	${REINPLACE_CMD} -e 's\|openjpeg-2.0/\|\|' \
		80	${WRKSRC}/libImaging/Jpeg2K.h
		81
81	regression-test: extract	82	regression-test: extract
82	@cd ${WRKSRC} && \	83	@cd ${WRKSRC} && \
83	${PYTHON_CMD} ${PYSETUP} build_ext -i && \	84	${PYTHON_CMD} ${PYSETUP} build_ext -i && \

Line 0 Link Here

(-)files/patch-setup.py (+24 lines)
	1	--- ./setup.py.orig 2014-04-01 18:21:44.000000000 +0000
	2	+++ ./setup.py 2014-04-26 18:30:44.000000000 +0000
	3	@@ -369,9 +369,18 @@
	4	feature.jpeg = "libjpeg" # alternative name
	5
	6	if feature.want('jpeg2000'):
	7	- if _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
	8	- if _find_library_file(self, "openjp2"):
	9	- feature.jpeg2000 = "openjp2"
	10	+ if sys.platform.startswith("dragonfly") or sys.platform.startswith("freebsd"):
	11	+ # needs graphics/openjpeg > 1.5.x
	12	+ if _find_include_file(self, "openjpeg.h"):
	13	+ if _find_library_file(self, "openjp2"):
	14	+ feature.jpeg2000 = "openjp2"
	15	+ elif _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
	16	+ if _find_library_file(self, "openjp2"):
	17	+ feature.jpeg2000 = "openjp2"
	18	+ else:
	19	+ if _find_include_file(self, "openjpeg-2.0/openjpeg.h"):
	20	+ if _find_library_file(self, "openjp2"):
	21	+ feature.jpeg2000 = "openjp2"
	22
	23	if feature.want('tiff'):
	24	if _find_library_file(self, "tiff"):