mirror of
https://github.com/cage-kiosk/cage.git
synced 2026-03-22 05:34:01 -04:00
Drop xdg-shell protocol scanning
wlroots 0.20 generates wayland-protocols headers internally, so wayland-scanner for xdg-shell is no longer needed. See: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5075
This commit is contained in:
parent
5da65155c9
commit
d07f58265a
1 changed files with 0 additions and 25 deletions
25
meson.build
25
meson.build
|
|
@ -36,34 +36,10 @@ if is_freebsd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
wlroots = dependency('wlroots-0.20', fallback: ['wlroots', 'wlroots'])
|
wlroots = dependency('wlroots-0.20', fallback: ['wlroots', 'wlroots'])
|
||||||
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
|
|
||||||
wayland_server = dependency('wayland-server')
|
wayland_server = dependency('wayland-server')
|
||||||
xkbcommon = dependency('xkbcommon')
|
xkbcommon = dependency('xkbcommon')
|
||||||
math = cc.find_library('m')
|
math = cc.find_library('m')
|
||||||
|
|
||||||
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
|
|
||||||
wayland_scanner = find_program('wayland-scanner')
|
|
||||||
wayland_scanner_server = generator(
|
|
||||||
wayland_scanner,
|
|
||||||
output: '@BASENAME@-protocol.h',
|
|
||||||
arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
|
|
||||||
)
|
|
||||||
|
|
||||||
server_protocols = [
|
|
||||||
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
|
|
||||||
]
|
|
||||||
|
|
||||||
server_protos_headers = []
|
|
||||||
|
|
||||||
foreach p : server_protocols
|
|
||||||
xml = join_paths(p)
|
|
||||||
server_protos_headers += wayland_scanner_server.process(xml)
|
|
||||||
endforeach
|
|
||||||
|
|
||||||
server_protos = declare_dependency(
|
|
||||||
sources: server_protos_headers,
|
|
||||||
)
|
|
||||||
|
|
||||||
have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
|
have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
|
||||||
|
|
||||||
version = '@0@'.format(meson.project_version())
|
version = '@0@'.format(meson.project_version())
|
||||||
|
|
@ -140,7 +116,6 @@ executable(
|
||||||
meson.project_name(),
|
meson.project_name(),
|
||||||
cage_sources + cage_headers,
|
cage_sources + cage_headers,
|
||||||
dependencies: [
|
dependencies: [
|
||||||
server_protos,
|
|
||||||
wayland_server,
|
wayland_server,
|
||||||
wlroots,
|
wlroots,
|
||||||
xkbcommon,
|
xkbcommon,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue