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