summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch16
-rw-r--r--meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb (renamed from meta-python/recipes-devtools/python/python3-pillow_6.1.bb)4
2 files changed, 9 insertions, 11 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch b/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch
index d4372696fe..35aee42145 100644
--- a/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch
+++ b/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch
@@ -1,4 +1,4 @@
1From 9f3073bf6a7c7c51bb49d25f65c8f75cc704a5ee Mon Sep 17 00:00:00 2001 1From 862a981ce462cd83a99e3db9faeeda1f8c64983f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 18 Mar 2019 23:23:55 -0400 3Date: Mon, 18 Mar 2019 23:23:55 -0400
4Subject: [PATCH] explicitly set compile options 4Subject: [PATCH] explicitly set compile options
@@ -10,18 +10,19 @@ explicitly set build_ext options for oe-core's
10Upstream-Status: Inappropriate [oe specific] 10Upstream-Status: Inappropriate [oe specific]
11 11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
13--- 14---
14 setup.cfg | 12 ++++++++++++ 15 setup.cfg | 12 ++++++++++++
15 1 file changed, 12 insertions(+) 16 1 file changed, 12 insertions(+)
16 17
17diff --git a/setup.cfg b/setup.cfg 18diff --git a/setup.cfg b/setup.cfg
18index 3ab2e127..e92615f3 100644 19index 1c6ebc84..1ccc3d69 100644
19--- a/setup.cfg 20--- a/setup.cfg
20+++ b/setup.cfg 21+++ b/setup.cfg
21@@ -4,3 +4,15 @@ test=pytest 22@@ -13,3 +13,15 @@ multi_line_output = 3
22 [flake8] 23
23 extend-ignore = E203, W503 24 [tool:pytest]
24 max-line-length = 88 25 addopts = -rs
25+ 26+
26+[build_ext] 27+[build_ext]
27+disable-platform-guessing = 1 28+disable-platform-guessing = 1
@@ -34,6 +35,3 @@ index 3ab2e127..e92615f3 100644
34+disable-webp = 1 35+disable-webp = 1
35+disable-webpmux = 1 36+disable-webpmux = 1
36+disable-imagequant = 1 37+disable-imagequant = 1
37--
382.20.1
39
diff --git a/meta-python/recipes-devtools/python/python3-pillow_6.1.bb b/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb
index 1d91066481..a383a3ff91 100644
--- a/meta-python/recipes-devtools/python/python3-pillow_6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pillow_6.2.1.bb
@@ -5,11 +5,11 @@ HOMEPAGE = "https://pillow.readthedocs.io"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89"
7 7
8SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.1.x \ 8SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.2.x \
9 file://0001-support-cross-compiling.patch \ 9 file://0001-support-cross-compiling.patch \
10 file://0001-explicitly-set-compile-options.patch \ 10 file://0001-explicitly-set-compile-options.patch \
11" 11"
12SRCREV ?= "aaca672173413883fbcefd659f04d74fe44fb5d5" 12SRCREV ?= "6e0f07bbe38def22d36ee176b2efd9ea74b453a6"
13 13
14 14
15inherit setuptools3 15inherit setuptools3