diff --git a/Cargo.lock b/Cargo.lock index 52c20767..4688e9c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -848,7 +848,6 @@ dependencies = [ "id_tree", "indexmap 2.13.0", "keyframe", - "libc", "libcosmic", "libdisplay-info", "libsystemd", @@ -864,7 +863,6 @@ dependencies = [ "rust-embed", "rustix 1.1.4", "sanitize-filename", - "sendfd", "serde", "serde_json", "smithay", @@ -4732,15 +4730,6 @@ version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -[[package]] -name = "sendfd" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b183bfd5b1bc64ab0c1ef3ee06b008a9ef1b68a7d3a99ba566fbfe7a7c6d745b" -dependencies = [ - "libc", -] - [[package]] name = "serde" version = "1.0.228" diff --git a/Cargo.toml b/Cargo.toml index 8b9d222e..3b1dab56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,8 +42,7 @@ i18n-embed-fl = "0.10" iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic" } indexmap = "2.13" keyframe = "1.1.1" -libc = "0.2.182" -libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false } +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false } libsystemd = { version = "0.7", optional = true } log-panics = { version = "2", features = ["with-backtrace"] } ordered-float = "5.1" @@ -52,7 +51,6 @@ regex = "1" ron = "0.12" rust-embed = { version = "8.11", features = ["debug-embed"] } sanitize-filename = "0.6.0" -sendfd = "0.4.4" serde = { version = "1", features = ["derive"] } serde_json = "1" thiserror = "2.0.18" diff --git a/src/backend/kms/device.rs b/src/backend/kms/device.rs index 3c8665c7..9dd310de 100644 --- a/src/backend/kms/device.rs +++ b/src/backend/kms/device.rs @@ -13,7 +13,6 @@ use crate::{ use anyhow::{Context, Result}; use cosmic_comp_config::output::comp::{AdaptiveSync, OutputConfig, OutputState}; -use libc::dev_t; use smithay::{ backend::{ allocator::{ @@ -37,7 +36,7 @@ use smithay::{ calloop::{LoopHandle, RegistrationToken}, drm::control::{Device as ControlDevice, ModeTypeFlags, connector, crtc}, gbm::BufferObjectFlags as GbmBufferFlags, - rustix::fs::OFlags, + rustix::fs::{Dev, OFlags}, wayland_server::DisplayHandle, }, utils::{Clock, DevPath, DeviceFd, Monotonic, Point, Transform}, @@ -175,7 +174,7 @@ pub fn init_egl(gbm: &GbmDevice) -> Result { impl State { pub fn device_added( &mut self, - dev: dev_t, + dev: Dev, path: &Path, dh: &DisplayHandle, ) -> Result> { @@ -399,7 +398,7 @@ impl State { Ok(wl_outputs) } - pub fn device_changed(&mut self, dev: dev_t) -> Result> { + pub fn device_changed(&mut self, dev: Dev) -> Result> { if !self.backend.kms().session.is_active() { return Ok(Vec::new()); } @@ -490,7 +489,7 @@ impl State { Ok(outputs_added) } - pub fn device_removed(&mut self, dev: dev_t, dh: &DisplayHandle) -> Result<()> { + pub fn device_removed(&mut self, dev: Dev, dh: &DisplayHandle) -> Result<()> { let backend = self.backend.kms(); // we can't use DrmNode::from_node_id, because that assumes the node is still on sysfs let drm_node = backend