From f966e28fe5ebe6f6614048593ac663a89888b978 Mon Sep 17 00:00:00 2001 From: Sergey Smirnykh Date: Sun, 12 Apr 2020 18:11:10 +0700 Subject: [PATCH] Update wayland-client & wayland-egl (#181) Update wayland-client to 0.25.0 Add wayland-egl 0.25.0 --- Cargo.toml | 5 +++-- src/backend/egl/native.rs | 2 +- src/backend/winit.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index aecac36..ac4e80e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,8 @@ tempfile = "3.0" slog = "2.1.1" slog-stdlog = "3.0.2" libloading = "0.5.0" -wayland-client = { version = "0.23.4", features = ["egl"], optional = true } +wayland-client = { version = "0.23.4", optional = true } +wayland-egl = { version = "0.25.0", optional = true } winit = { version = "0.22.0", optional = true } drm = { version = "^0.4.0", git = "https://github.com/drakulix/drm-rs", branch = "develop", optional = true } gbm = { version = "^0.6.0", git = "https://github.com/drakulix/gbm.rs", branch = "develop", optional = true, default-features = false, features = ["drm-support"] } @@ -45,7 +46,7 @@ gl_generator = { version = "0.10", optional = true } [features] default = ["backend_winit", "backend_drm_legacy", "backend_drm_gbm", "backend_drm_egl", "backend_libinput", "backend_udev", "backend_session_logind", "renderer_glium", "xwayland", "wayland_frontend"] -backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen", "backend_egl", "renderer_gl", "use_system_lib"] +backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen", "wayland-egl", "backend_egl", "renderer_gl", "use_system_lib"] backend_drm = ["drm", "failure"] backend_drm_legacy = ["backend_drm"] backend_drm_gbm = ["backend_drm", "gbm", "image"] diff --git a/src/backend/egl/native.rs b/src/backend/egl/native.rs index 2d54139..17417c8 100644 --- a/src/backend/egl/native.rs +++ b/src/backend/egl/native.rs @@ -7,7 +7,7 @@ use crate::backend::graphics::SwapBuffersError; use std::ptr; #[cfg(feature = "backend_winit")] -use wayland_client::egl as wegl; +use wayland_egl as wegl; #[cfg(feature = "backend_winit")] use winit::platform::unix::WindowExtUnix; #[cfg(feature = "backend_winit")] diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 9a9751d..a0eb0ee 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -20,7 +20,7 @@ use std::{ rc::Rc, time::Instant, }; -use wayland_client::egl as wegl; +use wayland_egl as wegl; use wayland_server::Display; use winit::{ dpi::{LogicalPosition, LogicalSize, PhysicalSize},