From cbe0cf891c7eb277e547f754bae5e632a4c462ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 2 Nov 2021 17:02:50 +0400 Subject: [PATCH] qemu-rdw: use the shared library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- qemu-rdw/Cargo.toml | 2 +- qemu-rdw/src/display.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-rdw/Cargo.toml b/qemu-rdw/Cargo.toml index cb07085..1e0231d 100644 --- a/qemu-rdw/Cargo.toml +++ b/qemu-rdw/Cargo.toml @@ -13,7 +13,7 @@ once_cell = "1.5" zbus = { version = "2.0.0-beta.7" } qemu-display = { path = "../qemu-display" } keycodemap = { path = "../keycodemap" } -rdw = { package = "rdw4", version = "0.1.0" } +rdw = { package = "rdw4", version = "0.1.0", features = ["bindings"] } futures-util = "0.3.13" futures = "0.3.13" async-trait = "0.1.48" diff --git a/qemu-rdw/src/display.rs b/qemu-rdw/src/display.rs index 86cebe0..9c1b3a4 100644 --- a/qemu-rdw/src/display.rs +++ b/qemu-rdw/src/display.rs @@ -13,7 +13,7 @@ mod imp { #[repr(C)] pub struct RdwDisplayQemuClass { - pub parent_class: rdw::imp::RdwDisplayClass, + pub parent_class: rdw::RdwDisplayClass, } unsafe impl ClassStruct for RdwDisplayQemuClass { @@ -22,7 +22,7 @@ mod imp { #[repr(C)] pub struct RdwDisplayQemu { - parent: rdw::imp::RdwDisplay, + parent: rdw::RdwDisplay, } impl std::fmt::Debug for RdwDisplayQemu { @@ -160,7 +160,7 @@ mod imp { } ScanoutDMABUF(s) => { widget.set_display_size(Some((s.width as _, s.height as _))); - widget.set_dmabuf_scanout(rdw::DmabufScanout { + widget.set_dmabuf_scanout(rdw::RdwDmabufScanout { width: s.width, height: s.height, stride: s.stride,