This repository has been archived by the owner on Jul 10, 2023. It is now read-only.
Depend on specific versions. Explicitly show an EGL dependency. #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Glutin update Previous PR (servo#43) was against the master branch, not the servo branch. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/44) <!-- Reviewable:end -->
Conflicts: Cargo.toml
Merge latest glutin to get android build fix. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/45) <!-- Reviewable:end -->
Merge from upstream master To pick up rust-windowing#580 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/46) <!-- Reviewable:end -->
Glutin update <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/47) <!-- Reviewable:end -->
glutin fixes for win32 This PR fixes some dep versions (on user32-sys), stubs out some functions to avoid unimplemented!() panics, and fixes BuilderAttribs to not have a bare *c_void for which the Send trait does not exist. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/glutin/48) <!-- Reviewable:end -->
|
|
@larsbergstrom This looks fine to me but travis failed. |
|
You should use gl_generator 0.1.0. |
|
☔ The latest upstream changes (presumably 6525e22) made this pull request unmergeable. Please resolve the merge conflicts. |
|
pinging @larsbergstrom |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @glennw
Need to both: