mirror of
https://github.com/cage-kiosk/cage.git
synced 2026-03-22 05:34:01 -04:00
Upgrade wlroots to v0.20
Breaking changes: - https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5230
This commit is contained in:
parent
dcd64ae48b
commit
5da65155c9
4 changed files with 5 additions and 5 deletions
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
|
@ -6,7 +6,7 @@ on:
|
||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
WLROOTS_VERSION: 0.19
|
WLROOTS_VERSION: 0.20.0-rc3
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
compile:
|
compile:
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ All releases are published on [GitHub](https://github.com/cage-kiosk/cage/releas
|
||||||
|
|
||||||
You can build Cage with the [meson](https://mesonbuild.com/) build system. It
|
You can build Cage with the [meson](https://mesonbuild.com/) build system. It
|
||||||
requires wayland, wlroots, and xkbcommon to be installed. Optionally, install
|
requires wayland, wlroots, and xkbcommon to be installed. Optionally, install
|
||||||
scdoc for manual pages. Cage is currently based on branch 0.18 of wlroots.
|
scdoc for manual pages. Cage is currently based on branch 0.20 of wlroots.
|
||||||
|
|
||||||
Simply execute the following steps to build Cage:
|
Simply execute the following steps to build Cage:
|
||||||
|
|
||||||
|
|
|
||||||
4
cage.c
4
cage.c
|
|
@ -588,8 +588,8 @@ main(int argc, char *argv[])
|
||||||
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(xcursor_manager, DEFAULT_XCURSOR, 1);
|
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(xcursor_manager, DEFAULT_XCURSOR, 1);
|
||||||
if (xcursor) {
|
if (xcursor) {
|
||||||
struct wlr_xcursor_image *image = xcursor->images[0];
|
struct wlr_xcursor_image *image = xcursor->images[0];
|
||||||
wlr_xwayland_set_cursor(xwayland, image->buffer, image->width * 4, image->width, image->height,
|
wlr_xwayland_set_cursor(xwayland, wlr_xcursor_image_get_buffer(image), image->hotspot_x,
|
||||||
image->hotspot_x, image->hotspot_y);
|
image->hotspot_y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ if is_freebsd
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
wlroots = dependency('wlroots-0.19', fallback: ['wlroots', 'wlroots'])
|
wlroots = dependency('wlroots-0.20', fallback: ['wlroots', 'wlroots'])
|
||||||
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
|
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
|
||||||
wayland_server = dependency('wayland-server')
|
wayland_server = dependency('wayland-server')
|
||||||
xkbcommon = dependency('xkbcommon')
|
xkbcommon = dependency('xkbcommon')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue