From 71ac7cc86ca8fe08078053465ee923c2437728d2 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 16 Aug 2022 22:11:22 -0400 Subject: [PATCH] fix: dependency --- Cargo.lock | 29 ++++++----------------------- Cargo.toml | 3 ++- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce7895f1..522cfe13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,11 +514,11 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drm" version = "0.6.2" -source = "git+https://github.com/Smithay//drm-rs?branch=fix/non_force_probe_memory#3ce92fd7fd9335144d1174a48851c10fd7845a7b" +source = "git+https://github.com/Smithay//drm-rs?rev=8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0#8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0" dependencies = [ "bitflags", "bytemuck", - "drm-ffi 0.2.1 (git+https://github.com/Smithay//drm-rs?branch=fix/non_force_probe_memory)", + "drm-ffi", "drm-fourcc", "nix 0.24.2", ] @@ -526,18 +526,9 @@ dependencies = [ [[package]] name = "drm-ffi" version = "0.2.1" -source = "git+https://github.com/Smithay//drm-rs?branch=fix/non_force_probe_memory#3ce92fd7fd9335144d1174a48851c10fd7845a7b" +source = "git+https://github.com/Smithay//drm-rs?rev=8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0#8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0" dependencies = [ - "drm-sys 0.1.2 (git+https://github.com/Smithay//drm-rs?branch=fix/non_force_probe_memory)", - "nix 0.24.2", -] - -[[package]] -name = "drm-ffi" -version = "0.2.1" -source = "git+https://github.com/Smithay/drm-rs.git?rev=6d34866#6d348667fee897442672f15ce480676d47ce58aa" -dependencies = [ - "drm-sys 0.1.2 (git+https://github.com/Smithay/drm-rs.git?rev=6d34866)", + "drm-sys", "nix 0.24.2", ] @@ -550,15 +541,7 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" version = "0.1.2" -source = "git+https://github.com/Smithay//drm-rs?branch=fix/non_force_probe_memory#3ce92fd7fd9335144d1174a48851c10fd7845a7b" -dependencies = [ - "libc", -] - -[[package]] -name = "drm-sys" -version = "0.1.2" -source = "git+https://github.com/Smithay/drm-rs.git?rev=6d34866#6d348667fee897442672f15ce480676d47ce58aa" +source = "git+https://github.com/Smithay//drm-rs?rev=8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0#8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0" dependencies = [ "libc", ] @@ -1512,7 +1495,7 @@ dependencies = [ "cgmath", "downcast-rs", "drm", - "drm-ffi 0.2.1 (git+https://github.com/Smithay/drm-rs.git?rev=6d34866)", + "drm-ffi", "drm-fourcc", "gbm", "gl_generator", diff --git a/Cargo.toml b/Cargo.toml index 0e36a4ce..b0b25baa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,4 +65,5 @@ lto = "fat" smithay = { git = "https://github.com/Smithay//smithay", branch = "update/drm-0.7" } [patch."https://github.com/Smithay/drm-rs.git"] -drm = { git = "https://github.com/Smithay//drm-rs", branch = "fix/non_force_probe_memory" } \ No newline at end of file +drm = { git = "https://github.com/Smithay//drm-rs", rev = "8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0" } +drm-ffi = { git = "https://github.com/Smithay//drm-rs", rev = "8b54f45831932fb1f7d6c1b9cb76ff68c342dfd0" } \ No newline at end of file