X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-profile-graphical%2Frecipes-graphics%2Fwayland%2Fwayland-ivi-extension%2F0003-ivi-controller-load-id-agent-module.patch;h=8985879b0b5ed093d41b5c117e86c36da5fec0c7;hb=7faccb97d69c7581e338f88ce3a2153cdd69fd16;hp=06fe7843a20057fb454e7bae5b3213fb45978fea;hpb=e978a20f40916eac57a5e1af8f65b6ed9f719e50;p=AGL%2Fmeta-agl.git diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-load-id-agent-module.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-load-id-agent-module.patch index 06fe7843a..8985879b0 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-load-id-agent-module.patch +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0003-ivi-controller-load-id-agent-module.patch @@ -3,16 +3,16 @@ From: Michael Teyfel Date: Fri, 12 Oct 2018 16:57:24 +0200 Subject: [PATCH 3/3] ivi-controller: load id-agent module +Reworked for wayland-ivi-extension 2.2.0 by Scott Murray. + Signed-off-by: Michael Teyfel ---- - weston-ivi-shell/src/ivi-controller.c | 39 +++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) +Signed-off-by: Scott Murray diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c -index 6d95c88..f6ac174 100644 +index 8faec2a..8fa51f4 100644 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c -@@ -2164,6 +2164,41 @@ load_input_module(struct ivishell *shell) +@@ -2154,6 +2154,41 @@ load_input_module(struct ivishell *shell) return 0; } @@ -54,9 +54,9 @@ index 6d95c88..f6ac174 100644 static void launch_client_process(void *data) { -@@ -2229,6 +2264,10 @@ controller_module_init(struct weston_compositor *compositor, - return -1; - } +@@ -2221,6 +2256,10 @@ wet_module_init(struct weston_compositor *compositor, + shell->destroy_listener.notify = ivi_shell_destroy; + wl_signal_add(&compositor->destroy_signal, &shell->destroy_listener); + if (load_id_agent_module(shell) < 0) { + weston_log("ivi-controller: id-agent module not loaded\n"); @@ -65,6 +65,3 @@ index 6d95c88..f6ac174 100644 if (shell->bkgnd_surface_id && shell->ivi_client_name) { loop = wl_display_get_event_loop(compositor->wl_display); wl_event_loop_add_idle(loop, launch_client_process, shell); --- -2.7.4 -