mirror of
https://github.com/cage-kiosk/cage.git
synced 2026-03-31 07:11:23 -04:00
Upgrade wlroots to v0.20
Breaking changes: - https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5230
This commit is contained in:
parent
a1e5bf3789
commit
b5c3e71b02
4 changed files with 5 additions and 30 deletions
27
meson.build
27
meson.build
|
|
@ -35,35 +35,11 @@ if is_freebsd
|
|||
)
|
||||
endif
|
||||
|
||||
wlroots = dependency('wlroots-0.19', fallback: ['wlroots', 'wlroots'])
|
||||
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
|
||||
wlroots = dependency('wlroots-0.20', fallback: ['wlroots', 'wlroots'])
|
||||
wayland_server = dependency('wayland-server')
|
||||
xkbcommon = dependency('xkbcommon')
|
||||
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'
|
||||
|
||||
version = '@0@'.format(meson.project_version())
|
||||
|
|
@ -140,7 +116,6 @@ executable(
|
|||
meson.project_name(),
|
||||
cage_sources + cage_headers,
|
||||
dependencies: [
|
||||
server_protos,
|
||||
wayland_server,
|
||||
wlroots,
|
||||
xkbcommon,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue