aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2019-10-29 11:10:47 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2019-10-29 11:10:47 +1300
commitb861622f69daacf750318ce60fdb8551942b5865 (patch)
tree04f43ab1735f8dedbcfd79d5c4e61495e1d3ee48
parent18506b797bcfe162999223b79919e7c730875bb4 (diff)
downloadmeta-openembedded-contrib-paule/pillow.tar.gz
meta-openembedded-contrib-paule/pillow.tar.bz2
meta-openembedded-contrib-paule/pillow.zip
python3-pillow: update to 6.2.1paule/pillow
Upstream release notes: https://pillow.readthedocs.io/en/stable/releasenotes/6.2.0.html https://pillow.readthedocs.io/en/stable/releasenotes/6.2.1.html Also fixes CVE-2019-16865: https://nvd.nist.gov/vuln/detail/CVE-2019-16865 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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 @@
-From 9f3073bf6a7c7c51bb49d25f65c8f75cc704a5ee Mon Sep 17 00:00:00 2001
+From 862a981ce462cd83a99e3db9faeeda1f8c64983f 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
@@ -10,18 +10,19 @@ explicitly set build_ext options for oe-core's
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 3ab2e127..e92615f3 100644
+index 1c6ebc84..1ccc3d69 100644
--- a/setup.cfg
+++ b/setup.cfg
-@@ -4,3 +4,15 @@ test=pytest
- [flake8]
- extend-ignore = E203, W503
- max-line-length = 88
+@@ -13,3 +13,15 @@ multi_line_output = 3
+
+ [tool:pytest]
+ addopts = -rs
+
+[build_ext]
+disable-platform-guessing = 1
@@ -34,6 +35,3 @@ index 3ab2e127..e92615f3 100644
+disable-webp = 1
+disable-webpmux = 1
+disable-imagequant = 1
---
-2.20.1
-
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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=55c0f320370091249c1755c0d2b48e89"
-SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.1.x \
+SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=6.2.x \
file://0001-support-cross-compiling.patch \
file://0001-explicitly-set-compile-options.patch \
"
-SRCREV ?= "aaca672173413883fbcefd659f04d74fe44fb5d5"
+SRCREV ?= "6e0f07bbe38def22d36ee176b2efd9ea74b453a6"
inherit setuptools3