From c6b753bc9a72a612c0e00f5a39b2a22974a23a29 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Wed, 22 May 2019 17:27:00 -0700 Subject: [PATCH] Update to patched glutin wasm_stub allowing compiling for wasi Includes https://github.com/iceiix/glutin/pull/1/commits/1e48d3216ed692596983a7b053caf8c73e6bbf22 Progress towards #115, fixes the missing glutin symbols when compiling with cargo +nightly build --target wasm32-wasi --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6244c33..100ad1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -690,7 +690,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.21.0" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -698,11 +698,11 @@ dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin_egl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", - "glutin_emscripten_sys 0.1.0 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", - "glutin_gles2_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", - "glutin_glx_sys 0.1.5 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", - "glutin_wgl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", + "glutin_egl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", + "glutin_emscripten_sys 0.1.0 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", + "glutin_gles2_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", + "glutin_glx_sys 0.1.5 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", + "glutin_wgl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "glutin_egl_sys" version = "0.1.3" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" dependencies = [ "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -725,12 +725,12 @@ dependencies = [ [[package]] name = "glutin_emscripten_sys" version = "0.1.0" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" [[package]] name = "glutin_gles2_sys" version = "0.1.3" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" dependencies = [ "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -739,7 +739,7 @@ dependencies = [ [[package]] name = "glutin_glx_sys" version = "0.1.5" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" dependencies = [ "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -748,7 +748,7 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" version = "0.1.3" -source = "git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c#5ff18dec039f6854091685980d7213858a8aaa4c" +source = "git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22#1e48d3216ed692596983a7b053caf8c73e6bbf22" dependencies = [ "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1905,7 +1905,7 @@ dependencies = [ "collision 0.20.1 (registry+https://github.com/rust-lang/crates.io-index)", "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", - "glutin 0.21.0 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)", + "glutin 0.21.0 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2665,12 +2665,12 @@ dependencies = [ "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd" "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a" "checksum gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7f46fd8874e043ffac0d638ed1567a2584f7814f6d72b4db37ab1689004a26c4" -"checksum glutin 0.21.0 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" -"checksum glutin_egl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" -"checksum glutin_emscripten_sys 0.1.0 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" -"checksum glutin_gles2_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" -"checksum glutin_glx_sys 0.1.5 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" -"checksum glutin_wgl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=5ff18dec039f6854091685980d7213858a8aaa4c)" = "" +"checksum glutin 0.21.0 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" +"checksum glutin_egl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" +"checksum glutin_emscripten_sys 0.1.0 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" +"checksum glutin_gles2_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" +"checksum glutin_glx_sys 0.1.5 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" +"checksum glutin_wgl_sys 0.1.3 (git+https://github.com/iceiix/glutin?rev=1e48d3216ed692596983a7b053caf8c73e6bbf22)" = "" "checksum h2 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "85ab6286db06040ddefb71641b50017c06874614001a134b423783e2db2920bd" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" diff --git a/Cargo.toml b/Cargo.toml index fc9d243..4a74666 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ opt-level = 1 cfg-if = "0.1.9" wasm-bindgen = "0.2.44" sha-1 = "0.8.1" -glutin = { git = "https://github.com/iceiix/glutin", rev = "5ff18dec039f6854091685980d7213858a8aaa4c" } +glutin = { git = "https://github.com/iceiix/glutin", rev = "1e48d3216ed692596983a7b053caf8c73e6bbf22" } byteorder = "1.2.7" serde = "1.0.91" serde_json = "1.0.39"