aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-06-14 16:14:30 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-06-22 14:53:41 +0000
commit1b0cad77090b75fc040f9de5db06374203fe34c5 (patch)
tree1701dd7be8a3ac5ecf0ade67c692308786e1562b
parentcb92ad7ec06de46193ef2815e88839556c7ede34 (diff)
weston-ini-conf: Add activate-by-default=false by default
As all our platforms (flutter, qt, html5) are now capable of starting and activating windows on their own, we can turn off the implicit activation by default from the compositor. We would remove it entirely from the configuration file once we won't have any code in the compositor. Make it default for now. Change-Id: I43df54cd2bba5f05612989b02ce99c63f93a5c2d Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29018 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb2
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf/core.cfg1
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
index e618a14a3..829d595fc 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -64,7 +64,6 @@ do_compile() {
sed -i -e '$ d' ${WORKDIR}/weston.ini.default
cat ${WORKDIR}/weston.ini.default > ${WORKDIR}/weston.ini.default-no-activate
- sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.default-no-activate
# Do it again, but filter fragments to configure for landscape
# and a corresponding landscape-inverted that is 180 degrees
@@ -92,7 +91,6 @@ do_compile() {
sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted
cat ${WORKDIR}/weston.ini.landscape > ${WORKDIR}/weston.ini.landscape-no-activate
- sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.landscape-no-activate
}
do_install:append() {
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/core.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/core.cfg
index 90774ed79..e1e0ed049 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/core.cfg
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/core.cfg
@@ -2,3 +2,4 @@
backend=drm-backend.so
require-input=false
modules=systemd-notify.so
+activate-by-default=false