aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-04-04 16:42:23 +0800
committerHongxu Jia <hongxu.jia@windriver.com>2019-08-09 15:33:05 +0800
commitf59c6ff769b298f1f97b007006338fc9d9cc8d80 (patch)
tree3de4221a861f0dffe4e4c78139a2e7f585447bad /recipes-devtools
parentd81e46bc3d7892feb199478da1760b64312c9ae5 (diff)
downloadmeta-tensorflow-f59c6ff769b298f1f97b007006338fc9d9cc8d80.tar.gz
meta-tensorflow-f59c6ff769b298f1f97b007006338fc9d9cc8d80.tar.bz2
meta-tensorflow-f59c6ff769b298f1f97b007006338fc9d9cc8d80.zip
python3-pillow: move to oe
Since commit [6cb4e90 python3-pillow: add 5.4.1] applied in oe, remove the duplicated one in meta-tensorflow. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch39
-rw-r--r--recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch61
-rw-r--r--recipes-devtools/python/python3-pillow_5.4.1.bb28
3 files changed, 0 insertions, 128 deletions
diff --git a/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch b/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch
deleted file mode 100644
index de89ba0..0000000
--- a/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
-
diff --git a/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch
deleted file mode 100644
index e862934..0000000
--- a/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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
-
diff --git a/recipes-devtools/python/python3-pillow_5.4.1.bb b/recipes-devtools/python/python3-pillow_5.4.1.bb
deleted file mode 100644
index 746c184..0000000
--- a/recipes-devtools/python/python3-pillow_5.4.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-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"