Remove no longer necessary patches

New versions of drm and drm-sys have been released with Redox OS support.

Cargo.lock

@@ -613,7 +613,8 @@ dependencies = [
 [[package]]
 name = "drm"
 version = "0.14.2"
-source = "git+https://github.com/Smithay/drm-rs.git#71b0b9c7c9ae249e7302e4ba75c9aff93ec6567e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b71449a23fe79542d6527ca572844b2016abf9573c49e43144d546b1735aec"
 dependencies = [
  "bitflags 2.11.0",
  "bytemuck",
@@ -626,8 +627,9 @@ dependencies = [
 
 [[package]]
 name = "drm-ffi"
-version = "0.9.0"
-source = "git+https://github.com/Smithay/drm-rs.git#71b0b9c7c9ae249e7302e4ba75c9aff93ec6567e"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51a91c9b32ac4e8105dec255e849e0d66e27d7c34d184364fb93e469db08f690"
 dependencies = [
  "drm-sys",
  "rustix",
@@ -641,8 +643,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.8.0"
-source = "git+https://github.com/Smithay/drm-rs.git#71b0b9c7c9ae249e7302e4ba75c9aff93ec6567e"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8e1361066d91f5ffccff060a3c3be9c3ecde15be2959c1937595f7a82a9f8"
 dependencies = [
  "libc",
  "linux-raw-sys 0.9.4",
@@ -1233,9 +1236,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "lived"
@@ -1975,13 +1978,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "1.1.3"
-source = "git+https://github.com/bytecodealliance/rustix.git#8bf15a0eb444087e4c3ed04e01ed488cc429af2d"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
  "bitflags 2.11.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys 0.12.1",
  "windows-sys",
 ]
 

Cargo.toml

@@ -74,6 +74,8 @@ exclude = ["bootstrap"]
 # Remember to also update bootstrap dependencies, those are not in the workspace
 [workspace.dependencies]
 anyhow = "1"
+drm = "0.14.2"
+drm-sys = "0.8.1"
 libc = "0.2.181"
 log = "0.4"
 libredox = "0.1.14"
@@ -91,13 +93,5 @@ toml = "1"
 [workspace.lints.clippy]
 precedence = "deny"
 
-[patch.crates-io]
-# Rustix doesn't support ioctls on Redox OS
-drm = { git = "https://github.com/Smithay/drm-rs.git" }
-drm-sys = { git = "https://github.com/Smithay/drm-rs.git" }
-# Use crates.io version after next release
-rustix = { git = "https://github.com/bytecodealliance/rustix.git" }
-
 [patch."https://gitlab.redox-os.org/redox-os/relibc.git"]
-#redox-rt = { path = "../../relibc/source/redox-rt" }
 #redox-ioctl = { path = "../../relibc/source/redox-ioctl" }

drivers/graphics/console-draw/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm = "0.14"
+drm.workspace = true
 orbclient.workspace = true
 ransid = "0.4"
 

drivers/graphics/driver-graphics/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm-sys = "0.8.0"
+drm-sys.workspace = true
 log.workspace = true
 redox-scheme.workspace = true
 redox_syscall.workspace = true

drivers/graphics/fbbootlogd/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm = "0.14.1"
+drm.workspace = true
 orbclient.workspace = true
 ransid = "0.4"
 redox_event.workspace = true

drivers/graphics/fbcond/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm = "0.14.1"
+drm.workspace = true
 log.workspace = true
 orbclient.workspace = true
 ransid = "0.4"

drivers/graphics/graphics-ipc/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm = "0.14"
+drm.workspace = true
 log.workspace = true
 libredox.workspace = true
 redox-ioctl.workspace = true

drivers/graphics/ihdgd/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 bitbang-hal = "0.3"
-drm-sys = "0.8.0"
+drm-sys.workspace = true
 #TODO: edid is abandoned, fork it an maintain?
 edid = "0.3.0"
 #TODO: waiting for bitbang-hal to update to embedded-hal 1.0

drivers/graphics/vesad/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-drm-sys = "0.8.0"
+drm-sys.workspace = true
 orbclient.workspace = true
 ransid = "0.4"
 redox_syscall.workspace = true

drivers/graphics/virtio-gpud/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["Anhad Singh <andypython@protonmail.com>"]
 
 [dependencies]
-drm-sys = "0.8.0"
+drm-sys.workspace = true
 #TODO: edid is abandoned, fork it an maintain?
 edid = "0.3.0"
 log.workspace = true