Sync with master

Author: dariost

.travis.yml

@@ -27,9 +27,9 @@ before_script:
   export PATH=$HOME/.local/bin:$PATH
 script:
 - |
-  travis-cargo build -- --all-features &&
-  travis-cargo test -- --all-features &&
-  travis-cargo --only stable doc -- --all-features
+  travis-cargo build -- --features "gfx image ttf mixer" &&
+  travis-cargo test -- --features "gfx image ttf mixer" &&
+  travis-cargo --only stable doc -- --features "gfx image ttf mixer"
 after_success:
 - travis-cargo --only stable doc-upload
 env:

Cargo.toml

@@ -35,6 +35,7 @@ optional = true
 
 [features]
 
+unsafe_textures = []
 default = []
 ttf = []
 image = []
@@ -44,3 +45,80 @@ mixer = []
 use-bindgen = ["sdl2-sys/use-bindgen"]
 use-pkgconfig = ["sdl2-sys/use-pkgconfig"]
 use_mac_framework = ["sdl2-sys/use_mac_framework"]
+
+[[example]]
+name = "animation"
+
+[[example]]
+name = "audio-queue-squarewave"
+
+[[example]]
+name = "audio-wav"
+
+[[example]]
+name = "audio-whitenoise"
+
+[[example]]
+name = "demo"
+
+[[example]]
+name = "game-controller"
+
+[[example]]
+required-features = ["unsafe_textures"]
+name = "game-of-life-unsafe-textures"
+
+[[example]]
+name = "game-of-life"
+
+[[example]]
+required-features = ["gfx"]
+name = "gfx-demo"
+
+[[example]]
+name = "haptic"
+
+[[example]]
+required-features = ["image"]
+name = "image-demo"
+
+[[example]]
+name = "joystick"
+
+[[example]]
+name = "keyboard-state"
+
+[[example]]
+name = "message-box"
+
+[[example]]
+required-features = ["mixer"]
+name = "mixer-demo"
+
+[[example]]
+name = "mouse-state"
+
+[[example]]
+name = "no-renderer"
+
+[[example]]
+name = "relative-mouse-state"
+
+[[example]]
+name = "renderer-target"
+
+[[example]]
+name = "renderer-texture"
+
+[[example]]
+name = "renderer-yuv"
+
+[[example]]
+name = "resource-manager"
+
+[[example]]
+required-features = ["ttf"]
+name = "ttf-demo"
+
+[[example]]
+name = "window-properties"

README.md

@@ -17,8 +17,12 @@ If you want a library compatible with earlier versions of SDL, please see
 
 # Documentation
 
-* [master documentation](https://rust-sdl2.github.io/rust-sdl2/sdl2/)
-* [crates.io documentation](https://docs.rs/sdl2/)
+* [crates.io documentation](https://docs.rs/sdl2/), with no features at all.
+* [master documentation](https://rust-sdl2.github.io/rust-sdl2/sdl2/) with the following features:
+  * gfx
+  * image
+  * mixer
+  * ttf
 
 # Requirements
 
@@ -299,6 +303,19 @@ You can see the full list in the `examples/` folder. Some examples require some
 
 Replace "gfx" by the feature(s) needed for the example you want.
 
+# About the `unsafe_textures` feature
+
+In the `sdl2::render` module, `Texture` has by default lifetimes to prevent it from out-living its parent `TextureCreator`.
+These lifetimes are sometimes too hard to deal with in Rust, and so you have the option to enable the `unsafe_textures` feature.
+
+This removes the lifetimes on the `Texture`s, at the cost of optional manual memory management. If you want to manually destroy
+the `Texture`s you use, you can call the `destroy` method of your `Texture`s, but beware that *it should not* be called if none of
+the parents (`Canvas` or `TextureCreator`) are alive. If you do not call this method, the memory will simply be freed when
+the last `Canvas` or the last `TextureCreator` will be freed.
+
+There is no online documentation for this feature, however you can build it yourself in your project by enabling the feature in your
+Cargo.toml, running `cargo doc` and accessing `target/doc/sdl2/index.html` via a browser.
+
 # OpenGL
 
 If you want to use OpenGL, you also need the

changelog.md

@@ -1,6 +1,23 @@
 In this file will be listed the changes, especially the breaking ones that one should be careful of
 when upgrading from a version of rust-sdl2 to another.
 
+### v0.31
+
+[PR #673](https://github.com/Rust-sdl2/rust-sdl2/pull/673)
+
+* Support Audio Capture in AudioCallbacks.
+
+[PR #684](https://github.com/Rust-sdl2/rust-sdl2/pull/684)
+
+* **Breaking change** Make get\_swap\_interval return an enum instead of i32
+* The signature of set\_swap\_interval has been changed as well, but it shouldn't
+breaking exisitng code too much.
+
+[PR #683](https://github.com/Rust-sdl2/rust-sdl2/pull/684)
+
+* Adds the `unsafe_textures` feature to this crate, allowing to get rid of the lifetimes
+in `Texture`s in the `render` module.
+
 ### v0.30
 
 Re-exported sdl2\_sys as sdl2::sys