Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update drm, gbm, udev; remove node module that is now in drm-rs #1549

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ cursor-icon = "1.0.0"
cgmath = "0.18.0"
downcast-rs = "1.2.0"
drm-fourcc = "^2.2.0"
drm = { version = "0.12.0", optional = true }
drm-ffi = { version = "0.8.0", optional = true }
drm = { version = "0.14.0", optional = true }
drm-ffi = { version = "0.9.0", optional = true }
errno = "0.3.5"
gbm = { version = "0.15.0", optional = true, default-features = false, features = ["drm-support"] }
gbm = { version = "0.16.0", optional = true, default-features = false, features = ["drm-support"] }
glow = { version = "0.14", optional = true }
input = { version = "0.9.0", default-features = false, features=["libinput_1_19"], optional = true }
indexmap = "2.0"
Expand All @@ -50,7 +50,7 @@ scopeguard = { version = "1.1.0", optional = true }
tracing = "0.1.37"
tempfile = { version = "3.0", optional = true }
thiserror = "1.0.25"
udev = { version = "0.8.0", optional = true }
udev = { version = "0.9.0", optional = true }
# Require never `wayland-client`/`wayland-cursor` than winit uses to fix `-Z minimal-versions`
# due to issue in older version.
wayland-client = { version = "0.31.3", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion smithay-drm-extras/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["Bartłomiej Maryńczak <[email protected]>"]

[dependencies]
libdisplay-info = { version = "0.1.0", optional = true }
drm = { version = "0.12.0" }
drm = { version = "0.14.0" }

[features]
default = ["display-info"]
Expand Down
3 changes: 1 addition & 2 deletions src/backend/drm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ pub mod dumb;
mod error;
#[cfg(feature = "backend_gbm")]
pub mod gbm;
pub mod node;

mod surface;

Expand All @@ -89,11 +88,11 @@ pub use device::{
DrmDevice, DrmDeviceFd, DrmDeviceNotifier, DrmEvent, EventMetadata as DrmEventMetadata, PlaneClaim,
Time as DrmEventTime,
};
pub use drm::node::{CreateDrmNodeError, DrmNode, NodeType};
use drm_fourcc::{DrmFormat, DrmFourcc, DrmModifier};
pub use error::AccessError as DrmAccessError;
pub use error::Error as DrmError;
use indexmap::IndexSet;
pub use node::{CreateDrmNodeError, DrmNode, NodeType};
#[cfg(feature = "backend_gbm")]
pub use surface::gbm::{Error as GbmBufferedSurfaceError, GbmBufferedSurface};
pub use surface::{DrmSurface, PlaneConfig, PlaneDamageClips, PlaneState};
Expand Down
39 changes: 0 additions & 39 deletions src/backend/drm/node/constants.rs

This file was deleted.

Loading
Loading