From fc6497ef28ba3aed379e63e8960e79cfee6d769b Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 18 May 2023 05:27:09 -0700 Subject: weston-init: Adjust use-g2d for weston 11 For the weston 11 fork, the use-g2d option type is changed from an integer to a boolean. Handle both cases. Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston-init.bbappend | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index fa088b6f..3a91fbe6 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -37,6 +37,10 @@ PACKAGECONFIG_USE_G2D:mx8qm-nxp-bsp ?= "" PACKAGECONFIG_USE_G2D:mx8qxp-nxp-bsp ?= "" PACKAGECONFIG_USE_G2D:mx8dx-nxp-bsp ?= "" +USE_G2D_VALUE = "true" +USE_G2D_VALUE:mx6-nxp-bsp = "1" +USE_G2D_VALUE:mx7-nxp-bsp = "1" + PACKAGECONFIG[gbm-format] = ",," PACKAGECONFIG[rdp] = ",," PACKAGECONFIG[repaint-window] = ",," @@ -66,9 +70,9 @@ do_install:append() { fi if [ "${@bb.utils.contains('PACKAGECONFIG', 'use-g2d', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a use-g2d=1" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[core\]/a use-g2d=${USE_G2D_VALUE}" ${D}${sysconfdir}/xdg/weston/weston.ini else - sed -i -e "/^\[core\]/a #use-g2d=1" ${D}${sysconfdir}/xdg/weston/weston.ini + sed -i -e "/^\[core\]/a #use-g2d=${USE_G2D_VALUE}" ${D}${sysconfdir}/xdg/weston/weston.ini fi sed -i -e 's,@bindir@,${bindir},g' ${D}${sysconfdir}/xdg/weston/weston.ini -- cgit v1.2.3-54-g00ecf