meta-agl-ic-container/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch

   1 From e7984b2a8a7508cdbc3f269f4e0789edcfe8b30a Mon Sep 17 00:00:00 2001
   2 From: James Thomas <james.thomas@codethink.co.uk>
   3 Date: Thu, 22 Feb 2024 12:26:58 +0000
   4 Subject: [PATCH] Update libweston to version 13
   5
   6 Upstream-Status: Submitted [https://github.com/COVESA/wayland-ivi-extension/pull/185]
   7 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
   8
   9 ---
  10  CMakeLists.txt                        |  2 +-
  11  weston-ivi-shell/src/ivi-controller.c | 10 +++++-----
  12  2 files changed, 6 insertions(+), 6 deletions(-)
  13
  14 diff --git a/CMakeLists.txt b/CMakeLists.txt
  15 index d6428c2..5917875 100644
  16 --- a/CMakeLists.txt
  17 +++ b/CMakeLists.txt
  18 @@ -28,7 +28,7 @@ include(GNUInstallDirs)
  19  SET(IVI_EXTENSION_VERSION 2.3.2)
  20  SET(ILM_API_VERSION 2.3.2)
  21
  22 -SET(LIBWESTON_VER 12)
  23 +SET(LIBWESTON_VER 13)
  24
  25  SET( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter" )
  26  SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter" )
  27 diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c
  28 index 4701aec..94ca83e 100644
  29 --- a/weston-ivi-shell/src/ivi-controller.c
  30 +++ b/weston-ivi-shell/src/ivi-controller.c
  31 @@ -881,15 +881,15 @@ set_bkgnd_surface_prop(struct ivishell *shell)
  32      wl_list_for_each(output, &compositor->output_list, link) {
  33          if (!count)
  34          {
  35 -            x = output->x;
  36 -            y = output->y;
  37 +            x = output->pos.c.x;
  38 +            y = output->pos.c.y;
  39              count++;
  40          }
  41 -        dest_width = output->x + output->width;
  42 +        dest_width = output->pos.c.x + output->width;
  43          if (output->height > dest_height)
  44              dest_height = output->height;
  45          weston_log("set_bkgnd_surface_prop: o_name:%s x:%d y:%d o_width:%d o_height:%d\n",
  46 -                   output->name, output->x, output->y, output->width, output->height);
  47 +                   output->name, output->pos.c.x, output->pos.c.y, output->width, output->height);
  48      }
  49
  50      w_surface = view->surface;
  51 @@ -2197,7 +2197,7 @@ launch_client_process(void *data)
  52        setenv(IVI_CLIENT_ENABLE_CURSOR_ENV_NAME, option, 0x1);
  53      }
  54
  55 -    shell->client = weston_client_start(shell->compositor,
  56 +    shell->client = wet_client_start(shell->compositor,
  57                                          shell->ivi_client_name);
  58
  59      shell->client_destroy_listener.notify = ivi_shell_client_destroy;
  60 --
  61 2.44.0
  62