diff --git a/Cargo.lock b/Cargo.lock index 1477a9e..02785c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,17 +154,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "async-broadcast" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b" -dependencies = [ - "easy-parallel", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-broadcast" version = "0.7.0" @@ -1039,12 +1028,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "easy-parallel" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afbb9b0aef60e4f0d2b18129b6c0dff035a6f7dbbd17c2f38c1432102ee223c" - [[package]] name = "ecdsa" version = "0.16.9" @@ -3043,6 +3026,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pixman-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada" + [[package]] name = "pkcs1" version = "0.7.5" @@ -3250,8 +3239,8 @@ dependencies = [ name = "qemu-display" version = "0.1.0" dependencies = [ - "async-broadcast 0.3.4", - "async-lock 2.8.0", + "async-broadcast", + "async-lock 3.3.0", "async-std", "async-trait", "base64 0.13.1", @@ -3261,12 +3250,14 @@ dependencies = [ "futures", "futures-util", "libc", - "log 0.4.21", "once_cell", + "pixman-sys", "qapi", + "rand", "serde", "serde_bytes", "serde_repr", + "tracing", "tracing-subscriber", "uds_windows", "usbredirhost", @@ -5118,7 +5109,7 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ - "async-broadcast 0.7.0", + "async-broadcast", "async-executor", "async-fs", "async-io 2.3.2", diff --git a/Cargo.toml b/Cargo.toml index 8d81401..9c6ee2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,9 +12,11 @@ default-members = ["qemu-rdw"] resolver = "2" [workspace.dependencies] +tracing = "0.1" +zbus = { version = "4", features = ["p2p"] } +pixman-sys = "0.1" qemu-display = { path = "qemu-display", version = "0.1" } keycodemap = { path = "keycodemap", version = "0.1" } -zbus = { version = "4", features = ["p2p"] } [patch.crates-io] vnc = { git = "https://github.com/elmarco/rust-vnc", branch = "server" } diff --git a/qemu-display/Cargo.toml b/qemu-display/Cargo.toml index 02ea519..78fac62 100644 --- a/qemu-display/Cargo.toml +++ b/qemu-display/Cargo.toml @@ -10,10 +10,10 @@ edition = "2018" qmp = ["dep:qapi", "dep:base64"] [dependencies] -cfg-if = "1.0" -log = "0.4" -derivative = "2.2.0" +tracing.workspace = true zbus.workspace = true +cfg-if = "1.0" +derivative = "2.2.0" zvariant = { version = "4", features = ["serde_bytes"] } libc = "0.2.86" enumflags2 = { version = "0.7", features = ["serde"] } @@ -24,9 +24,9 @@ futures-util = { version = "0.3.8", features = ["async-await-macro"] } once_cell = "1.5" futures = "0.3.13" usbredirhost = "0.0.1" -async-broadcast = "0.3.3" -async-trait = "0.1.48" -async-lock = "2.3.0" +async-broadcast = "0.7" +async-trait = "0.1.77" +async-lock = "3.3.0" qapi = { version = "0.9.0", features = ["qmp"], optional = true } base64 = { version = "0.13", optional = true } @@ -38,6 +38,12 @@ windows = { version = "0.43.0", features = ["Win32_Networking_WinSock", "Win32_F async-std = { version = "1.12.0", features = ["attributes"] } tracing-subscriber = { version = "0.3.11", features = ["env-filter" , "fmt"], default-features = false } +[dev-dependencies] +pixman-sys.workspace = true +async-std = { version = "1.12", features = ["attributes"] } +tracing-subscriber = "0.3" +rand = "0.8" + [[example]] name = 'win32-test' required-features = ["qmp"]