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>

diff --git a/meson.build b/meson.build
index 17913d0..5f6c29d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-libweston_version = 'libweston-9'
+libweston_version = 'libweston-10'
 pkgconfig = import('pkgconfig')
 fs = import('fs')
 
@@ -157,7 +157,7 @@ libweston_dep = dependency(libweston_version)
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-9'),
+  dependency('libweston-desktop-10'),
   local_dep,
 ]
 

diff --git a/src/compositor.c b/src/compositor.c
index 4ac0d95..9a3a825 100644 (file)
--- 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 (file)
--- 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);
 }