summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-02-05 17:07:34 -0500
committerScott Murray <scott.murray@konsulko.com>2022-03-29 15:41:56 -0400
commita02c5606aa6621c9d3e0cc968180e7993201e2da (patch)
treed4d907d9bbd3fa15bf1f0a9adba4fac95abdcd32 /src
parent4bd77c11f14157259b8d15bddcee28ddb6e8041c (diff)
Weston 10.0 compatibility changes
Changes: - Bump libweston dependencies in meson.build. - Handle addition of another argument to the wet_main and weston_compositor_create functions. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor.c4
-rw-r--r--src/main.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 4ac0d95..9a3a825 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1589,7 +1589,7 @@ copy_command_line(int argc, char * const argv[])
}
WL_EXPORT
-int wet_main(int argc, char *argv[])
+int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
{
struct ivi_compositor ivi = { 0 };
char *cmdline;
@@ -1700,7 +1700,7 @@ int wet_main(int argc, char *argv[])
if (!signals[i])
goto error_signals;
- ivi.compositor = weston_compositor_create(display, log_ctx, &ivi);
+ ivi.compositor = weston_compositor_create(display, log_ctx, &ivi, test_data);
if (!ivi.compositor) {
weston_log("fatal: failed to create compositor.\n");
goto error_signals;
diff --git a/src/main.c b/src/main.c
index 5d192b0..d1390f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,5 +28,5 @@
int main(int argc, char *argv[])
{
- return wet_main(argc, argv);
+ return wet_main(argc, argv, NULL);
}