vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to released udev/libinput versions

This commit is contained in:
Drakulix 2017-12-06 02:06:00 +01:00
parent 71f107118f
commit 40ef1236ea
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -19,8 +19,8 @@ winit = { version = "0.8.2", optional = true }
drm = { version = "^0.3.0", optional = true }
gbm = { version = "^0.3.0", optional = true, default-features = false, features = ["drm-support"] }
glium = { version = "0.17.1", optional = true, default-features = false }
input = { version = "0.4.0", git = "https://github.com/Smithay/input.rs.git", branch = "feature/udev", optional = true }
libudev = { git = "https://github.com/Drakulix/libudev-rs.git", branch = "feature/raw_ffi_access", optional = true }
input = { version = "0.4.0", optional = true }
udev = { version = "0.2.0", optional = true }
rental = "0.4.11"
wayland-protocols = { version = "0.12.0", features = ["unstable_protocols", "server"] }
image = "0.17.0"
@ -43,9 +43,9 @@ backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen"]
backend_drm = ["drm", "gbm"]
backend_libinput = ["input"]
backend_session = []
backend_session_udev = ["libudev", "backend_session"]
backend_session_udev = ["udev", "backend_session"]
backend_session_logind = ["backend_session", "dbus", "systemd"]
backend_udev = ["libudev", "backend_drm", "backend_session_udev"]
backend_udev = ["udev", "backend_drm", "backend_session_udev"]
renderer_glium = ["glium"]
[patch.crates-io]

2
src/backend/session/direct.rs
View File

@ -61,7 +61,7 @@ use wayland_server::EventLoopHandle;
use wayland_server::sources::SignalEventSource;
#[cfg(feature = "backend_session_udev")]
use libudev::Context;
use udev::Context;
use super::{AsErrno, Session, SessionNotifier, SessionObserver};

2
src/backend/udev.rs
View File

@ -9,7 +9,7 @@
//! See also `examples/udev.rs` for pure hardware backed example of a compositor utilizing this
//! backend.
use libudev::{Context, MonitorBuilder, MonitorSocket, Event, EventType, Enumerator, Result as UdevResult};
use udev::{Context, MonitorBuilder, MonitorSocket, Event, EventType, Enumerator, Result as UdevResult};
use nix::fcntl;
use nix::sys::stat::{dev_t, fstat};
use std::borrow::Borrow;

2
src/lib.rs
View File

@ -24,7 +24,7 @@ extern crate gbm;
#[cfg(feature = "backend_libinput")]
extern crate input;
#[cfg(feature = "backend_udev")]
extern crate libudev;
extern crate udev;
/*
#[cfg(feature = "backend_session_logind")]
extern crate dbus;