Merge remote-tracking branch 'upstream/master' into 0.22maj

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Unreleased
 
 - Update winit dependency to 0.20.0-alpha4. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0200-alpha-4) for more info.
+# Version 0.22.0-alpha4 (2019-11-10)
+
+- Update winit dependency to 0.20.0-alpha4. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0200-alpha-4) for more info.
+- Added an xcode example for building for iOS.
+- Made using sRGB the default.
+- MacOSX's raw_handle trait method  now returns the CGLContext object.
+
+# Version 0.22.0-alpha3 (2019-8-15)
+
+ - Switched from needing a `EventLoop` to a `EventLoopWindowTarget`
 
 # Version 0.22.0-alpha2 (2019-08-15)
 

README.md

@@ -8,7 +8,7 @@ A low-level library for OpenGL context creation, written in pure Rust.
 
 ```toml
 [dependencies]
-glutin = "0.22.0-alpha3"
+glutin = "0.22.0-alpha4"
 ```
 
 ## [Documentation](https://docs.rs/glutin)
@@ -60,10 +60,6 @@ The plan is that glutin tries to dynamically link-to and use wayland if possible
 
 Due to an issue with how mesa and Wayland play together, all shared contexts must use the same events pool as each other.
 
-### iOS
-
-In order to build in XCode, you must link both `UIKit.framework` and `OpenGLES.framework`. In order for your app to not crash while attempting to obtain a context, you must also link `CoreFoundation.framework` and `GLKit.framework`.
-
 ## Common issues
 
 Help! I'm receiving `NoAvailablePixelFormat`!

glutin/Cargo.toml

@@ -23,8 +23,11 @@ winit = "0.20.0-alpha4"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_glue = "0.2"
-glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
-parking_lot = "0.8"
+glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" }
+parking_lot = "0.9"
+
+[target.'cfg(target_os = "emscripten")'.dependencies]
+glutin_emscripten_sys = { version = "0.1.0", path = "../glutin_emscripten_sys" }
 
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
 objc = "0.2.6"
@@ -48,15 +51,15 @@ features = [
 [target.'cfg(target_os = "windows")'.dependencies]
 libloading = "0.5"
 glutin_wgl_sys = { version = "0.1.3", path = "../glutin_wgl_sys" }
-glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
-parking_lot = "0.8"
+glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" }
+parking_lot = "0.9"
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
 osmesa-sys = "0.1"
 wayland-client = { version = "0.23", features = ["egl", "dlopen"] }
 libloading = "0.5"
-glutin_egl_sys = { version = "0.1.3", path = "../glutin_egl_sys" }
+glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" }
 glutin_glx_sys = { version = "0.1.5", path = "../glutin_glx_sys" }
 derivative = "1.0"
-parking_lot = "0.8"
+parking_lot = "0.9"
 log = "0.4"

glutin_egl_sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glutin_egl_sys"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["The glutin contributors", "Hal Gentz <zegentzy@protonmail.com>"]
 description = "The egl bindings for glutin"
 repository = "https://github.com/rust-windowing/glutin"

glutin_gles2_sys/build.rs

@@ -10,6 +10,8 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     if target.contains("ios") {
+        println!("cargo:rustc-link-lib=framework=GLKit");
+        println!("cargo:rustc-link-lib=framework=OpenGLES");
         let mut file = File::create(&dest.join("gles2_bindings.rs")).unwrap();
         Registry::new(Api::Gles2, (2, 0), Profile::Core, Fallbacks::None, [])
             .write_bindings(gl_generator::StaticStructGenerator, &mut file)

glutin_gles2_sys/src/lib.rs

@@ -79,9 +79,6 @@ pub const kEAGLRenderingAPIOpenGLES1: NSUInteger = 1;
 pub const kEAGLRenderingAPIOpenGLES2: NSUInteger = 2;
 pub const kEAGLRenderingAPIOpenGLES3: NSUInteger = 3;
 
-#[link(name = "UIKit", kind = "framework")]
-#[link(name = "CoreFoundation", kind = "framework")]
-#[link(name = "GlKit", kind = "framework")]
 extern "C" {
     pub static kEAGLColorFormatRGB565: id;
     // pub static kEAGLColorFormatRGBA8: id;