From 991eba216dede736b8c23abe5575b0787d161658 Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Mon, 22 Feb 2021 20:27:46 +0100
Subject: [PATCH] Update most dependencies

---
 Cargo.toml             | 10 +++++-----
 anvil/Cargo.toml       |  4 ++--
 src/backend/egl/ffi.rs |  2 +-
 src/backend/winit.rs   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6fe012b..1f79ab2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,24 +16,24 @@ calloop = "0.6.2"
 dbus = { version = "0.9.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 = "thread-safe", optional = true, default-features = false, features = ["drm-support"] }
-glium = { version = "0.28.0", optional = true, default-features = false }
+glium = { version = "0.29.0", optional = true, default-features = false }
 image = { version = "0.23.0", optional = true, default-features = false }
 input = { version = "0.5", default-features = false, optional = true }
 lazy_static = "1"
 libc = "0.2.70"
-libloading = "0.6.0"
-nix = "0.19"
+libloading = "0.7.0"
+nix = "0.20"
 slog = "2"
 slog-stdlog = { version = "4", optional = true }
 tempfile = { version = "3.0", optional = true }
 thiserror = "1"
-udev = { version = "0.5", optional = true }
+udev = { version = "0.6", optional = true }
 wayland-commons = { version = "0.28", optional = true }
 wayland-egl = { version = "0.28", optional = true }
 wayland-protocols = { version = "0.28", features = ["unstable_protocols", "server"], optional = true }
 wayland-server = { version = "0.28.3", optional = true }
 wayland-sys = { version = "0.28", optional = true }
-winit = { version = "0.23.0", optional = true }
+winit = { version = "0.24.0", optional = true }
 xkbcommon = "0.4.0"
 # TODO: remove as soon as drm-rs provides an error implementing Error
 failure = { version = "0.1", optional = true }
diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml
index 99544d5..eea64c4 100644
--- a/anvil/Cargo.toml
+++ b/anvil/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1.2.1"
-glium = { version = "0.28.0", default-features = false }
+glium = { version = "0.29.0", default-features = false }
 input = { version = "0.5.0", features = ["udev"], optional = true }
-rand = "0.7"
+rand = "0.8"
 slog = { version = "2.1.1" }
 slog-term = "2.3"
 slog-async = "2.2"
diff --git a/src/backend/egl/ffi.rs b/src/backend/egl/ffi.rs
index 4d3559e..35e22e7 100644
--- a/src/backend/egl/ffi.rs
+++ b/src/backend/egl/ffi.rs
@@ -49,7 +49,7 @@ pub mod egl {
     use std::sync::Once;
 
     lazy_static! {
-        pub static ref LIB: Library = Library::new("libEGL.so.1").expect("Failed to load LibEGL");
+        pub static ref LIB: Library = unsafe { Library::new("libEGL.so.1") }.expect("Failed to load LibEGL");
     }
 
     pub static LOAD: Once = Once::new();
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index 78048e8..9896cf7 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -28,7 +28,7 @@ use winit::{
         TouchPhase, WindowEvent,
     },
     event_loop::{ControlFlow, EventLoop},
-    platform::desktop::EventLoopExtDesktop,
+    platform::run_return::EventLoopExtRunReturn,
     window::{CursorIcon, Window as WinitWindow, WindowBuilder},
 };
 
@@ -857,7 +857,7 @@ impl From<WinitMouseButton> for MouseButton {
             WinitMouseButton::Left => MouseButton::Left,
             WinitMouseButton::Right => MouseButton::Right,
             WinitMouseButton::Middle => MouseButton::Middle,
-            WinitMouseButton::Other(num) => MouseButton::Other(num),
+            WinitMouseButton::Other(num) => MouseButton::Other(num as u8),
         }
     }
 }