Skip to content

Commit

Permalink
build: require at least wlroots 0.17.1
Browse files Browse the repository at this point in the history
There are enough bugs fixed in 0.17.1 which are relevant to river that I
think it's worthwhile to refuse to compile against 0.17.1.
  • Loading branch information
ifreund committed Jan 2, 2024
1 parent a128a57 commit 3aba3ab
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .builds/alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tasks:
cd ..
cd wlroots
git checkout 0.17.0
git checkout 0.17.1
meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-Dwerror=false -Db_ndebug=false -Dxcb-errors=disabled --prefix /usr
sudo ninja -C build/ install
Expand Down
2 changes: 1 addition & 1 deletion .builds/archlinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tasks:
cd ..
cd wlroots
git checkout 0.17.0
git checkout 0.17.1
meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-Dwerror=false -Db_ndebug=false --prefix /usr
sudo ninja -C build/ install
Expand Down
2 changes: 1 addition & 1 deletion .builds/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tasks:
cd ..
cd wlroots
git checkout 0.17.0
git checkout 0.17.1
meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-Dwerror=false -Db_ndebug=false --prefix /usr
sudo ninja -C build/ install
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ distribution.
- [zig](https://ziglang.org/download/) 0.11
- wayland
- wayland-protocols
- [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.17
- [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.17.1
- xkbcommon
- libevdev
- pixman
Expand Down
6 changes: 6 additions & 0 deletions river/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ const util = @import("util.zig");

const Server = @import("Server.zig");

comptime {
if (wlr.version.major != 0 or wlr.version.minor != 17 or wlr.version.micro < 1) {
@compileError("river requires at least wlroots version 0.17.1 due to bugs in wlroots 0.17.0");
}
}

const usage: []const u8 =
\\usage: river [options]
\\
Expand Down

0 comments on commit 3aba3ab

Please sign in to comment.