From dd71a9fe47f3091e352de1b21330b35be4152efa Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 1 Mar 2017 15:32:47 +0100 Subject: Remove forward port for weston * The forward port on weston is now merged in weston upstream * fix the patch 0001-weston-patch-for-wl-shell-emulator.patch for weston 1.11 patch -> commit id from upstream 0001-ivi-shell-fix-TODO-which-expects-only-one-screen-in-.patch b216c92d4d19d4b88817d088038de90f3d95ec06 0002-ivi-shell-avoid-inserting-a-ivi_layer-to-multiple-sc.patch 77b0ee18a2e02e6084ece3d04914f7e8f4c6dcb9 0003-ivi-shell-fix-layout_layer.view_list-is-not-initiliz.patch fbfa8f21f91dfd1a1d85f9c6b039fe893a36e69b 0004-ivi-shell-remove-a-code-which-expects-only-a-screen-.patch 747c3865ab7bf8defc7a0cacf148b547c949f303 0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch b4cb25dc261375bad87d1c1dd058b9716009e6fb 0006-ivi-shell-transforming-from-a-single-screen-coordina.patch 29babdf099fee228883ab6425811f11135296274 0007-RFR-ivi-shell-multi-screen-support-to-calcuration-of.patch 1c2618e9ff58d355714bcdde61f87a6e918f3059 Bug-AGL: SPEC-411 Change-Id: I58a23f3fe4046ef2befb594bf0f76f34c4d15312 Signed-off-by: Ronan Le Martret --- ...ulti-screen-support.-ivi_layout_screen-to.patch | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 recipes-graphics/wayland/weston/0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch (limited to 'recipes-graphics/wayland/weston/0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch') diff --git a/recipes-graphics/wayland/weston/0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch b/recipes-graphics/wayland/weston/0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch deleted file mode 100644 index de795432..00000000 --- a/recipes-graphics/wayland/weston/0005-ivi-shell-multi-screen-support.-ivi_layout_screen-to.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e8bfcbd7e64a296d2aba63a80d8e181055587f76 Mon Sep 17 00:00:00 2001 -From: Nobuhiko Tanibata -Date: Mon, 30 Nov 2015 11:05:37 +0900 -Subject: [PATCH] ivi-shell: multi screen support. ivi_layout_screen to be - taken account into property change in commitChanges. - -Property change is now done in update_prop so to consider ivi_screen -property for caluculating transform of weston surface, ivi_layout_screen - is added as a parameter of update_prop. - -However, update_prop of weston_view of a ivi_surface can not be done -even if it is set on a screen. The propoerty change shall be done only -when a visibility of ivi_surface or ivi_layer which contains the -ivi_surface is ON. Such a condition shall be checked at commit_changes -as well to avoid calling update_prop, which actually updates -weston_views. - -Signed-off-by: Nobuhiko Tanibata ---- - ivi-shell/ivi-layout.c | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c -index 31b5def..1773af8 100644 ---- a/ivi-shell/ivi-layout.c -+++ b/ivi-shell/ivi-layout.c -@@ -737,16 +737,17 @@ calc_surface_to_global_matrix_and_mask_to_weston_surface( - } - - static void --update_prop(struct ivi_layout_layer *ivilayer, -+update_prop(struct ivi_layout_screen *iviscrn, -+ struct ivi_layout_layer *ivilayer, - struct ivi_layout_surface *ivisurf) - { - struct weston_view *tmpview; - struct ivi_rectangle r; - bool can_calc = true; - -- if (!ivilayer->event_mask && !ivisurf->event_mask) { -+ /*In case of no prop change, this just returns*/ -+ if (!ivilayer->event_mask && !ivisurf->event_mask) - return; -- } - - update_opacity(ivilayer, ivisurf); - -@@ -802,8 +803,22 @@ commit_changes(struct ivi_layout *layout) - - wl_list_for_each(iviscrn, &layout->screen_list, link) { - wl_list_for_each(ivilayer, &iviscrn->order.layer_list, order.link) { -+ /* -+ * If ivilayer is invisible, weston_view of ivisurf doesn't -+ * need to be modified. -+ */ -+ if (ivilayer->prop.visibility == false) -+ continue; -+ - wl_list_for_each(ivisurf, &ivilayer->order.surface_list, order.link) { -- update_prop(ivilayer, ivisurf); -+ /* -+ * If ivilayer is invisible, weston_view of ivisurf doesn't -+ * need to be modified. -+ */ -+ if (ivisurf->prop.visibility == false) -+ continue; -+ -+ update_prop(iviscrn, ivilayer, ivisurf); - } - } - } --- -2.7.4 - -- cgit 1.2.3-korg