Skip to content

/ surfman

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop EGL depedency unless needed #74

Merged
merged 1 commit into from Nov 17, 2016
Merged

Drop EGL depedency unless needed #74

merged 1 commit into from Nov 17, 2016

Conversation

@staktrace
Copy link
Contributor

staktrace commented Nov 17, 2016

Right now when building webrender on Linux (with Gecko), this crate pulls in a libEGL dependency which is really not needed, as it's only required as part of a testing feature. This commit fixes that.
@emilio
emilio approved these changes Nov 17, 2016
View changes
Copy link
Member

emilio left a comment

So the idea for this was that eventually we'd have different back-end support inside Linux, so you could use the default NativeGLContext (glx), or the egl variant.

There was a project to make servo run with EGL, which I guess never ended up making it, so I suppose this is fine.

Please make the version bump as breaking, and I'll merge this, thanks!
Cargo.toml Outdated
@@ -1,7 +1,7 @@
[package]
name = "offscreen_gl_context"
license = "MIT / Apache-2.0"
version = "0.4.5"
version = "0.4.6"

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Nov 17, 2016

Member

Can you bump to 5.0 instead? This is technically a breaking change.

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Nov 17, 2016

Member

(0.5.0 i mean)
@staktrace
Copy link
Contributor Author

staktrace commented Nov 17, 2016

Thanks. Could you also please push the updated version to crates.io? In the firefox build we can't (for now, anyway) pull in repos from git, it has to be on crates.io.
@emilio
Copy link
Member

emilio commented Nov 17, 2016

Actually I think you also need to modify build.rs so it doesn't print the link libEGL line, sorry for not noticing before.

And sure, I'll publish this as soon as it's merged.
@staktrace
Make the with_egl dependency more precise so libEGL is not needed unl…
Loading status checks…
fbc09a7 
…ess the feature is enabled
@emilio emilio merged commit b5d3e9a into servo:master Nov 17, 2016
1 check was pending
1 check was pending
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@emilio
Copy link
Member

emilio commented Nov 17, 2016

Thanks!
@staktrace
Copy link
Contributor Author

staktrace commented Nov 17, 2016

Thank you for the quick turnaround!
@staktrace staktrace deleted the staktrace:drop_egl branch Nov 17, 2016
staktrace added a commit to staktrace/webrender that referenced this pull request Nov 18, 2016
@staktrace
Bump versions on dependencies
70cd804 
dwrote-rs, freetype: Use a published crate rather than the github repository, so
    that the Firefox build system can vendor in the crate properly.
offscreen_gl_context: Pick up a new version which doesn't require a libEGL
    dependency on linux. The change was made in
    servo/surfman#74
@staktrace staktrace mentioned this pull request Nov 18, 2016
Merged
staktrace added a commit to staktrace/webrender that referenced this pull request Nov 18, 2016
@staktrace
Bump versions on dependencies
4fff6b2 
dwrote-rs, freetype: Use a published crate rather than the github repository, so
    that the Firefox build system can vendor in the crate properly.
offscreen_gl_context: Pick up a new version which doesn't require a libEGL
    dependency on linux. The change was made in
    servo/surfman#74
staktrace added a commit to staktrace/webrender that referenced this pull request Nov 18, 2016
@staktrace
Bump versions on dependencies
80ac231 
dwrote-rs, freetype: Use a published crate rather than the github repository, so
    that the Firefox build system can vendor in the crate properly.
offscreen_gl_context: Pick up a new version which doesn't require a libEGL
    dependency on linux. The change was made in
    servo/surfman#74
bors-servo added a commit to servo/webrender that referenced this pull request Nov 18, 2016
@bors-servo
Auto merge of #575 - staktrace:versions, r=glennw
Loading status checks…
005978e 
Bump versions on dependencies

dwrote-rs, freetype: Use a published crate rather than the github repository, so
    that the Firefox build system can vendor in the crate properly.
offscreen_gl_context: Pick up a new version which doesn't require a libEGL
    dependency on linux. The change was made in
    servo/surfman#74

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/575)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@staktrace @emilio
You can’t perform that action at this time.