mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into output-damage

Browse source
This commit is contained in:
emersion 2018-01-28 21:22:50 +01:00
commit 1ee61dbd0f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
11 changed files with 87 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/drm/backend.c
View file

@ -168,6 +168,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
return &drm->backend;
error_event:
wl_list_remove(&drm->session_signal.link);
wl_event_source_remove(drm->drm_event);
error_fd:
wlr_session_close_file(drm->session, drm->fd);

2
backend/drm/drm.c
View file

@ -469,7 +469,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
if (!crtc) {
return false;
}
wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name,
wlr_log(L_DEBUG, "%s: crtc=%td ovr=%td pri=%td cur=%td", conn->output.name,
crtc - drm->crtcs,
crtc->overlay ? crtc->overlay - drm->overlay_planes : -1,
crtc->primary ? crtc->primary - drm->primary_planes : -1,

4
backend/meson.build
View file

@ -33,11 +33,11 @@ else
backend_files += files('session/direct.c')
endif
if systemd.found()
if systemd.found() and get_option('enable_systemd')
backend_files += files('session/logind.c')
endif
if elogind.found()
if elogind.found() and get_option('enable_elogind')
backend_files += files('session/logind.c')
endif