From f24e5793b7f695148d95652e455c9930c0b918bd Mon Sep 17 00:00:00 2001 From: Sergey Smirnykh Date: Sun, 12 Apr 2020 12:09:06 +0700 Subject: [PATCH 1/2] Add `backend_libinput_udev` feature to Smithay This feature enables backend_libinput, backend_udev and input/udev features. Use `backend_libinput_udev` feature in Anvil to fix build --- Cargo.toml | 3 ++- anvil/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0ac221dbe0f7..fe095a36d964 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,13 +44,14 @@ slog-term = "2.3" gl_generator = { version = "0.10", optional = true } [features] -default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] +default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen", "backend_egl", "renderer_gl", "use_system_lib"] backend_drm = ["drm", "failure"] backend_drm_legacy = ["backend_drm"] backend_drm_gbm = ["backend_drm", "gbm", "image"] backend_drm_egl = ["backend_drm", "backend_egl"] backend_egl = ["gl_generator"] +backend_libinput_udev = ["backend_libinput", "backend_udev", "input/udev"] backend_libinput = ["input"] backend_session = [] backend_udev = ["udev"] diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml index a90fed6a5712..2abb38d4d6f5 100644 --- a/anvil/Cargo.toml +++ b/anvil/Cargo.toml @@ -28,5 +28,5 @@ gl_generator = "0.10" default = [ "winit", "egl", "udev", "logind" ] egl = [ "smithay/use_system_lib" ] winit = [ "smithay/backend_winit" ] -udev = [ "smithay/backend_libinput", "smithay/backend_drm_legacy", "smithay/backend_drm_gbm", "smithay/backend_drm_egl", "smithay/backend_udev", "smithay/backend_session" ] +udev = [ "smithay/backend_libinput_udev", "smithay/backend_drm_legacy", "smithay/backend_drm_gbm", "smithay/backend_drm_egl", "smithay/backend_session" ] logind = [ "smithay/backend_session_logind" ] From 71048591196914682b356d61ce093d1bc2a0863a Mon Sep 17 00:00:00 2001 From: Sergey Smirnykh Date: Mon, 13 Apr 2020 20:40:43 +0700 Subject: [PATCH 2/2] Revert previous commit Add input 0.5.0 dependency to Anvil Enable input/udev feature For info see #179 --- Cargo.toml | 3 +-- anvil/Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fe095a36d964..0ac221dbe0f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,14 +44,13 @@ slog-term = "2.3" gl_generator = { version = "0.10", optional = true } [features] -default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] +default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen", "backend_egl", "renderer_gl", "use_system_lib"] backend_drm = ["drm", "failure"] backend_drm_legacy = ["backend_drm"] backend_drm_gbm = ["backend_drm", "gbm", "image"] backend_drm_egl = ["backend_drm", "backend_egl"] backend_egl = ["gl_generator"] -backend_libinput_udev = ["backend_libinput", "backend_udev", "input/udev"] backend_libinput = ["input"] backend_session = [] backend_udev = ["udev"] diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml index 2abb38d4d6f5..3dd14c2fca00 100644 --- a/anvil/Cargo.toml +++ b/anvil/Cargo.toml @@ -15,6 +15,7 @@ glium = { version = "0.23.0", default-features = false } wayland-server = "0.25.0" xkbcommon = "0.4.0" bitflags = "1.2.1" +input = { version = "0.5.0", features = ["udev"] } [dependencies.smithay] path = ".." @@ -28,5 +29,5 @@ gl_generator = "0.10" default = [ "winit", "egl", "udev", "logind" ] egl = [ "smithay/use_system_lib" ] winit = [ "smithay/backend_winit" ] -udev = [ "smithay/backend_libinput_udev", "smithay/backend_drm_legacy", "smithay/backend_drm_gbm", "smithay/backend_drm_egl", "smithay/backend_session" ] +udev = [ "smithay/backend_libinput", "smithay/backend_udev", "smithay/backend_drm_legacy", "smithay/backend_drm_gbm", "smithay/backend_drm_egl", "smithay/backend_session" ] logind = [ "smithay/backend_session_logind" ]