X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-graphics%2Fwayland%2Fweston-init_agldemo.inc;h=4815079f2306089c2db692fd0400c930c431d253;hb=e82b00a13a62499fdbca9505daaa69b35bf2f77d;hp=a5f0b09b52d9060eb6e985e670f5953f811e3465;hpb=41591d4f8c586aa801220fac0924556f406c58bd;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-graphics/wayland/weston-init_agldemo.inc b/recipes-graphics/wayland/weston-init_agldemo.inc
index a5f0b09b5..4815079f2 100644
--- a/recipes-graphics/wayland/weston-init_agldemo.inc
+++ b/recipes-graphics/wayland/weston-init_agldemo.inc
@@ -1,11 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/weston-init:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/weston-init:"
 
 inherit agl-graphical
 
 AGL_DEFAULT_WESTONSTART ??= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini"
+WESTON_USE_PIXMAN ??= "0"
 
 WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}"
-WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/compositor.log", "",d)}"
+WESTONSTART:append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/compositor.log", "",d)}"
+WESTONSTART:append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", " --debug", "",d)}"
+WESTONSTART:append = " ${@bb.utils.contains("WESTON_USE_PIXMAN", "1", " --use-pixman", "",d)}"
 
 # Systemd name of DRM device to have weston/agl-compositor startup depend
 # upon, if required.  Currently only x86-64 seems to need a dependency to
@@ -21,15 +24,16 @@ WIFILES = " \
     file://zz-dri.rules.in \
     file://zz-input.rules.in \
     file://zz-tty.rules.in \
+    file://zz-video.rules.in \
 "
 
-WIFILES_append_imx = " \
+WIFILES:append:imx = " \
     file://zz-dri-imx.rules.in \
 "
 
-SRC_URI_append = " ${WIFILES}"
+SRC_URI:append = " ${WIFILES}"
 
-do_install_append() {
+do_install:append() {
     # Remove upstream weston udev rules just to be safe
     rm -f ${D}${sysconfdir}/udev/rules.d/71-weston-drm.rules
 
@@ -71,7 +75,7 @@ do_install_append() {
     done
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${libdir}/tmpfiles.d/ \
     ${systemd_system_unitdir}/weston@.service.d/ \
 "