X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=388f78545670f93a9cc7ca37d1179af9cabefbc6;hb=f825bf9e71ac5adfcbdc6ef7f6c2fef8555ee4a3;hp=27fb2d03765a28e9b03789e3ff2e2cb27fd114b0;hpb=0bef8700f21b9e7898f1785ee654d4669d0117b4;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 27fb2d0..388f785 100644
--- a/meson.build
+++ b/meson.build
@@ -1,18 +1,19 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.19',
+  version: '0.0.21',
   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')
 
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
@@ -21,8 +22,6 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
-    '-Wextra',
-    '-Werror'
   ]),
   language: 'c'
 )
@@ -44,7 +43,7 @@ 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')
@@ -69,7 +68,7 @@ endforeach
 # for it so we add waltham depends here. Further more, the output is being
 # handled by remoting plug-in
 depnames_waltham = [
-  'waltham'
+  'waltham', 'waltham-transmitter',
 ]
 
 deps_waltham = []
@@ -134,18 +133,7 @@ foreach proto: protocols
     endforeach
 endforeach
 
-# libweston-6 pkg-config file already has 'libweston-6' as prefix but
-# agl-compositor uses 'libweston-6' 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')
-  additional_include_dir = include_directories(prefix_path + '/' + 'include')
-  local_dep = declare_dependency(include_directories: additional_include_dir)
-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')
@@ -153,9 +141,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'),
 ]
 
 
@@ -169,6 +157,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,
@@ -199,17 +188,26 @@ 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')
     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')
     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')
   endif
 
   # do the test
   if cc.has_header(dir_path_x11_backend)
     config_h.set('HAVE_BACKEND_X11', 1)
+    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')
   endif
 endif
 
@@ -227,7 +225,9 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if deps_waltham.length() == depnames_waltham.length() + depnames.length()
+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
@@ -237,13 +237,15 @@ if dep_libsmack.found()
   deps_libweston += dep_libsmack
 endif
 
+dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor')
 
 libexec_compositor = shared_library(
         'exec_compositor',
         sources: srcs_agl_compositor,
         dependencies: deps_libweston,
+        install_dir: dir_module_agl_compositor,
         install: true,
-        version: '0.0.0',
+        version: meson.project_version(),
         soversion: 0
 )
 
@@ -259,13 +261,14 @@ exe_agl_compositor = executable(
 	'agl-compositor',
 	'src/main.c',
 	dependencies: dep_libexec_compositor,
+	install_rpath: dir_module_agl_compositor,
 	install: true
 )
 
 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')),
@@ -281,3 +284,7 @@ install_data(
 
 common_inc = [ include_directories('src'), include_directories('.') ]
 subdir('clients')
+
+if get_option('grpc-proxy')
+  subdir('grpc-proxy')
+endif