From bc759aebc054b4768e2bc516de466fa9c7ce0bb5 Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Thu, 20 Jun 2019 16:18:28 +0700 Subject: rcar-gen3: weston: Update to support weston 6.0 This commit uses the weston upstream version 6.0 with "GPU only" h/w acceleration. It also modifies weston-init to adapt upstream version. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: I7aabf0f3fcfec0dece05161529bd9eaf401dfbdb --- .../recipes-graphics/wayland/weston-init.bbappend | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend') diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend index 07dab05..dafc033 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend @@ -1,30 +1,9 @@ require include/gles-control.inc -require include/multimedia-control.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI = " \ - file://init \ - file://weston.service \ - file://weston-start \ -" do_install_append() { - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - if [ "X${USE_GLES}" = "X1" ]; then - sed -e "/RequiresMountsFor=\/run/a Wants=rc.pvr.service" \ - -e "/RequiresMountsFor=\/run/a After=rc.pvr.service" \ + sed -e "/RequiresMountsFor=\/run/a After=dbus.service multi-user.target" \ -e "s/\$OPTARGS/--idle-time=0 \$OPTARGS/" \ -i ${D}/${systemd_system_unitdir}/weston.service fi - - if [ "X${USE_MULTIMEDIA}" = "X1" ]; then - if [ "X${USE_V4L2_RENDERER}" = "X1" ]; then - sed -e "s/\$OPTARGS/--use-v4l2 \$OPTARGS/" \ - -i ${D}/${systemd_system_unitdir}/weston.service - fi - fi } -- cgit 1.2.3-korg