Merge branch 'wscons' into 'master'

Draft: Add OpenBSD/wscons support

See merge request wlroots/wlroots!5378
This commit is contained in:
illiliti 2026-06-13 10:25:16 +00:00
commit 90cf273319
24 changed files with 1531 additions and 179 deletions

View file

@ -42,7 +42,7 @@ static int reopen_drm_node(int drm_fd, bool allow_render_node) {
int lease_fd = drmModeCreateLease(drm_fd, NULL, 0, O_CLOEXEC, &lessee_id);
if (lease_fd >= 0) {
return lease_fd;
} else if (lease_fd != -EINVAL && lease_fd != -EOPNOTSUPP) {
} else if (lease_fd != -EINVAL && lease_fd != -EOPNOTSUPP && lease_fd != -ENODEV) {
wlr_log_errno(WLR_ERROR, "drmModeCreateLease failed");
return -1;
}

View file

@ -161,7 +161,7 @@ out:
bool wlr_drm_syncobj_timeline_check(struct wlr_drm_syncobj_timeline *timeline,
uint64_t point, uint32_t flags, bool *result) {
int etime;
#if defined(__FreeBSD__)
#if defined(__FreeBSD__) || defined(__OpenBSD__)
etime = ETIMEDOUT;
#else
etime = ETIME;