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 b491ac4..c1c9ecb 100644 (file)
--- 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 de3e7e8..368239a 100644 (file)
--- 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 e3f9536..2931533 100644 (file)
--- 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