weston-ini-conf: Fix test of DISTRO_FEATURE

[AGL/meta-agl-demo.git] / recipes-graphics / wayland / weston-ini-conf.bbappend

diff --git a/recipes-graphics/wayland/weston-ini-conf.bbappend b/recipes-graphics/wayland/weston-ini-conf.bbappend
index 635218a..d778459 100644 (file)
--- a/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,31 +1,15 @@
-WESTONCORE[shell] ??= "ivi-shell.so"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-WESTONIVISHELL[ivi-module] ??= "ivi-controller.so"
-WESTONIVISHELL[ivi-input-module] ??= "ivi-input-controller.so"
+#
+SRC_URI += "${@bb.utils.contains("DISTRO_FEATURES", "virtual-display", "file://virtualoutput.cfg", "",d)}"
 
-WESTONSECTION[WESTONIVISHELL] = "ivi-shell"
+do_configure_append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'virtual-display', 'true', 'false', d)}; then
+        echo virtual=1 >> ${WORKDIR}/core.cfg
+    fi
 
-# IVI cluster and virtual display sample
-python () {
-    if bb.utils.contains('DISTRO_FEATURES', 'virtual-display', True, False, d):
-        d.setVarFlag("WESTONCORE", "virtual", "1")
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'gst-record', 'true', 'false', d)}; then
+       echo recorder=true >> ${WORKDIR}/virtualoutput.cfg
+    fi
 }
 
-WESTONOUTPUT2[agl_screen] ??= "SCREEN_VIRTUAL"
-
-WESTONSECTION[WESTONOUTPUT2] = "output"
-
-SCREEN_VIRTUAL[name]?="virtual1"
-SCREEN_VIRTUAL[mode]?="384x368@60"
-
-# If gst-record is set, recorder flag is true
-python () {
-    if bb.utils.contains('DISTRO_FEATURES', 'gst-record', True, False, d):
-        d.setVarFlag("SCREEN_VIRTUAL", "recorder", "true")
-}
-
-SCREEN_VIRTUAL[ip]?="192.168.20.99"
-SCREEN_VIRTUAL[port]?="5005"
-SCREEN_VIRTUAL[bitrate]?="300000"
-SCREEN_VIRTUAL[crop]?="384x368@0x0"
-