diff options
| author | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-01-28 21:22:50 +0100 |
| commit | 1ee61dbd0f6ab8cf9dfafb085707bd67cca50e70 (patch) | |
| tree | 502ff5ebd47df13e8bb432d379cab44532c54deb /backend | |
| parent | 692d33bf8b752cc3b8a0b7f2b29c2b49dd4f718b (diff) | |
| parent | f0b3a71fbc72eeccf44bc6a6f6c39a80af918463 (diff) | |
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/backend.c | 1 | ||||
| -rw-r--r-- | backend/drm/drm.c | 2 | ||||
| -rw-r--r-- | backend/meson.build | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 112b2b61..c0e49f18 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -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); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index b9aae948..024bc929 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -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, diff --git a/backend/meson.build b/backend/meson.build index 9931f546..9c8f5852 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -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 |