From 95b8edd4aab48f4cb66f3119e91e59ab74f907e9 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 23 Jun 2020 18:10:10 +0200 Subject: Make the agl-compositor the default compositor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the agl-compositor the default starting with Jumping Jellyfish For development purposes, you have these variables at hand to influence the setup: AGL_DEFAULT_WESTONSTART AGL_DEFAULT_WM_SHELL Check your conf/local.conf for details. Signed-off-by: Jan-Simon Möller Change-Id: Iceb35375e04f947009800b80511f6360026403fe --- templates/base/99_local.conf.inc | 14 +++++++ templates/feature/agl-compositor/50_local.conf.inc | 48 ---------------------- .../README_feature_agl-compositor.md | 13 ------ 3 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 templates/feature/agl-compositor/50_local.conf.inc delete mode 100644 templates/feature/agl-compositor/README_feature_agl-compositor.md (limited to 'templates') diff --git a/templates/base/99_local.conf.inc b/templates/base/99_local.conf.inc index 871ea0ebf..c4f43998b 100644 --- a/templates/base/99_local.conf.inc +++ b/templates/base/99_local.conf.inc @@ -17,3 +17,17 @@ # Additional free disk space created in the image in Kbytes. #IMAGE_ROOTFS_EXTRA_SPACE="524288" +# meta-agl/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend +# AGL's compositor is started instead of weston like so +# AGL_DEFAULT_WESTONSTART ?= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini" +# you can redefine it using this variable to go back to weston, +# but be careful that this needs further changes to work ! +# Especially the AGL demo apps will not work as-is. +#AGL_DEFAULT_WESTONSTART = "/usr/bin/weston" + +# meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend +# This defines the QT integration. We default to xdg-shell +# AGL_DEFAULT_WM_SHELL ?= "xdg-shell" +# you can redefine it using this variable to e.g. use ivi-shell +# but be careful that this needs further changes to work ! +#AGL_DEFAULT_WM_SHELL = "" diff --git a/templates/feature/agl-compositor/50_local.conf.inc b/templates/feature/agl-compositor/50_local.conf.inc deleted file mode 100644 index 557b331a6..000000000 --- a/templates/feature/agl-compositor/50_local.conf.inc +++ /dev/null @@ -1,48 +0,0 @@ -DISTRO_FEATURES_append = " agl-compositor" - -# note that these are for testing only, should be removed once the changes -# land in their respective repositories - -# shell client -AGL_BRANCH_pn-homescreen = "sandbox/mvlad/agl-compositor" -SRCREV_pn-homescreen = "${AUTOREV}" -DEPENDS_append_pn-homescreen = " wayland-native wayland qtwayland qtwayland-native" - -# normal apps -AGL_BRANCH_pn-launcher = "sandbox/mvlad/agl-compositor" -SRCREV_pn-launcher = "${AUTOREV}" -DEPENDS_append_pn-launcher = " wayland-native wayland qtwayland qtwayland-native" -AGL_BRANCH_pn-hvac = "sandbox/mvlad/agl-compositor" -SRCREV_pn-hvac = "${AUTOREV}" -DEPENDS_append_pn-hvac = " libafb-helpers-qt" -AGL_BRANCH_pn-ondemandnavi = "sandbox/mvlad/agl-compositor" -SRCREV_pn-ondemandnavi = "${AUTOREV}" -AGL_BRANCH_pn-mediaplayer = "sandbox/mvlad/agl-compositor" -SRCREV_pn-mediaplayer = "${AUTOREV}" -AGL_BRANCH_pn-alexa-viewer = "sandbox/mvlad/agl-compositor" -SRCREV_pn-alexa-viewer = "${AUTOREV}" -DEPENDS_append_pn-alexa-viewer = " wayland-native wayland qtwayland qtwayland-native" -AGL_BRANCH_pn-onscreenapp = "sandbox/mvlad/agl-compositor" -SRCREV_pn-onscreenapp = "${AUTOREV}" -AGL_BRANCH_pn-settings = "sandbox/mvlad/agl-compositor" -SRCREV_pn-settings = "${AUTOREV}" - -# other apps -AGL_BRANCH_pn-radio = "sandbox/mvlad/agl-compositor" -SRCREV_pn-radio = "${AUTOREV}" -AGL_BRANCH_pn-dashboard = "sandbox/mvlad/agl-compositor" -SRCREV_pn-dashboard = "${AUTOREV}" -AGL_BRANCH_pn-taskmanager = "sandbox/mvlad/agl-compositor" -SRCREV_pn-taskmanager = "${AUTOREV}" -AGL_BRANCH_pn-phone = "sandbox/mvlad/agl-compositor" -SRCREV_pn-phone = "${AUTOREV}" -AGL_BRANCH_pn-poiapp = "sandbox/mvlad/agl-compositor" -SRCREV_pn-poiapp = "${AUTOREV}" -AGL_BRANCH_pn-mixer = "sandbox/mvlad/agl-compositor" -SRCREV_pn-mixer = "${AUTOREV}" -AGL_BRANCH_pn-messaging = "sandbox/mvlad/agl-compositor" -SRCREV_pn-messaging = "${AUTOREV}" - -# use agl-service-homescreen -AGL_BRANCH_pn-agl-service-homescreen = "sandbox/mvlad/agl-compositor" -SRCREV_pn-agl-service-homescreen = "${AUTOREV}" diff --git a/templates/feature/agl-compositor/README_feature_agl-compositor.md b/templates/feature/agl-compositor/README_feature_agl-compositor.md deleted file mode 100644 index 4b5211ee7..000000000 --- a/templates/feature/agl-compositor/README_feature_agl-compositor.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -description: Feature agl-compositor -authors: Daniel Stone ---- - -### Feature agl-compositor - -_agl-compositor_ is a new Wayland display server framework, based on the -existing libweston library. It provides AGL users an extensible framework for -window/input/output management within the display server. - -It is included as a technology preview, and is not currently ready for -production use. -- cgit 1.2.3-korg