grpc-proxy: Extend AglShellSetSplit from gRPC proxy

[src/agl-compositor.git] / meson.build

diff --git a/meson.build b/meson.build
index d953fe3..fc87e20 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,17 +1,17 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.19',
+  version: '0.0.22',
   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'
 )
@@ -44,8 +42,7 @@ foreach func: optional_libc_funcs
 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')
@@ -66,25 +63,6 @@ foreach depname : depnames
 endforeach
 
 
-# the transmitter plug-in requires waltham but we don't have a cflags or libs
-# for it so we add waltham depends here. Further more, the output is being
-# handled by remoting plug-in
-depnames_waltham = [
-  'waltham'
-]
-
-deps_waltham = []
-foreach depname : depnames_waltham
-  dep = dependency(depname, required: false)
-  if dep.found()
-    deps_waltham += dep
-  else
-    message('Waltham requires @0@ which was not found. '.format(depname))
-  endif
-endforeach
-
-deps_waltham += deps_remoting
-
 agl_shell_xml = files('protocol/agl-shell.xml')
 agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 agl_screenshooter = files('protocol/agl-screenshooter.xml')
@@ -135,21 +113,7 @@ foreach proto: protocols
     endforeach
 endforeach
 
-# libweston pkg-config file already has 'libweston' as prefix but
-# agl-compositor uses 'libweston' also. This makes use of the prefix path as to
-# allow building and installing the compositor locally
 prefix_path = get_option('prefix')
-message('prefix_path ' + prefix_path)
-if not prefix_path.contains('/usr')
-  include_dir_str = join_paths(prefix_path, 'include')
-  if not fs.is_dir(include_dir_str)
-    error('Prefix path does not contain an include directory!')
-  endif
-  local_dep = declare_dependency(include_directories: include_dir_str)
-else
-  local_dep = []
-endif
-
 dir_data = join_paths(prefix_path, get_option('datadir'))
 dir_data_agl_compositor = join_paths('agl-compositor', 'protocols')
 dir_data_pc = join_paths(dir_data, 'pkgconfig')
@@ -157,9 +121,9 @@ libweston_dep = dependency(libweston_version)
 
 deps_libweston = [
   dependency('wayland-server'),
+  dependency('weston'),
   libweston_dep,
-  dependency('libweston-desktop-8'),
-  local_dep,
+  dependency('libweston-desktop-10'),
 ]
 
 
@@ -173,6 +137,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,
@@ -240,14 +205,11 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if deps_waltham.length() == depnames_waltham.length() + depnames.length()
-  config_h.set('HAVE_WALTHAM', 1)
-  message('Found waltham depends, enabling waltham')
-endif
+if get_option('xwayland')
+        config_h.set('BUILD_XWAYLAND', '1')
 
-if dep_libsmack.found()
-  config_h.set('HAVE_SMACK', 1)
-  deps_libweston += dep_libsmack
+        srcs_agl_compositor += 'src/xwayland.c'
+        config_h.set_quoted('XSERVER_PATH', get_option('xwayland-path'))
 endif
 
 dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor')
@@ -258,7 +220,7 @@ libexec_compositor = shared_library(
         dependencies: deps_libweston,
         install_dir: dir_module_agl_compositor,
         install: true,
-        version: '0.0.0',
+        version: meson.project_version(),
         soversion: 0
 )
 
@@ -279,9 +241,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')),
@@ -297,3 +259,7 @@ install_data(
 
 common_inc = [ include_directories('src'), include_directories('.') ]
 subdir('clients')
+
+if get_option('grpc-proxy')
+  subdir('grpc-proxy')
+endif