Hi,
here's an update to py-Pillow 5.4.1, and enable openjp2 support while
here. Will put it in a bulk, but feedback from consumers welcome.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/py-Pillow/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 4 May 2018 09:54:41 -0000 1.24
+++ Makefile 7 Jan 2019 13:25:59 -0000
@@ -2,7 +2,7 @@
COMMENT= Python Imaging Library (maintained fork of PIL)
-MODPY_EGG_VERSION= 5.1.0
+MODPY_EGG_VERSION= 5.4.1
DISTNAME= Pillow-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= graphics
@@ -18,7 +18,7 @@
MODPY_PI = Yes
-WANTLIB= freetype jpeg lcms2 pthread tiff webp z \
+WANTLIB= freetype openjp2 jpeg lcms2 pthread tiff webp z \
webpdemux webpmux \
${MODPY_WANTLIB}
@@ -29,14 +29,13 @@
RUN_DEPENDS= ${MODPY_RUN_DEPENDS}
LIB_DEPENDS= graphics/lcms2 \
+ graphics/openjp2 \
graphics/libwebp
MODPY_SETUPTOOLS= Yes
SUBST_VARS+= INCL_DIR MODPY_FLAVOR
INCL_DIR= ${MODPY_INCDIR:S/${LOCALBASE}\///}
-
-MODPY_DISTUTILS_BUILD= build_ext --disable-jpeg2000
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_INCDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/py-Pillow/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 4 May 2018 09:54:41 -0000 1.13
+++ distinfo 7 Jan 2019 13:25:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (Pillow-5.1.0.tar.gz) = zum8db/0VdMXtpRwgd8IJKjxGN4nhtw9dKNQP9Yx9O8=
-SIZE (Pillow-5.1.0.tar.gz) = 14286366
+SHA256 (Pillow-5.4.1.tar.gz) = UjNmTq36NCxjm5uZdxkNZK16yk7cUalmOU1+COfzip8=
+SIZE (Pillow-5.4.1.tar.gz) = 16016153
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py 7 Jan 2019 13:25:59 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+find our graphics/openjp2 install
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -503,18 +503,18 @@ class pil_build_ext(build_ext):
+
+ # Find the best version
+ for directory in self.compiler.include_dirs:
+- _dbg('Checking for openjpeg-#.# in %s', directory)
++ _dbg('Checking for openjp2 in %s', directory)
+ try:
+ listdir = os.listdir(directory)
+ except Exception:
+ # WindowsError, FileNotFoundError
+ continue
+ for name in listdir:
+- if name.startswith('openjpeg-') and \
++ if name.startswith('openjp2') and \
+ os.path.isfile(os.path.join(directory, name,
+ 'openjpeg.h')):
+ _dbg('Found openjpeg.h in %s/%s', (directory, name))
+- version = tuple(int(x) for x in name[9:].split('.'))
++ version = "2"
+ if best_version is None or version > best_version:
+ best_version = version
+ best_path = os.path.join(directory, name)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/py-Pillow/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 4 May 2018 09:54:41 -0000 1.8
+++ pkg/PLIST 7 Jan 2019 13:25:59 -0000
@@ -186,8 +186,8 @@
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_binary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_tkinter_finder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}features.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/PIL/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PIL/_binary.py
lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingcms.so
@@ -197,9 +197,9 @@
lib/python${MODPY_VERSION}/site-packages/PIL/_imagingtk.so
lib/python${MODPY_VERSION}/site-packages/PIL/_tkinter_finder.py
lib/python${MODPY_VERSION}/site-packages/PIL/_util.py
+lib/python${MODPY_VERSION}/site-packages/PIL/_version.py
lib/python${MODPY_VERSION}/site-packages/PIL/_webp.so
lib/python${MODPY_VERSION}/site-packages/PIL/features.py
-lib/python${MODPY_VERSION}/site-packages/PIL/version.py
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Pillow-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
