X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=9dd9673e194ad5e0db3168945b1261f93ac9baff;hb=572d0eac44f115c6a97dae826afd4c6e43fbe4a7;hp=48db082bf159f1c77b3f4cd306149b548b30fe68;hpb=72aa326d8f54ad75caee895ef4d6ce4e09a143df;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 48db082..9dd9673 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.15',
+  version: '0.0.18',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -10,7 +10,8 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.15'
+agl_compositor_version = '0.0.18'
+libweston_version = 'libweston-8'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -40,11 +41,28 @@ 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)
 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')
 
+depnames = [
+  'gstreamer-1.0', 'gstreamer-allocators-1.0',
+  'gstreamer-app-1.0', 'gstreamer-video-1.0',
+  'gobject-2.0', 'glib-2.0'
+]
+
+deps_remoting = []
+foreach depname : depnames
+  dep = dependency(depname, required: false)
+  if not dep.found()
+    message('Remoting requires @0@ which was not found. '.format(depname))
+  endif
+deps_remoting += dep
+endforeach
+
+
 agl_shell_xml = files('protocol/agl-shell.xml')
 agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 xdg_shell_xml = join_paths(dir_wp_base, 'stable', 'xdg-shell', 'xdg-shell.xml')
@@ -107,12 +125,12 @@ 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')
-libweston_dep = dependency('libweston-7')
+libweston_dep = dependency(libweston_version)
 
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-7'),
+  dependency('libweston-desktop-8'),
   local_dep,
 ]
 
@@ -120,6 +138,7 @@ srcs_agl_compositor = [
 	'src/main.c',
 	'src/desktop.c',
 	'src/layout.c',
+	'src/policy.c',
 	'src/shell.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
@@ -130,15 +149,25 @@ srcs_agl_compositor = [
 	xdg_shell_protocol_c,
 ]
 
+policy_to_install = get_option('policy-default')
+if policy_to_install == 'auto' or policy_to_install == 'allow-all'
+  srcs_agl_compositor += 'src/policy-default.c'
+  message('Installing allow all policy')
+elif policy_to_install == 'deny-all'
+  srcs_agl_compositor += 'src/policy-deny.c'
+  message('Installing deny all policy')
+endif
+
+
 # From meson documentation:
 # In order to look for headers in a specific directory you can use args :
 # '-I/extra/include/dir, but this should only be used in exceptional cases for
 # includes that can't be detected via pkg-config and passed via dependencies.
 if libweston_dep.found()
   if not prefix_path.contains('/usr')
-    dir_path_x11_backend = join_paths(prefix_path, 'include', 'libweston-7', 'libweston', 'backend-x11.h')
+    dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
   else
-    dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h')
+    dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
   endif
 
   # do the test
@@ -156,6 +185,16 @@ if dep_libsystemd.found()
   message('Found systemd, enabling notify support')
 endif
 
+if deps_remoting.length() == depnames.length()
+  config_h.set('HAVE_REMOTING', 1)
+  message('Found remoting depends, enabling remoting')
+endif
+
+if dep_libsmack.found()
+  config_h.set('HAVE_SMACK', 1)
+  deps_libweston += dep_libsmack
+endif
+
 configure_file(output: 'config.h', configuration: config_h)
 
 exe_agl_compositor = executable(