src: Make sure we don't die out when performing output hot-plugging

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

diff --git a/meson.build b/meson.build
index 388f785..55b68cb 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.21',
+  version: '0.0.24',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -11,7 +11,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-libweston_version = 'libweston-10'
+libweston_version = 'libweston-11'
 pkgconfig = import('pkgconfig')
 fs = import('fs')
 
@@ -42,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')
+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')
@@ -64,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', 'waltham-transmitter',
-]
-
-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')
@@ -143,7 +123,7 @@ deps_libweston = [
   dependency('wayland-server'),
   dependency('weston'),
   libweston_dep,
-  dependency('libweston-desktop-10'),
+  dependency('libweston-desktop-11'),
 ]
 
 
@@ -189,14 +169,17 @@ if libweston_dep.found()
     if not prefix_path.contains('/usr')
       dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
       dir_path_headless_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_rdp_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-rdp.h')
     else
       dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
-      dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_rdp = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
     endif
   else
     message('Building with cross environment')
     dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
     dir_path_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+    dir_path_rdp_backend = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
   endif
 
   # do the test
@@ -209,6 +192,11 @@ if libweston_dep.found()
     config_h.set('HAVE_BACKEND_HEADLESS', 1)
     message('Building with headless backend')
   endif
+
+  if cc.has_header(dir_path_rdp_backend)
+    config_h.set('HAVE_BACKEND_RDP', 1)
+    message('Building with RDP backend')
+  endif
 endif
 
 if dep_libsystemd.found()
@@ -225,16 +213,11 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if deps_waltham.length() == depnames_waltham.length() + depnames.length() and not get_option('waltham')
-  message('Found waltham depends, but waltham is deprecated')
-elif deps_waltham.length() == depnames_waltham.length() + depnames.length() and get_option('waltham')
-  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')