diff options
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch | 43 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb (renamed from meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb) | 7 |
2 files changed, 16 insertions, 34 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch index 6de19ad87a..e4ba35b886 100644 --- a/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch +++ b/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch @@ -1,20 +1,21 @@ -From ae7c8d0336381dd4c10e809e9c8926f9deeafeb8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 14 Mar 2019 03:48:10 -0400 +From cd09b6f68aa49c72e9a9bb0765e8c666238a7b7e Mon Sep 17 00:00:00 2001 +From: Leon Anavi <leon.anavi@konsulko.com> +Date: Mon, 11 Jan 2021 13:25:12 +0000 Subject: [PATCH] support cross compiling Upstream-Status: Inappropriate [oe specific] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Suggested-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - setup.py | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) + setup.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 5ceae344..07863340 100755 +index cbc2641c..302bc6e7 100755 --- a/setup.py +++ b/setup.py -@@ -105,7 +105,7 @@ _LIB_IMAGING = ( +@@ -123,7 +123,7 @@ _LIB_IMAGING = ( "codec_fd", ) @@ -23,39 +24,21 @@ index 5ceae344..07863340 100755 class DependencyException(Exception): -@@ -396,21 +396,16 @@ class pil_build_ext(build_ext): +@@ -408,12 +408,12 @@ 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'): ++ 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'): ++ 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 - -@@ -469,8 +464,6 @@ class pil_build_ext(build_ext): - 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 - ): -- -2.20.1 +2.17.1 diff --git a/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb b/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb index 13cab43008..63974590cc 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_7.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_8.1.0.bb @@ -3,14 +3,13 @@ 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=ea2dc3f5611e69058503d4b940049d03" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0337b116233da4616ae9fdb130bf6f1a" -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=7.2.x \ +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=8.1.x \ file://0001-support-cross-compiling.patch \ file://0001-explicitly-set-compile-options.patch \ " -SRCREV ?= "2bd74943fb9f320def6c066e732b701d1c15f677" - +SRCREV ?= "fcc42e0d344146ee9d265d1f43c094ce5a0ec4cf" inherit setuptools3 |