X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-backport%2Fpython_bp%2Fpython-wand%2F0001-wand-api.py-Change-search-order.patch;fp=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-backport%2Fpython_bp%2Fpython-wand%2F0001-wand-api.py-Change-search-order.patch;h=0000000000000000000000000000000000000000;hb=217870c510d09213cbb5c5f994e9b9a2bbeb1700;hp=ac2c0b0622c01eb04728733a03926065e5eca57a;hpb=e16c328b646355237b4e8277e50085bb63f21d9e;p=AGL%2Fmeta-agl.git diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch deleted file mode 100644 index ac2c0b062..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7691ebcf38c59332eb819f909250a22ba5e8e50b Mon Sep 17 00:00:00 2001 -From: Tom Rini -Date: Tue, 24 Oct 2017 12:01:51 -0400 -Subject: [PATCH 1/1] wand/api.py: Change search order - -In addition to specifying MAGICK_HOME to ensure that we will even look -within our desired paths, we need to also check for the type of library -that we know we have. Otherwise we may find a different form of the -library in one of the system paths before we try ours. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Tom Rini ---- - wand/api.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wand/api.py b/wand/api.py -index 19cf6d2..dde9c5e 100644 ---- a/wand/api.py -+++ b/wand/api.py -@@ -55,7 +55,7 @@ def library_paths(): - """ - libwand = None - libmagick = None -- versions = '', '-6', '-Q16', '-Q8', '-6.Q16' -+ versions = '-6.Q16', '-6', '-Q16', '-Q8', '' - options = '', 'HDRI', 'HDRI-2' - system = platform.system() - magick_home = os.environ.get('MAGICK_HOME') --- -2.11.0 -