diff --git a/Cargo.lock b/Cargo.lock index c4c0bd3..57dc6bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = "0.0.1" dependencies = [ "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "glfw 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glutin 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -15,7 +15,7 @@ dependencies = [ "steven_gl 0.0.1", "steven_openssl 0.0.1", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "zip 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "zip 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -27,6 +27,16 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "android_glue" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "bitflags" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "bitflags" version = "0.3.2" @@ -55,6 +65,26 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "cgl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gleam 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cocoa" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.1.1 (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)", +] + [[package]] name = "color_quant" version = "1.0.0" @@ -65,23 +95,57 @@ name = "cookie" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "enum_primitive" +name = "core-foundation" +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 = "core-graphics" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dlib" +version = "0.1.1" +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 = "dwmapi-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dylib" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "enum_primitive" -version = "0.1.0" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -105,6 +169,14 @@ dependencies = [ "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gdi32-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gif" version = "0.5.0" @@ -116,7 +188,7 @@ dependencies = [ [[package]] name = "gl_common" -version = "0.0.4" +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)", @@ -124,7 +196,7 @@ dependencies = [ [[package]] name = "gl_generator" -version = "0.0.27" +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)", @@ -133,29 +205,51 @@ dependencies = [ ] [[package]] -name = "glfw" -version = "0.1.1" +name = "gleam" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glfw-sys 3.1.3 (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)", + "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "glfw-sys" -version = "3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "glob" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "glutin" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +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)", + "cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "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.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)", + "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)", + "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-kbd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-window 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "hpack" version = "0.2.0" @@ -180,7 +274,7 @@ dependencies = [ "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -212,6 +306,11 @@ 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" @@ -224,7 +323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -253,6 +352,14 @@ name = "lzw" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "malloc_buf" +version = "0.0.5" +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 = "matches" version = "0.1.2" @@ -275,6 +382,15 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "mmap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "msdos_time" version = "0.1.2" @@ -302,31 +418,49 @@ dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "objc" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "malloc_buf 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "openssl" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.14 (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)", - "openssl-sys 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "osmesa-sys" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "shared_library 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pkg-config" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -368,11 +502,6 @@ name = "rustc-serialize" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "semver" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "serde" version = "0.6.0" @@ -390,6 +519,24 @@ dependencies = [ "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "shared_library" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "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)", +] + +[[package]] +name = "shell32-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "solicit" version = "0.4.4" @@ -403,8 +550,8 @@ dependencies = [ name = "steven_gl" version = "0.0.1" dependencies = [ - "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)", "khronos_api 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -414,7 +561,7 @@ name = "steven_openssl" version = "0.0.1" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -425,6 +572,17 @@ dependencies = [ "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tempfile" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "time" version = "0.1.32" @@ -459,6 +617,48 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "user32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-client" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "dlib 0.1.1 (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)", +] + +[[package]] +name = "wayland-kbd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.1.1 (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)", + "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wayland-window" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "winapi" version = "0.2.4" @@ -469,6 +669,15 @@ name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "x11-dl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xml-rs" version = "0.1.26" @@ -479,7 +688,7 @@ dependencies = [ [[package]] name = "zip" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bzip2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/gl/Cargo.toml b/gl/Cargo.toml index ef27522..1e6b114 100644 --- a/gl/Cargo.toml +++ b/gl/Cargo.toml @@ -5,9 +5,9 @@ authors = [ "Thinkofdeath " ] build = "build.rs" [build-dependencies] -gl_generator = "0.0.27" +gl_generator = "0.1.0" khronos_api = "0.0.8" [dependencies] -gl_common = "0.0.4" +gl_common = "0.1.0" libc = "*"