X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=bc65c1ca2174c128f30f8f6629c007ddecf44737;hb=03755785a5b741b500fd7c20d40b040410de2f0c;hp=e1ba3c13173f6df92cfee74a7a70cd8ed108d7cc;hpb=b352cee6f8113e63864ac644502ace3bd75bfae1;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index e1ba3c1..bc65c1c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.13',
+  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.13'
+agl_compositor_version = '0.0.18'
+libweston_version = 'libweston-8'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -45,11 +46,29 @@ 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')
 
 protocols = [
   { 'name': 'agl-shell', 'source': 'internal' },
+  { 'name': 'agl-shell-desktop', 'source': 'internal' },
   { 'name': 'xdg-shell', 'source': 'wp-stable' },
 ]
 
@@ -105,12 +124,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,
 ]
 
@@ -118,11 +137,15 @@ srcs_agl_compositor = [
 	'src/main.c',
 	'src/desktop.c',
 	'src/layout.c',
+	'src/policy.c',
+	'src/policy-default.c',
 	'src/shell.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
 	agl_shell_server_protocol_h,
+	agl_shell_desktop_server_protocol_h,
 	agl_shell_protocol_c,
+	agl_shell_desktop_protocol_c,
 	xdg_shell_protocol_c,
 ]
 
@@ -132,9 +155,9 @@ srcs_agl_compositor = [
 # 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
@@ -152,6 +175,11 @@ 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
+
 configure_file(output: 'config.h', configuration: config_h)
 
 exe_agl_compositor = executable(
@@ -174,6 +202,6 @@ pkgconfig.generate(
 )
 
 install_data(
-        [ agl_shell_xml ],
+        [ agl_shell_xml, agl_shell_desktop_xml ],
         install_dir: join_paths(dir_data, dir_data_agl_compositor)
 )