summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch
blob: ac2c0b0622c01eb04728733a03926065e5eca57a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
From 7691ebcf38c59332eb819f909250a22ba5e8e50b Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
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 <trini@konsulko.com>
---
 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