From 1a50abdf0209b8766bd66d11c66eb752506f7f67 Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Sun, 18 Aug 2019 18:09:09 +0200 Subject: [PATCH] Update vulkano and shaderc deps to fix Linux build issues This fixes an issue where some Linux distros (Arch, Void, possibly others) are unable to build 0.5.1. 0.6.1 includes the fix, hence the update. Merge pending freesig/shade_runner#21. --- CHANGELOG.md | 1 + Cargo.toml | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7d28c3a..1a9fdd130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased +- Update vulkano and shaderc dependencies to fix linux build issues. - Add an example that demonstrates using the Draw API with multiple windows. - Fix a bug where `Draw::to_frame` would `panic!` when used between multiple windows. diff --git a/Cargo.toml b/Cargo.toml index 29278e4dc..a7a6f1bf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,9 +16,9 @@ default = ["notosans"] [dependencies] approx = "0.1" cgmath = { version = "0.16", features = ["serde"] } -conrod_core = "0.66" -conrod_winit = "0.66" -conrod_vulkano = "0.66" +conrod_core = "0.67" +conrod_winit = "0.67" +conrod_vulkano = "0.67" daggy = "0.6" find_folder = "0.3" image = "0.21" @@ -32,9 +32,9 @@ serde = "1" serde_derive = "1" serde_json = "1" toml = "0.4" -vulkano = "0.13" -vulkano-win = "0.13" -vulkano-shaders = "0.13" +vulkano = "0.14" +vulkano-win = "0.14" +vulkano-shaders = "0.14" walkdir = "2" winit = "0.19" @@ -43,7 +43,8 @@ audrey = "0.2" nannou_audio = "0.2" nannou_laser = "0.3" nannou_osc = "0.1" -shade_runner = "0.1" +shade_runner = { git = "https://github.com/mitchmindtree/shade_runner", branch = "update_vulkano" } +#shade_runner = "0.2" [target.'cfg(target_os = "macos")'.dependencies] moltenvk_deps = "0.1"