From a715720890fa9c6817022ecfd5cf919e4df0524d Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 10 Sep 2014 14:06:30 +0200 Subject: [PATCH] meta-tizen: add fix for weston Change-Id: I7fe0874f98f167512cfc9b125c3f1af588dccdbf (From meta-tizen rev: 3e89b6250c711266a31e1b1fcbd52c08ae866110) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- ...issingpanelregressionintroducedbypanelopt.patch | 29 ++++++++++++++++++++++ .../recipes-graphics/wayland/weston_1.5.0.bbappend | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-tizen/recipes-graphics/wayland/weston/0001-fix:-missingpanelregressionintroducedbypanelopt.patch diff --git a/meta-tizen/recipes-graphics/wayland/weston/0001-fix:-missingpanelregressionintroducedbypanelopt.patch b/meta-tizen/recipes-graphics/wayland/weston/0001-fix:-missingpanelregressionintroducedbypanelopt.patch new file mode 100644 index 0000000..4942868 --- /dev/null +++ b/meta-tizen/recipes-graphics/wayland/weston/0001-fix:-missingpanelregressionintroducedbypanelopt.patch @@ -0,0 +1,29 @@ +From beedbb821fe9fd068d7ef7b2bf102516c1f73074 Mon Sep 17 00:00:00 2001 +From: Philippe Coval +Date: Wed, 25 Jun 2014 14:14:05 +0200 +Subject: [PATCH] meta-tizen: fix: missing panel regression introduced by panel opt + +to be squashed into d733bcef2670f30da232748f09b10eab98d625b8 + +Change-Id: I63b5860b2d8be106abab1eaf287142e15fef59d9 +Signed-off-by: Philippe Coval +--- + clients/desktop-shell.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c +index 161d3ac..1c36b2f 100644 +--- a/clients/desktop-shell.c ++++ b/clients/desktop-shell.c +@@ -1206,7 +1206,7 @@ static void + output_init(struct output *output, struct desktop *desktop) + { + struct wl_surface *surface; +- if(output->panel) { ++ if(desktop->panel) { + output->panel = panel_create(desktop); + surface = window_get_wl_surface(output->panel->window); + desktop_shell_set_panel(desktop->shell, +-- +1.8.1.4 + diff --git a/meta-tizen/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-tizen/recipes-graphics/wayland/weston_1.5.0.bbappend index aa5ebad..6a0ccf7 100644 --- a/meta-tizen/recipes-graphics/wayland/weston_1.5.0.bbappend +++ b/meta-tizen/recipes-graphics/wayland/weston_1.5.0.bbappend @@ -7,6 +7,7 @@ SRC_URI += "file://weston.target \ file://0004-downstream-shell-make-panel-optional-panel-false-in-.patch \ file://0005-downstream-Hack-to-allow-selecting-a-default-output.patch \ file://0006-downstream-accept-the-new-enable-sys-uid-configure-o.patch \ + file://0001-fix:-missingpanelregressionintroducedbypanelopt.patch \ " do_install_append() { -- 2.7.4