From 217870c510d09213cbb5c5f994e9b9a2bbeb1700 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 1 Feb 2019 15:24:47 +0000 Subject: [RCAR] Remove old backport python-wand is now useless Bug-AGL: SPEC-2185 Bug-AGL: SPEC-1687 Change-Id: I97d0871185017e88fcac31dcef70c1d28fe636c1 Signed-off-by: Ronan Le Martret --- .../meta-rcar-gen3/recipes-backport/README.md | 7 ----- .../0001-wand-api.py-Change-search-order.patch | 32 ---------------------- .../python_bp/python-wand_0.4.3.bb | 21 -------------- 3 files changed, 60 deletions(-) delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-backport/README.md delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand_0.4.3.bb (limited to 'meta-agl-bsp/meta-rcar-gen3') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/README.md b/meta-agl-bsp/meta-rcar-gen3/recipes-backport/README.md deleted file mode 100644 index 49ab7cc9d..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# back port from poky -## gstreamer - src: poky/meta/recipes-multimedia/gstreamer/ ae9b341ecfcc60e970f29cfe04306411ad26c0cf - -# port from meta-linaro -## python-wand - src: meta-linaro/meta-optee/recipes-devtools/python/python-wand_0.4.3.bb b6d0b81584c3395708b27ffe7b8fe248ef674839 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 - diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand_0.4.3.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand_0.4.3.bb deleted file mode 100644 index 396cf374f..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand_0.4.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Magic wand library" -HOMEPAGE = "http://docs.wand-py.org/en/0.4.3/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=170eafd687d4a2b950819cd5e067e6d5" - -SRCNAME = "wand" - -SRC_URI = "git://github.com/dahlia/wand.git;tag=${PV} \ - file://0001-wand-api.py-Change-search-order.patch" -S = "${WORKDIR}/git" - -inherit setuptools - -DEPENDS += " imagemagick-native" - -# Tell python-wand where to look for our imagemagick and it must be -# one level up from where 'lib' resides. -export MAGICK_HOME="${STAGING_LIBDIR_NATIVE}/.." - -BBCLASSEXTEND = "native" -- cgit 1.2.3-korg