compositor: Use stdint for specifing integer storage

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

diff --git a/meson.build b/meson.build
index 65a55d6..aa811ad 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-libweston_version = 'libweston-10'
+libweston_version = 'libweston-13'
 pkgconfig = import('pkgconfig')
 fs = import('fs')
 
@@ -22,6 +22,7 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
+    '-Wno-deprecated-declarations'
   ]),
   language: 'c'
 )
@@ -62,31 +63,34 @@ foreach depname : depnames
   deps_remoting += dep
 endforeach
 
-
 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')
 xdg_shell_xml = join_paths(dir_wp_base, 'stable', 'xdg-shell', 'xdg-shell.xml')
+dep_libweston_protocols = dependency('libweston-13-protocols', version: '>= 13')
+dir_protocol_libweston = dep_libweston_protocols.get_pkgconfig_variable('pkgdatadir')
 
 protocols = [
   { 'name': 'agl-shell', 'source': 'internal' },
   { 'name': 'agl-shell-desktop', 'source': 'internal' },
-  { 'name': 'agl-screenshooter', 'source': 'internal' },
   { 'name': 'xdg-shell', 'source': 'wp-stable' },
   { 'name': 'xdg-output', 'source': 'unstable', 'version': 'v1' },
+  { 'name': 'weston-output-capture', 'source': 'libweston-protocols' },
 ]
 
 foreach proto: protocols
     proto_name = proto['name']
     if proto['source'] == 'internal'
         base_file = proto_name
-       xml_path = join_paths('protocol', '@0@.xml'.format(base_file))
+        xml_path = join_paths('protocol', '@0@.xml'.format(base_file))
+    elif proto['source'] == 'libweston-protocols'
+        base_file = proto_name
+        xml_path = join_paths(dir_protocol_libweston, '@0@.xml'.format(base_file))
     elif proto['source'] == 'wp-stable'
         base_file = proto_name
-       xml_path = join_paths(dir_wp_base, 'stable', proto_name, '@0@.xml'.format(base_file))
+        xml_path = join_paths(dir_wp_base, 'stable', proto_name, '@0@.xml'.format(base_file))
     else
         base_file = '@0@-unstable-@1@'.format(proto_name, proto['version'])
-       xml_path = join_paths(dir_wp_base, 'unstable', proto_name, '@0@.xml'.format(base_file))
+        xml_path = join_paths(dir_wp_base, 'unstable', proto_name, '@0@.xml'.format(base_file))
     endif
 
     foreach output_type: [ 'client-header', 'server-header', 'private-code' ]
@@ -123,9 +127,11 @@ deps_libweston = [
   dependency('wayland-server'),
   dependency('weston'),
   libweston_dep,
-  dependency('libweston-desktop-10'),
 ]
 
+weston_module_dir = libweston_dep.get_pkgconfig_variable('libdir')
+config_h.set_quoted('WESTON_MODULEDIR', join_paths(weston_module_dir, 'weston'))
+config_h.set_quoted('LIBWESTON_MODULEDIR', join_paths(weston_module_dir, libweston_version))
 
 srcs_agl_compositor = [
        'src/compositor.c',
@@ -133,17 +139,14 @@ srcs_agl_compositor = [
        'src/layout.c',
        'src/policy.c',
        'src/shell.c',
-       'src/screenshooter.c',
        '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,
        agl_shell_protocol_c,
        agl_shell_desktop_protocol_c,
-       agl_screenshooter_protocol_c,
        xdg_shell_protocol_c,
 ]
 
@@ -168,17 +171,17 @@ if libweston_dep.found()
   if not meson.is_cross_build()
     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_wayland_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-wayland.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_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
-      dir_path_rdp = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
+      dir_path_wayland_backend = join_paths(libweston_version, 'libweston', 'backend-wayland.h')
+      dir_path_rdp_backend = 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_wayland_backend = join_paths(libweston_version, 'libweston', 'backend-wayland.h')
     dir_path_rdp_backend = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
   endif
 
@@ -188,9 +191,9 @@ if libweston_dep.found()
     message('Building with X11 backend')
   endif
 
-  if cc.has_header(dir_path_headless_backend)
-    config_h.set('HAVE_BACKEND_HEADLESS', 1)
-    message('Building with headless backend')
+  if cc.has_header(dir_path_wayland_backend)
+    config_h.set('HAVE_BACKEND_WAYLAND', 1)
+    message('Building with Wayland backend')
   endif
 
   if cc.has_header(dir_path_rdp_backend)
@@ -217,6 +220,8 @@ if get_option('xwayland')
         config_h.set('BUILD_XWAYLAND', '1')
 
         srcs_agl_compositor += 'src/xwayland.c'
+        srcs_agl_compositor += 'shared/xalloc.c'
+        srcs_agl_compositor += 'shared/process-util.c'
         config_h.set_quoted('XSERVER_PATH', get_option('xwayland-path'))
 endif