summaryrefslogtreecommitdiffstats
path: root/meta-agl-profile-graphical
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:47:43 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:48:35 +0200
commit54c2fda805fd7fda591008693cd6843413cee9f8 (patch)
tree16ab8f0ac5ba32e6741849eede7610bcfe844925 /meta-agl-profile-graphical
parent8e93c36104e8cd3f319170d70b60c705fd7fa402 (diff)
parent95b8edd4aab48f4cb66f3119e91e59ab74f907e9 (diff)
Merge the agl-compositor sandbox into master
The changes prepared by Marius for agl-compositor have been reviewed in the sandbox/mvlad/agl-compositor. This is the merge to master. Notes: - weston+ivi-shell+windowmanager are replaced using agl-compositor - applications have been adapted accordingly - CI will likely fail as we need to merge all related patches Updating 8e93c361..95b8edd4 Fast-forward meta-agl-bsp/conf/include/agl_rcar.inc | 11 ++++++++++ meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend | 4 ++-- meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb | 6 +++++- meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend | 7 +++--- .../recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb | 3 +-- meta-app-framework/recipes-core/af-main/af-main_git.inc | 2 +- templates/base/99_local.conf.inc | 14 ++++++++++++ templates/feature/agl-compositor/50_local.conf.inc | 48 ----------------------------------------- templates/feature/agl-compositor/README_feature_agl-compositor.md | 13 ----------- 9 files changed, 38 insertions(+), 70 deletions(-) Bug-AGL: SPEC-3444 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Iea2b7367fdf1c9874b4b76a016b9d1a181b0e791
Diffstat (limited to 'meta-agl-profile-graphical')
-rw-r--r--meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb6
-rw-r--r--meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend7
-rw-r--r--meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb3
3 files changed, 10 insertions, 6 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb
index c0e2d9895..41f5f027b 100644
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb
@@ -18,4 +18,8 @@ S = "${WORKDIR}/git"
inherit meson pkgconfig python3native
-FILES_${PN} = "${bindir}/agl-compositor ${datadir}/${PN}/protocols/agl-shell.xml ${datadir}/${PN}/protocols/agl-shell-desktop.xml"
+FILES_${PN} = " \
+ ${bindir}/agl-compositor \
+ ${datadir}/${PN}/protocols/agl-shell.xml \
+ ${datadir}/${PN}/protocols/agl-shell-desktop.xml \
+ "
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
index ddabff5f5..374e9aa75 100644
--- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend
@@ -2,9 +2,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
inherit agl-graphical
-WESTONSTART ??= "${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", "/usr/bin/agl-compositor", "/usr/bin/weston",d)} ${WESTONARGS}"
-WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/weston.log", "",d)}"
-WESTONSTART_append = " ${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", " --config ${sysconfdir}/xdg/weston/weston.ini", "",d)}"
+AGL_DEFAULT_WESTONSTART ??= "/usr/bin/agl-compositor --config ${sysconfdir}/xdg/weston/weston.ini"
+
+WESTONSTART ??= "${AGL_DEFAULT_WESTONSTART} ${WESTONARGS}"
+WESTONSTART_append = " ${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", " --log=${DISPLAY_XDG_RUNTIME_DIR}/compositor.log", "",d)}"
WIFILES = " \
file://weston.conf.in \
diff --git a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
index 35db34df9..2a4b22930 100644
--- a/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
+++ b/meta-agl-profile-graphical/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
@@ -14,9 +14,8 @@ RDEPENDS_${PN} += " \
weston-init \
weston-ini-conf \
weston-examples \
- weston-ready \
agl-login-manager \
agl-desktop-config \
- ${@bb.utils.contains("DISTRO_FEATURES", "agl-compositor", "agl-compositor", "",d)} \
+ agl-compositor \
"