Merge "Merge the agl-compositor sandbox into master"

3 files changed, 14 insertions, 61 deletions

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 48dd3a153..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 = "df79e3e5d9c6443d486c26fd98d48e0ca6fc95ef"
-DEPENDS_append_pn-homescreen = " wayland-native wayland qtwayland qtwayland-native"
-
-# normal apps
-AGL_BRANCH_pn-launcher = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-launcher = "83496d2f6968f7d12a183581d320065bdba52132"
-DEPENDS_append_pn-launcher = " wayland-native wayland qtwayland qtwayland-native"
-AGL_BRANCH_pn-hvac = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-hvac = "2afae8c55678cf070ee1a41137be48019ea4872c"
-DEPENDS_append_pn-hvac = " libafb-helpers-qt"
-AGL_BRANCH_pn-ondemandnavi = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-ondemandnavi = "10acae987db859bace7d2dcf4913a21073d65990"
-AGL_BRANCH_pn-mediaplayer = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-mediaplayer = "4518cdde5ddb053a4759f7b50f038c53bc41a45e"
-AGL_BRANCH_pn-alexa-viewer = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-alexa-viewer = "653a7eaf6db206b802b3a05f5a32f61815c9bf4b"
-DEPENDS_append_pn-alexa-viewer = " wayland-native wayland qtwayland qtwayland-native"
-AGL_BRANCH_pn-onscreenapp = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-onscreenapp = "98dab0eebc3dc0f567be3f80ab129cbcc71738db"
-AGL_BRANCH_pn-settings = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-settings = "ff650ab8c60a6cd218f4e981740ca41014cce7cc"
-
-# other apps
-AGL_BRANCH_pn-radio = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-radio = "1d542581205725de446376707dff7c31c61d04d8"
-AGL_BRANCH_pn-dashboard = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-dashboard = "ea01446bbc5a9bfe739da10869f08b0bd2e82174"
-AGL_BRANCH_pn-taskmanager = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-taskmanager = "516c53197ff82297ddf7ee1a55497f657e4abc19"
-AGL_BRANCH_pn-phone = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-phone = "e29b1f9d6d7b17645c4ab65250520b1df612fd7c"
-AGL_BRANCH_pn-poiapp = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-poiapp = "f7a0bc184e53ba5c756de079891d690eed0fc51e"
-AGL_BRANCH_pn-mixer = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-mixer = "b6638c65ad9af59abfb2a571e11be5a73dc662b8"
-AGL_BRANCH_pn-messaging = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-messaging = "eaa3566554111ad335cb73a219f920989ffcb70f"
-
-# use agl-service-homescreen
-AGL_BRANCH_pn-agl-service-homescreen = "sandbox/mvlad/agl-compositor"
-SRCREV_pn-agl-service-homescreen = "79c9fb4fb8a8c8f6ebfbf0299f16e2ca4ddb56c6"
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 <daniels@collabora.com>
----
-	
-### 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.