X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=0958f06bd061a8db450f7fa02cd2311fcee0132e;hb=0b766cf978b8b100caecd4c61464e1a683685072;hp=d953fe3f06e8b4cf340a5a76fdfc91d3fefeb930;hpb=e5016cbc47b46b86a50d9a6ca71269a62664efbe;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index d953fe3..0958f06 100644
--- a/meson.build
+++ b/meson.build
@@ -1,17 +1,17 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.19',
+  version: '0.0.20',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
+    'werror=true',
   ],
-  meson_version: '>= 0.47',
+  meson_version: '>= 0.53',
   license: 'MIT/Expat',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.19'
-libweston_version = 'libweston-8'
+libweston_version = 'libweston-10'
 pkgconfig = import('pkgconfig')
 fs = import('fs')
 
@@ -22,8 +22,6 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
-    '-Wextra',
-    '-Werror'
   ]),
   language: 'c'
 )
@@ -45,7 +43,7 @@ endforeach
 
 dep_libsystemd = dependency('libsystemd', required: false)
 dep_libsmack = dependency('libsmack', required: false)
-dep_scanner = dependency('wayland-scanner', native: true)
+dep_scanner = dependency('wayland-scanner')
 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
 dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
@@ -70,7 +68,7 @@ endforeach
 # for it so we add waltham depends here. Further more, the output is being
 # handled by remoting plug-in
 depnames_waltham = [
-  'waltham'
+  'waltham', 'waltham-transmitter',
 ]
 
 deps_waltham = []
@@ -158,7 +156,7 @@ libweston_dep = dependency(libweston_version)
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-8'),
+  dependency('libweston-desktop-10'),
   local_dep,
 ]
 
@@ -173,6 +171,7 @@ srcs_agl_compositor = [
 	'src/input.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
+	'shared/process-util.c',
 	agl_shell_server_protocol_h,
 	agl_shell_desktop_server_protocol_h,
 	agl_screenshooter_server_protocol_h,
@@ -279,9 +278,9 @@ exe_agl_compositor = executable(
 )
 
 pkgconfig.generate(
-        filebase: 'agl-compositor-@0@-protocols'.format(agl_compositor_version),
+        filebase: 'agl-compositor-@0@-protocols'.format(meson.project_version()),
         name: 'agl-compositor private protocols',
-        version: agl_compositor_version,
+        version: meson.project_version(),
         description: 'agl-compositor protocol files',
         variables: [
                 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),