From 1c3c06842ac1b9c089d0a08e91c60f44e4844fac Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:12:45 +0100 Subject: SPEC-3723: restructure meta-agl Goal is to reach a minimal meta-agl-core as base for IVI and IC work at the same time. Trim dependencies and move most 'demo' related recipes to meta-agl-demo. v2: changed to bbapend + .inc , added description v3: testbuild of all images v4: restore -test packagegroup and -qa images, compare manifests and adapt packagegroups. v5: rebased v6: merged meta-agl-distro into meta-agl-core, due to dependency on meta-oe, moved -test packagegroup and -qa images to own layer meta-agl-core-test v7: Fixed comments from Paul Barker v8: Update the markdown files v9: restore wayland/weston/agl-compositor recipes/appends, reworked to move app f/w specific changes to bbappends in meta-app-framework and only demo specific weston-init changes to meta-agl-demo v10: fix s/agldemo/aglcore/ missed in weston-init.bbappend Description: This patch is part 1 out of 2 large patches that implement the layer rework discussed during the previous workshop. Essentially meta-agl-core is the small but versatile new core layer of AGL serving as basis for the work done by the IC and IVI EGs. All demo related work is moved to meta-agl-demo in the 2nd patchset. This should be applied together as atomic change. The resulting meta-agl/* follows these guidelines: - only bsp adaptations in meta-agl-bsp - remove the agl-profile-* layers for simplicity -- the packagegroup-agl(-profile)-graphical and so on have been kept in meta-agl-demo - meta-agl-profile-core is now meta-agl-core - meta-agl-core does pass yocto-check-layer -- therefore use the bbappend + conditional + .inc file construct found in meta-virtualization - meta-agl/meta-security has been merged into meta-agl/meta-app-framework - meta-netboot does pass yocto-check-layer - meta-pipewire does pass yocto-check-layer Migration: All packagegroups are preserved but they're now enabled by 'agl-demo'. Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller Signed-off-by: Scott Murray Change-Id: Ia6c6e5e6ce2b4ffa69ea94959cdc57c310ba7c53 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25769 --- ...igrate-weston_seat_init-release-to-public.patch | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-Migrate-weston_seat_init-release-to-public.patch (limited to 'meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-Migrate-weston_seat_init-release-to-public.patch') diff --git a/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-Migrate-weston_seat_init-release-to-public.patch b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-Migrate-weston_seat_init-release-to-public.patch new file mode 100644 index 000000000..02af7cbaf --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-Migrate-weston_seat_init-release-to-public.patch @@ -0,0 +1,106 @@ +From 4534fcab54409b08faf4445ed6780136b58afb63 Mon Sep 17 00:00:00 2001 +From: Marius Vlad +Date: Mon, 28 Sep 2020 22:51:00 +0300 +Subject: [PATCH 1/2] libweston: Migrate weston_seat_init/release to public + headers + +weston_seat_init/release needed for creating weston plug-ins that want +manage seat/input on their own. + +Signed-off-by: Marius Vlad +--- + include/libweston/libweston.h | 25 +++++++++++++++++++++++++ + libweston/libweston-internal.h | 31 +++---------------------------- + 2 files changed, 28 insertions(+), 28 deletions(-) + +diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h +index 54ea008..59541f2 100644 +--- a/include/libweston/libweston.h ++++ b/include/libweston/libweston.h +@@ -2053,6 +2053,31 @@ void + weston_timeline_refresh_subscription_objects(struct weston_compositor *wc, + void *object); + ++/* input, seat */ ++void ++weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec, ++ const char *seat_name); ++void ++weston_seat_release(struct weston_seat *seat); ++ ++void ++weston_seat_init_pointer(struct weston_seat *seat); ++ ++int ++weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap); ++ ++void ++weston_seat_init_touch(struct weston_seat *seat); ++ ++void ++weston_seat_release_keyboard(struct weston_seat *seat); ++ ++void ++weston_seat_release_pointer(struct weston_seat *seat); ++ ++void ++weston_seat_release_touch(struct weston_seat *seat); ++ + #ifdef __cplusplus + } + #endif +diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h +index 66c38e8..f5c4c2c 100644 +--- a/libweston/libweston-internal.h ++++ b/libweston/libweston-internal.h +@@ -168,44 +168,19 @@ weston_plane_init(struct weston_plane *plane, + void + weston_plane_release(struct weston_plane *plane); + +-/* weston_seat */ +- + struct clipboard * + clipboard_create(struct weston_seat *seat); + +-void +-weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec, +- const char *seat_name); +- +-void +-weston_seat_repick(struct weston_seat *seat); ++/* weston_seat */ + + void +-weston_seat_release(struct weston_seat *seat); ++weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap); + + void + weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client); + + void +-weston_seat_init_pointer(struct weston_seat *seat); +- +-int +-weston_seat_init_keyboard(struct weston_seat *seat, struct xkb_keymap *keymap); +- +-void +-weston_seat_init_touch(struct weston_seat *seat); +- +-void +-weston_seat_release_keyboard(struct weston_seat *seat); +- +-void +-weston_seat_release_pointer(struct weston_seat *seat); +- +-void +-weston_seat_release_touch(struct weston_seat *seat); +- +-void +-weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap); ++weston_seat_repick(struct weston_seat *seat); + + void + wl_data_device_set_keyboard_focus(struct weston_seat *seat); +-- +2.28.0 + -- cgit 1.2.3-korg