diff --git a/Cargo.toml b/Cargo.toml index 16b73e6..475fd93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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] diff --git a/src/backend/session/direct.rs b/src/backend/session/direct.rs index 9d0958a..47b9a63 100644 --- a/src/backend/session/direct.rs +++ b/src/backend/session/direct.rs @@ -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}; diff --git a/src/backend/udev.rs b/src/backend/udev.rs index daf8754..23f6eb5 100644 --- a/src/backend/udev.rs +++ b/src/backend/udev.rs @@ -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; diff --git a/src/lib.rs b/src/lib.rs index 0ac797e..074dd9d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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;