2022-05-13 19:39:14 +02:00
|
|
|
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
|
2022-05-13 19:45:50 +02:00
|
|
|
index e848daf0d..cde8bbef7 100644
|
2022-05-13 19:39:14 +02:00
|
|
|
--- a/hw/xwayland/meson.build
|
|
|
|
|
+++ b/hw/xwayland/meson.build
|
2022-05-13 19:41:07 +02:00
|
|
|
@@ -28,8 +28,7 @@ srcs = [
|
|
|
|
|
'../../mi/miinitext.h',
|
2022-05-13 19:39:14 +02:00
|
|
|
]
|
|
|
|
|
|
2022-05-13 19:41:07 +02:00
|
|
|
-scanner_dep = dependency('wayland-scanner', native: true)
|
2022-05-13 19:39:14 +02:00
|
|
|
-scanner = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
|
2022-05-13 19:45:50 +02:00
|
|
|
+scanner = find_program('wayland-scanner')
|
2022-05-13 19:39:14 +02:00
|
|
|
|
|
|
|
|
protocols_dep = dependency('wayland-protocols', version: wayland_protocols_req)
|
|
|
|
|
protodir = protocols_dep.get_pkgconfig_variable('pkgdatadir')
|
2022-05-13 19:41:07 +02:00
|
|
|
@@ -48,11 +47,7 @@ client_header = generator(scanner,
|
|
|
|
|
arguments : ['client-header', '@INPUT@', '@OUTPUT@']
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
-if scanner_dep.version().version_compare('>= 1.14.91')
|
|
|
|
|
- scanner_argument = 'private-code'
|
|
|
|
|
-else
|
|
|
|
|
- scanner_argument = 'code'
|
|
|
|
|
-endif
|
|
|
|
|
+scanner_argument = 'private-code'
|
|
|
|
|
|
|
|
|
|
code = generator(scanner,
|
|
|
|
|
output : '@BASENAME@-protocol.c',
|
