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

diff --git a/meson.build b/meson.build
index b7fd577..48db082 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.13',
+  version: '0.0.15',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -10,6 +10,8 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
+agl_compositor_version = '0.0.15'
+pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
 add_project_arguments(
@@ -40,14 +42,16 @@ endforeach
 dep_libsystemd = dependency('libsystemd', 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.12')
+dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
 
 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' },
 ]
 
@@ -88,10 +92,28 @@ 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')
+libweston_dep = dependency('libweston-7')
+
 deps_libweston = [
   dependency('wayland-server'),
-  dependency('libweston-6'),
-  dependency('libweston-desktop-6'),
+  libweston_dep,
+  dependency('libweston-desktop-7'),
+  local_dep,
 ]
 
 srcs_agl_compositor = [
@@ -102,10 +124,29 @@ srcs_agl_compositor = [
 	'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,
 ]
 
+# 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')
+  else
+    dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h')
+  endif
+
+  # do the test
+  if cc.has_header(dir_path_x11_backend)
+    config_h.set('HAVE_BACKEND_X11', 1)
+  endif
+endif
+
 if dep_libsystemd.found()
   config_h.set('HAVE_SYSTEMD', 1)
 
@@ -123,3 +164,20 @@ exe_agl_compositor = executable(
 	dependencies: deps_libweston,
 	install: true
 )
+
+pkgconfig.generate(
+        filebase: 'agl-compositor-@0@-protocols'.format(agl_compositor_version),
+        name: 'agl-compositor private protocols',
+        version: agl_compositor_version,
+        description: 'agl-compositor protocol files',
+        variables: [
+                'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
+                'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', dir_data_agl_compositor)
+        ],
+        install_dir: dir_data_pc
+)
+
+install_data(
+        [ agl_shell_xml, agl_shell_desktop_xml ],
+        install_dir: join_paths(dir_data, dir_data_agl_compositor)
+)