diff options
| author | Eric Anholt <eric@anholt.net> | 2017-08-01 13:11:25 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-08-02 09:39:04 +0100 |
| commit | 2d50e32e0ba1045f8c73a14335743ae98121d102 (patch) | |
| tree | 41d0b80f9c64a12841ce74cb1fafc361ad445869 | |
| parent | 0a448d133f4f1c913b1c2cb05accff31c74a3dbf (diff) | |
meson: Fix xwayland build since xwayland-keyboard-grab.
The version detect was erroring out with 1.9 protos installed, and we
weren't building the new code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xwayland/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build index d2791fe14..b619a66a7 100644 --- a/hw/xwayland/meson.build +++ b/hw/xwayland/meson.build @@ -18,6 +18,7 @@ protodir = protocols_dep.get_pkgconfig_variable('pkgdatadir') pointer_xml = join_paths(protodir, 'unstable', 'pointer-constraints', 'pointer-constraints-unstable-v1.xml') relative_xml = join_paths(protodir, 'unstable', 'relative-pointer', 'relative-pointer-unstable-v1.xml') tablet_xml = join_paths(protodir, 'unstable', 'tablet', 'tablet-unstable-v2.xml') +kbgrab_xml = join_paths(protodir, 'unstable', 'xwayland-keyboard-grab', 'xwayland-keyboard-grab-unstable-v1.xml') client_header = generator(scanner, output : '@BASENAME@-client-protocol.h', @@ -30,9 +31,11 @@ code = generator(scanner, srcs += client_header.process(relative_xml) srcs += client_header.process(pointer_xml) srcs += client_header.process(tablet_xml) +srcs += client_header.process(kbgrab_xml) srcs += code.process(relative_xml) srcs += code.process(pointer_xml) srcs += code.process(tablet_xml) +srcs += code.process(kbgrab_xml) xwayland_glamor = [] if gbm_dep.found() diff --git a/meson.build b/meson.build index a36ae9da7..3efec0def 100644 --- a/meson.build +++ b/meson.build @@ -98,7 +98,7 @@ if (host_machine.system() != 'darwin' and xwayland_dep = [ dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required), - dependency('wayland-protocols', version: '>= 1.9.0', required: xwayland_required), + dependency('wayland-protocols', version: '>= 1.9', required: xwayland_required), dependency('libdrm', version: '>= 2.3.1', required: xwayland_required), dependency('epoxy', required: xwayland_required), ] |