backend/session: make optional

Some compositors are not interested in wlr_session, for instance
nested compositors.

Disabling wlr_session removes the udev dependency.
This commit is contained in:
Simon Ser 2022-11-23 16:04:43 +01:00 committed by Simon Zeni
parent 21254737bf
commit f0375eed24
10 changed files with 46 additions and 10 deletions

View File

@ -48,9 +48,9 @@ Install dependencies:
* GBM (optional, for the GBM allocator) * GBM (optional, for the GBM allocator)
* libinput (optional, for the libinput backend) * libinput (optional, for the libinput backend)
* xkbcommon * xkbcommon
* udev * udev (optional, for the session)
* pixman * pixman
* [libseat] * [libseat] (optional, for the session)
* [hwdata] (optional, for the DRM backend) * [hwdata] (optional, for the DRM backend)
If you choose to enable X11 support: If you choose to enable X11 support:

View File

@ -9,7 +9,6 @@
#include <wlr/backend/headless.h> #include <wlr/backend/headless.h>
#include <wlr/backend/interface.h> #include <wlr/backend/interface.h>
#include <wlr/backend/multi.h> #include <wlr/backend/multi.h>
#include <wlr/backend/session.h>
#include <wlr/backend/wayland.h> #include <wlr/backend/wayland.h>
#include <wlr/config.h> #include <wlr/config.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
@ -20,6 +19,10 @@
#include "util/env.h" #include "util/env.h"
#include "util/time.h" #include "util/time.h"
#if WLR_HAS_SESSION
#include <wlr/backend/session.h>
#endif
#if WLR_HAS_DRM_BACKEND #if WLR_HAS_DRM_BACKEND
#include <wlr/backend/drm.h> #include <wlr/backend/drm.h>
#include "backend/drm/monitor.h" #include "backend/drm/monitor.h"
@ -67,6 +70,7 @@ void wlr_backend_destroy(struct wlr_backend *backend) {
} }
} }
#if WLR_HAS_SESSION
static struct wlr_session *session_create_and_wait(struct wl_display *disp) { static struct wlr_session *session_create_and_wait(struct wl_display *disp) {
struct wlr_session *session = wlr_session_create(disp); struct wlr_session *session = wlr_session_create(disp);
@ -106,6 +110,7 @@ static struct wlr_session *session_create_and_wait(struct wl_display *disp) {
return session; return session;
} }
#endif
clockid_t wlr_backend_get_presentation_clock(struct wlr_backend *backend) { clockid_t wlr_backend_get_presentation_clock(struct wlr_backend *backend) {
if (backend->impl->get_presentation_clock) { if (backend->impl->get_presentation_clock) {
@ -247,7 +252,9 @@ static bool attempt_backend_by_name(struct wl_display *display,
} else if (strcmp(name, "drm") == 0 || strcmp(name, "libinput") == 0) { } else if (strcmp(name, "drm") == 0 || strcmp(name, "libinput") == 0) {
// DRM and libinput need a session // DRM and libinput need a session
if (*session_ptr == NULL) { if (*session_ptr == NULL) {
#if WLR_HAS_SESSION
*session_ptr = session_create_and_wait(display); *session_ptr = session_create_and_wait(display);
#endif
if (*session_ptr == NULL) { if (*session_ptr == NULL) {
wlr_log(WLR_ERROR, "failed to start a session"); wlr_log(WLR_ERROR, "failed to start a session");
return false; return false;
@ -343,7 +350,9 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
#endif #endif
// Attempt DRM+libinput // Attempt DRM+libinput
#if WLR_HAS_SESSION
session = session_create_and_wait(display); session = session_create_and_wait(display);
#endif
if (!session) { if (!session) {
wlr_log(WLR_ERROR, "Failed to start a DRM session"); wlr_log(WLR_ERROR, "Failed to start a DRM session");
goto error; goto error;
@ -388,6 +397,8 @@ success:
error: error:
wlr_backend_destroy(multi); wlr_backend_destroy(multi);
#if WLR_HAS_SESSION
wlr_session_destroy(session); wlr_session_destroy(session);
#endif
return NULL; return NULL;
} }

View File

@ -1,3 +1,7 @@
if not features['session']
subdir_done()
endif
hwdata = dependency('hwdata', required: false, native: true) hwdata = dependency('hwdata', required: false, native: true)
if hwdata.found() if hwdata.found()
hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')

View File

@ -10,7 +10,7 @@ libinput = dependency(
not_found_message: '\n'.join(msg), not_found_message: '\n'.join(msg),
) )
if not libinput.found() if not (libinput.found() and features['session'])
subdir_done() subdir_done()
endif endif

View File

@ -1,6 +1,3 @@
udev = dependency('libudev')
wlr_deps += udev
wlr_files += files('backend.c') wlr_files += files('backend.c')
all_backends = ['drm', 'libinput', 'x11'] all_backends = ['drm', 'libinput', 'x11']
@ -11,6 +8,16 @@ elif 'auto' in backends and get_option('auto_features').disabled()
backends = [] backends = []
endif endif
session_required = 'drm' in backends or 'libinput' in backends or get_option('session').enabled()
if get_option('session').disabled()
if session_required
error('Session support is required for the DRM or libinput backends')
endif
session_required = disabler()
endif
subdir('session')
foreach backend : all_backends foreach backend : all_backends
if backend in backends or 'auto' in backends if backend in backends or 'auto' in backends
subdir(backend) subdir(backend)
@ -20,5 +27,3 @@ endforeach
subdir('multi') subdir('multi')
subdir('wayland') subdir('wayland')
subdir('headless') subdir('headless')
subdir('session')

View File

@ -1,8 +1,17 @@
msg = 'Required for session support.'
udev = dependency('libudev', required: session_required, not_found_message: msg)
libseat = dependency( libseat = dependency(
'libseat', 'libseat',
version: '>=0.2.0', version: '>=0.2.0',
fallback: 'seatd', fallback: 'seatd',
default_options: ['server=disabled', 'man-pages=disabled', 'examples=disabled'], default_options: ['server=disabled', 'man-pages=disabled', 'examples=disabled'],
required: session_required,
not_found_message: msg,
) )
if not (udev.found() and libseat.found())
subdir_done()
endif
wlr_files += files('session.c') wlr_files += files('session.c')
wlr_deps += libseat wlr_deps += [udev, libseat]
features += { 'session': true }

View File

@ -21,6 +21,9 @@ endif
if not features.get('vulkan-renderer') if not features.get('vulkan-renderer')
exclude_files += 'render/vulkan.h' exclude_files += 'render/vulkan.h'
endif endif
if not features.get('session')
exclude_files += 'backend/session.h'
endif
install_subdir('wlr', install_subdir('wlr',
install_dir: get_option('includedir'), install_dir: get_option('includedir'),

View File

@ -12,4 +12,6 @@
#mesondefine WLR_HAS_XWAYLAND #mesondefine WLR_HAS_XWAYLAND
#mesondefine WLR_HAS_SESSION
#endif #endif

View File

@ -93,6 +93,7 @@ features = {
'gles2-renderer': false, 'gles2-renderer': false,
'vulkan-renderer': false, 'vulkan-renderer': false,
'gbm-allocator': false, 'gbm-allocator': false,
'session': false,
} }
internal_features = { internal_features = {
'xcb-errors': false, 'xcb-errors': false,

View File

@ -6,3 +6,4 @@ option('renderers', type: 'array', choices: ['auto', 'gles2', 'vulkan'], value:
option('backends', type: 'array', choices: ['auto', 'drm', 'libinput', 'x11'], value: ['auto'], description: 'Select built-in backends') option('backends', type: 'array', choices: ['auto', 'drm', 'libinput', 'x11'], value: ['auto'], description: 'Select built-in backends')
option('allocators', type: 'array', choices: ['auto', 'gbm'], value: ['auto'], option('allocators', type: 'array', choices: ['auto', 'gbm'], value: ['auto'],
description: 'Select built-in allocators') description: 'Select built-in allocators')
option('session', type: 'feature', value: 'auto', description: 'Enable session support')