From: Bocklage, Jens <Jens_Bocklage@mentor.com>
Date: Thu, 24 Nov 2016 13:54:59 +0000 (+0100)
Subject: Use IVI-shell instead of desktop-shell as default in weston.ini
X-Git-Tag: chinook_3.0.0~46
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=2c8d3d95495216f5a6ccab6fce48ac1af5ae1c65;p=AGL%2Fmeta-agl.git

Use IVI-shell instead of desktop-shell as default in weston.ini

Using IVI-shell as default for following platforms:
 - QEMU
 - Renesas
 - Raspberry Pi

The IVI-shell is needed to run the CES 2017 demo.

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
---

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini
index b491ac453..c1c9ecb1d 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini
@@ -1,8 +1,6 @@
 [core]
 backend=drm-backend.so
-shell=desktop-shell.so
+shell=ivi-shell.so
 
-[shell]
-locking=true
-# Uncomment below to hide panel
-#panel-location=none
+[ivi-shell]
+ivi-module=ivi-controller.so
diff --git a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini
index de3e7e8da..368239adb 100644
--- a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini
+++ b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini
@@ -1,14 +1,13 @@
 [core]
-shell=desktop-shell.so
 backend=drm-backend.so
+shell=ivi-shell.so
 
-[shell]
-locking=true
-# Uncomment below to hide panel
-#panel-location=none
+[ivi-shell]
+ivi-module=ivi-controller.so
 
 [output]
 name=HDMI-A-1
+transform=270
 #mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
 #mode=1920x1080
 #mode=1024x768
diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini b/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
index e3f95369f..293153357 100644
--- a/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston/weston-qemu-drm.ini
@@ -1,11 +1,9 @@
 [core]
-shell=desktop-shell.so
+shell=ivi-shell.so
 backend=drm-backend.so
 
-[shell]
-locking=true
-# Uncomment below to hide panel
-#panel-location=none
+[ivi-shell]
+ivi-module=ivi-controller.so
 
 [output]
 name=Virtual-1