X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=3b92cca82faef6ef62c7ec303c040162dfe143a3;hb=refs%2Fchanges%2F97%2F29797%2F1;hp=55b68cb67a06ff24ee035182a0ea80b1ea800933;hpb=5921beed9208e15fa45c4bb719f667cdd50cd94c;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 55b68cb..3b92cca 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-libweston_version = 'libweston-11'
+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'
 )
@@ -123,9 +124,11 @@ deps_libweston = [
   dependency('wayland-server'),
   dependency('weston'),
   libweston_dep,
-  dependency('libweston-desktop-11'),
 ]
 
+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',
@@ -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)