Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: require wlroots version 0.17.2

Browse Source 
This fixes a crash that users have hit fairly often in the wild using
Xwayland and allows us to remove an ugly workaround for another issue.
This commit is contained in:
Isaac Freund 2024-03-11 19:14:37 +01:00
parent 49a779b24d
commit c474be1537
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
river/Root.zig
View File

@ -786,17 +786,6 @@ fn processOutputConfig(
var proposed_state = wlr.Output.State.init(); var proposed_state = wlr.Output.State.init();
head.state.apply(&proposed_state); head.state.apply(&proposed_state);
// Work around a division by zero in the wlroots drm backend.
// See https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3791
// TODO(wlroots) remove this workaround after 0.17.2 is out.
if (output.wlr_output.isDrm() and
proposed_state.committed.mode and
proposed_state.mode_type == .custom and
proposed_state.custom_mode.refresh == 0)
{
proposed_state.custom_mode.refresh = 60000;
}
switch (action) { switch (action) {
.test_only => { .test_only => {
if (!wlr_output.testState(&proposed_state)) success = false; if (!wlr_output.testState(&proposed_state)) success = false;

4
river/main.zig
View File

@ -31,8 +31,8 @@ const util = @import("util.zig");
const Server = @import("Server.zig"); const Server = @import("Server.zig");
comptime { comptime {
if (wlr.version.major != 0 or wlr.version.minor != 17 or wlr.version.micro < 1) { if (wlr.version.major != 0 or wlr.version.minor != 17 or wlr.version.micro < 2) {
@compileError("river requires at least wlroots version 0.17.1 due to bugs in wlroots 0.17.0"); @compileError("river requires at least wlroots version 0.17.2 due to bugs in wlroots 0.17.0/0.17.1");
} }
} }