diff --git a/Cargo.lock b/Cargo.lock index 2f79f22e1..c088c3ab6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,6 +68,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blitstr" version = "0.3.0" +source = "git+https://github.com/betrusted-io/blitstr.git?rev=69f7c04b9f44a20571c4792c8fc9166f5d6b548d#69f7c04b9f44a20571c4792c8fc9166f5d6b548d" [[package]] name = "bstr" @@ -799,7 +800,7 @@ version = "0.1.0" dependencies = [ "bitflags", "blitstr", - "com", + "com_rs", "graphics-server", "log", "log-server", diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml index ad9342449..6ae2726b8 100644 --- a/services/graphics-server/Cargo.toml +++ b/services/graphics-server/Cargo.toml @@ -9,8 +9,8 @@ description = "Manage the video output" xous = { path = "../../xous-rs" } log-server = { path = "../log-server" } log = "0.4" -# blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "69f7c04b9f44a20571c4792c8fc9166f5d6b548d" } -blitstr = { path = "../../../blitstr" } +blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "69f7c04b9f44a20571c4792c8fc9166f5d6b548d" } +# blitstr = { path = "../../../blitstr" } [target.'cfg(not(any(windows,unix)))'.dependencies] utralib = { path = "../../utralib"} diff --git a/services/shell/Cargo.toml b/services/shell/Cargo.toml index aa1b61217..29dbfd485 100644 --- a/services/shell/Cargo.toml +++ b/services/shell/Cargo.toml @@ -12,10 +12,12 @@ graphics-server = { path = "../graphics-server" } ticktimer-server = { path = "../ticktimer-server" } log-server = { path = "../log-server" } log = "0.4" -com = { path = "../com"} -# blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "69f7c04b9f44a20571c4792c8fc9166f5d6b548d" } -blitstr = { path = "../../../blitstr" } -# com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "9a91a81f482ea8eba2f2de5d6c20b9bd399f39a9" } + +# com = { path = "../com"} +# blitstr = { path = "../../../blitstr" } + +com_rs = { git = "https://github.com/betrusted-io/com_rs.git", rev = "9a91a81f482ea8eba2f2de5d6c20b9bd399f39a9" } +blitstr = { git = "https://github.com/betrusted-io/blitstr.git", rev = "69f7c04b9f44a20571c4792c8fc9166f5d6b548d" } [target.'cfg(not(any(windows,unix)))'.dependencies]