From ec932c18dd18e6f1edac91f386eceb94d3498cb2 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 21 Oct 2015 08:16:13 +0200 Subject: [PATCH] glutin update --- components/servo/Cargo.lock | 26 +++++++++++++++++--------- ports/cef/Cargo.lock | 29 ++++++++++++++++------------- ports/glutin/Cargo.toml | 2 +- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index a2844fb225a5..11ad77934e8c 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -690,9 +690,17 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gl_common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gl_generator" -version = "0.0.27" +version = "0.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -702,10 +710,10 @@ dependencies = [ [[package]] name = "gl_generator" -version = "0.0.28" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -728,8 +736,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "glutin" -version = "0.3.6" -source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4" +version = "0.4.0" +source = "git+https://github.com/servo/glutin?branch=servo#6525e224e3b5b3ad4f0af8d87460512eb64e8c59" dependencies = [ "android_glue 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -738,10 +746,10 @@ dependencies = [ "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -767,7 +775,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.4.0 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index f2e136e26910..62eb52666257 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -640,9 +640,17 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gl_common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gl_generator" -version = "0.0.27" +version = "0.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -652,7 +660,7 @@ dependencies = [ [[package]] name = "gl_generator" -version = "0.0.28" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -678,8 +686,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "glutin" -version = "0.3.6" -source = "git+https://github.com/servo/glutin?branch=servo#d415de427f765d65212ba56f3dcd1949c0c2fcd4" +version = "0.4.0" +source = "git+https://github.com/servo/glutin?branch=servo#6525e224e3b5b3ad4f0af8d87460512eb64e8c59" dependencies = [ "android_glue 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,10 +696,10 @@ dependencies = [ "core-graphics 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -717,7 +725,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.3.6 (git+https://github.com/servo/glutin?branch=servo)", + "glutin 0.4.0 (git+https://github.com/servo/glutin?branch=servo)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -910,11 +918,6 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "khronos_api" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "khronos_api" version = "0.0.8" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 42a789d6becf..a38a40fc6b28 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -8,7 +8,7 @@ name = "glutin_app" path = "lib.rs" [features] -window = ["glutin/window"] +window = [] headless = ["glutin/headless"] [dependencies]