summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch
diff options
context:
space:
mode:
authorMatt Porter <mporter@konsulko.com>2016-12-28 00:50:41 +0200
committerMatt Porter <mporter@konsulko.com>2016-12-28 00:50:41 +0200
commitbefd0bddd1b5bc36c3729988a7c9cc6b5b390641 (patch)
tree4d118789b76fd18ed185fcb7e1318489e6e9829a /meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch
parentf4fc7e9c874b4642b56091274ba9ae971c4c6dc3 (diff)
meta-ti: weston: remove unneeded ivi shell patches and use standard ivi-controller
The meta-arago layer included a number of ivi shell patches that are not needed in AGL. One multi screen patch conflicts with another bbappend causing build issues as it's already included by a less specific layer. Further, the added "simple TI layout controller", autolaunch, and screenshooter features are all unneeded in AGL. These are removed to reduce the amount of non-essential patches we carry within AGL. As a result of this, all weston.ini directives which use the "simple TI layout controller" directives are removed and weston.ini is switched to use the standard ivi-controller so that WindowManager may run and access the ILM API. The end result is that WindowManager and HomeScreen may now be launched after boot successfully. Change-Id: I8d777fbd4c02acbf9d3ccaeb215b651a8562d5bb Signed-off-by: Matt Porter <mporter@konsulko.com>
Diffstat (limited to 'meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch')
-rw-r--r--meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch
deleted file mode 100644
index d2af15eca..000000000
--- a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 93ceff13467e7fb1bee38c0ab6f587f5f99cc594 Mon Sep 17 00:00:00 2001
-From: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
-Date: Wed, 25 Nov 2015 23:36:09 +0900
-Subject: [PATCH 1/7] ivi-shell: fix TODO which expects only one screen in the
- system.
-
-It just return the first screen found in screen list.
-
-Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
----
- ivi-shell/ivi-layout.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
-index a04076e..efc0da5 100644
---- a/ivi-shell/ivi-layout.c
-+++ b/ivi-shell/ivi-layout.c
-@@ -1484,9 +1484,8 @@ ivi_layout_get_screen_from_id(uint32_t id_screen)
- struct ivi_layout_screen *iviscrn = NULL;
-
- wl_list_for_each(iviscrn, &layout->screen_list, link) {
--/* FIXME : select iviscrn from screen_list by id_screen */
-- return iviscrn;
-- break;
-+ if (iviscrn->id_screen == id_screen)
-+ return iviscrn;
- }
-
- return NULL;
---
-2.4.5
-