Update to libweston-9

And bump the version to 0.0.19.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I173f02df68c651ed2f10e5e4faa4548e9b5fe729

diff --git a/meson.build b/meson.build
index 11ee2c1..081b127 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
-  'c','cpp',
-  version: '0.0.18',
+  'c', 'cpp',
+  version: '0.0.19',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -10,8 +10,8 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.18'
-libweston_version = 'libweston-8'
+agl_compositor_version = '0.0.19'
+libweston_version = 'libweston-9'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -154,7 +154,7 @@ libweston_dep = dependency(libweston_version)
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-8'),
+  dependency('libweston-desktop-9'),
   local_dep,
 ]
 

diff --git a/src/main.c b/src/main.c
index 482558a..4111784 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1500,15 +1500,15 @@ int main(int argc, char *argv[])
                return EXIT_SUCCESS;
        }
 
-       log_ctx = weston_log_ctx_compositor_create();
+       log_ctx = weston_log_ctx_create();
        if (!log_ctx) {
                fprintf(stderr, "Failed to initialize weston debug framework.\n");
                return ret;
        }
 
-        log_scope = weston_compositor_add_log_scope(log_ctx, "log",
-                                                   "agl-compositor log\n",
-                                                   NULL, NULL, NULL);
+        log_scope = weston_log_ctx_add_log_scope(log_ctx, "log",
+                                                "agl-compositor log\n",
+                                                 NULL, NULL, NULL);
 
        log_file_open(log);
        weston_log_set_handler(vlog, vlog_continue);
@@ -1609,15 +1609,13 @@ int main(int argc, char *argv[])
        wl_display_destroy_clients(display);
 
 error_compositor:
-       weston_compositor_tear_down(ivi.compositor);
+       weston_compositor_destroy(ivi.compositor);
 
-       weston_compositor_log_scope_destroy(log_scope);
+       weston_log_scope_destroy(log_scope);
        log_scope = NULL;
 
-       weston_log_ctx_compositor_destroy(ivi.compositor);
-       weston_compositor_destroy(ivi.compositor);
-
-       weston_log_subscriber_destroy_log(logger);
+       weston_log_subscriber_destroy(logger);
+       weston_log_ctx_destroy(log_ctx);
 
        ivi_policy_destroy(ivi.policy);