python3-pillow: add 5.4.1

- Set option by modify setup.py

- Do not override do_compile to call `setup.py build_ext', it will
  missing options at do_install time which causing host contamination
  ...
  Found webp/demux.h
  Found library webpmux at /usr/lib/libwebpmux.so
  Found library webpdemux at /usr/lib/libwebpdemux.so
  /usr/include/pthread.h:682:6: error: 'regparm' is not valid on this platform
  ...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia 2019-03-19 14:01:00 +08:00 committed by Khem Raj
parent 4ce1fb5356
commit 6cb4e90fcd
3 changed files with 128 additions and 0 deletions

View File

@ -0,0 +1,39 @@
From 52879439f2976662140b76951f43f16e1d5ef08e Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 18 Mar 2019 23:23:55 -0400
Subject: [PATCH] explicitly set compile options
OE does not support to install egg package, so
explicitly set build_ext options for oe-core's
`setup.py install'
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
setup.cfg | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/setup.cfg b/setup.cfg
index 95900ff..27da313 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,3 +9,15 @@ addopts = -vx Tests
[flake8]
max-line-length = 88
+
+[build_ext]
+disable-platform-guessing = 1
+enable-zlib = 1
+enable-jpeg = 1
+enable-tiff = 1
+enable-freetype = 1
+enable-lcms = 1
+enable-jpeg2000 = 1
+disable-webp = 1
+disable-webpmux = 1
+disable-imagequant = 1
--
2.8.1

View File

@ -0,0 +1,61 @@
From a78411402c824668283beb94db4bf7e206a4cf60 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 14 Mar 2019 03:48:10 -0400
Subject: [PATCH] support cross compiling
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
setup.py | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/setup.py b/setup.py
index 79f912b..37e5827 100755
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ _LIB_IMAGING = (
"ZipEncode", "TiffDecode", "Jpeg2KDecode", "Jpeg2KEncode", "BoxBlur",
"QuantPngQuant", "codec_fd")
-DEBUG = False
+DEBUG = True
class DependencyException(Exception):
@@ -345,21 +345,16 @@ class pil_build_ext(build_ext):
_add_directory(library_dirs, match.group(1))
# include, rpath, if set as environment variables:
- for k in ('C_INCLUDE_PATH', 'CPATH', 'INCLUDE'):
+ for k in ('C_INCLUDE_PATH', 'CPATH', 'INCLUDE', 'STAGING_INCDIR'):
if k in os.environ:
for d in os.environ[k].split(os.path.pathsep):
_add_directory(include_dirs, d)
- for k in ('LD_RUN_PATH', 'LIBRARY_PATH', 'LIB'):
+ for k in ('LD_RUN_PATH', 'LIBRARY_PATH', 'LIB', 'STAGING_LIBDIR'):
if k in os.environ:
for d in os.environ[k].split(os.path.pathsep):
_add_directory(library_dirs, d)
- prefix = sysconfig.get_config_var("prefix")
- if prefix:
- _add_directory(library_dirs, os.path.join(prefix, "lib"))
- _add_directory(include_dirs, os.path.join(prefix, "include"))
-
#
# add platform directories
@@ -413,8 +408,6 @@ class pil_build_ext(build_ext):
elif sys.platform.startswith("linux") or \
sys.platform.startswith("gnu") or \
sys.platform.startswith("freebsd"):
- for dirname in _find_library_dirs_ldconfig():
- _add_directory(library_dirs, dirname)
if sys.platform.startswith("linux") and \
os.environ.get('ANDROID_ROOT', None):
# termux support for android.
--
2.8.1

View File

@ -0,0 +1,28 @@
SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \
Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \
Contributors."
HOMEPAGE = "https://pillow.readthedocs.io"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c6379001ecb47e2a0420c40177fc1125"
SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=5.4.x \
file://0001-support-cross-compiling.patch \
file://0001-explicitly-set-compile-options.patch \
"
SRCREV ?= "f38f01bbe3a0a9f49ce592c86ff20c01c9655133"
inherit setuptools3
DEPENDS += " \
zlib \
jpeg \
tiff \
freetype \
lcms \
openjpeg \
"
S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"