summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-rcar-gen3/recipes-backport
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2019-03-12 16:53:09 +0100
committerronan Le Martret <ronan.lemartret@iot.bzh>2019-03-12 16:01:54 +0000
commit266bd066d5a145a1af00b96215bd689595f68b53 (patch)
treeb6d9fb29e673fa497e00b57fbc7444e7ca7db5a6 /meta-agl-bsp/meta-rcar-gen3/recipes-backport
parent733e073fcd85ee42617fd724a09303dc6683a438 (diff)
parent4232903d06ebc92dff71e943e7a74b198adfd389 (diff)
Merge branch '[RCAR] GEN3 BSP 3.15.0'
Bug-AGL: SPEC-2185 Bug-AGL: SPEC-1687 Change-Id: Ife69009521cf2c8440f85526b1e80a2d92547085 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-backport')
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-backport/README.md7
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand/0001-wand-api.py-Change-search-order.patch32
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-backport/python_bp/python-wand_0.4.3.bb21
3 files changed, 0 insertions, 60 deletions
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 <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
-
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"