diff --git a/Cargo.toml b/Cargo.toml index e8d7c335f..ea4ff6a09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,10 +20,9 @@ rustdoc-args = ["--cfg", "docsrs"] bitflags = "2.4" bytemuck = { version = "1.13.0", optional = true } cursor-icon = "1.2.0" -libc = "0.2.148" log = "0.4" memmap2 = "0.9.0" -rustix = { version = "1.0.7", features = ["fs", "pipe", "shm"] } +rustix = { version = "1.1.4", features = ["fs", "pipe", "shm"] } thiserror = "2.0.12" wayland-backend = "0.3.0" wayland-client = "0.31.1" diff --git a/src/dmabuf.rs b/src/dmabuf.rs index 6661e8a4a..f7d8a2ecf 100644 --- a/src/dmabuf.rs +++ b/src/dmabuf.rs @@ -1,5 +1,6 @@ use crate::{error::GlobalError, globals::GlobalData, registry::GlobalProxy}; use memmap2::{Mmap, MmapOptions}; +use rustix::fs::Dev as dev_t; use std::{fmt, mem, os::unix::io::BorrowedFd, slice, sync::Mutex}; use wayland_client::{ globals::GlobalList, @@ -12,12 +13,6 @@ use wayland_protocols::wp::linux_dmabuf::zv1::client::{ zwp_linux_dmabuf_v1, }; -// Workaround until `libc` updates to FreeBSD 12 ABI -#[cfg(target_os = "freebsd")] -type dev_t = u64; -#[cfg(not(target_os = "freebsd"))] -use libc::dev_t; - /// A preference tranche of dmabuf formats #[derive(Clone, Debug)] pub struct DmabufFeedbackTranche {