From bc759aebc054b4768e2bc516de466fa9c7ce0bb5 Mon Sep 17 00:00:00 2001
From: Khang Nguyen <khang.nguyen.xw@renesas.com>
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 <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Change-Id: I7aabf0f3fcfec0dece05161529bd9eaf401dfbdb
---
 .../recipes-graphics/wayland/weston_2.0.0.bbappend | 63 ----------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend

(limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend')

diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend
deleted file mode 100644
index fced56c..0000000
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend
+++ /dev/null
@@ -1,63 +0,0 @@
-require weston.inc
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-BRANCH = "rcar-gen3/2.0.0/gl-fallback"
-
-SRCREV = "84709ddcbf1e94edae96038f530e9ddd855f707f"
-
-SRC_URI_remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-
-SRC_URI_append = " \
-    git://github.com/renesas-rcar/weston.git;branch=${BRANCH} \
-    file://weston.png \
-    file://weston.desktop \
-    file://xwayland.weston-start \
-    file://weston.ini \
-    file://weston_v4l2.ini \
-    file://weston.sh \
-"
-
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG_append = " \
-    ${@oe.utils.conditional('USE_MULTIMEDIA', '1', ' v4l2', '', d)} \
-"
-PACKAGECONFIG[v4l2] = " --enable-v4l2, --disable-v4l2,,kernel-module-vsp2driver"
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/xdg/weston
-    if [ "X${USE_MULTIMEDIA}" = "X1" ]; then
-        # install weston.ini as sample settings of v4l2-renderer
-        if [ "${MACHINE}" = "m3ulcb" -o "${MACHINE}" = "m3nulcb" -o "${MACHINE}" = "h3ulcb" ] ; then
-            sed -i 's|media1|media0|g' ${WORKDIR}/weston_v4l2.ini
-        fi
-        install -m 644 ${WORKDIR}/weston_v4l2.ini ${D}/${sysconfdir}/xdg/weston/weston.ini
-    else
-        # install weston.ini as sample settings of gl-renderer
-        install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/
-    fi
-
-    # Checking for ivi-shell configuration
-    # If ivi-shell is enable, we will add its configs to weston.ini
-    if [ "X${USE_WAYLAND_IVI_SHELL}" = "X1" ]; then
-        sed -i '/repaint-window=34/c\repaint-window=34\nshell=ivi-shell.so' \
-            ${D}/${sysconfdir}/xdg/weston/weston.ini
-        sed -e '$a\\' \
-            -e '$a\[ivi-shell]' \
-            -e '$a\ivi-module=ivi-controller.so' \
-            -e '$a\ivi-input-module=ivi-input-controller.so' \
-            -e '$a\transition-duration=300' \
-            -e '$a\cursor-theme=default' \
-            -i ${D}/${sysconfdir}/xdg/weston/weston.ini
-    fi
-
-    # Set XDG_RUNTIME_DIR to /run/user/$UID (e.g. run/user/0)
-    install -d ${D}/${sysconfdir}/profile.d
-    install -m 0755 ${WORKDIR}/weston.sh ${D}/${sysconfdir}/profile.d/weston.sh
-}
-
-FILES_${PN}_append = " \
-    ${sysconfdir}/xdg/weston/weston.ini \
-    ${sysconfdir}/profile.d/weston.sh \
-"
-- 
cgit 1.2.3-korg