Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[osgearth] update to latest to fix build issue with latest geos #13385

Merged
merged 7 commits into from
Oct 2, 2020
Merged

[osgearth] update to latest to fix build issue with latest geos #13385

merged 7 commits into from
Oct 2, 2020

Conversation

ankurvdev
Copy link
Contributor

@ankurvdev ankurvdev commented Sep 7, 2020 •
edited by JackBoosY
Loading

osgearth build are currently broken in master
Update osgearth to the latest merge that fixes issues with GEOS compatibility with 3.8.1

@ankurvdev ankurvdev mentioned this pull request Sep 7, 2020
Closed
@JackBoosY JackBoosY self-assigned this Sep 7, 2020
@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Sep 7, 2020
@JackBoosY JackBoosY linked an issue Sep 7, 2020 that may be closed by this pull request
[osgearth:x64-windows] build failure #13292
Closed
@JackBoosY JackBoosY changed the title Osgearth [osgearth] update to latest to fix usage issue Sep 7, 2020
@JackBoosY JackBoosY changed the title [osgearth] update to latest to fix usage issue [osgearth] update to latest to fix build issue with latest geos Sep 7, 2020
@JackBoosY JackBoosY mentioned this pull request Sep 7, 2020
Closed
JackBoosY
JackBoosY suggested changes Sep 7, 2020
View reviewed changes
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you merge #13347 changes to this PR?

Thanks.

@ankurvdev
Copy link
Contributor Author

Could you merge #13347 changes to this PR?

Thanks.

done

@ankurvdev
Copy link
Contributor Author

Could you merge #13347 changes to this PR?

Thanks.

Does the change #13347 make sure that build breaks in osgearth are caught by CI pipelines ?

@JackBoosY
Copy link
Contributor

@ankurverma85 Yep.

@ankurvdev ankurvdev mentioned this pull request Sep 7, 2020
Closed
@ankurvdev
Copy link
Contributor Author

Looks like the latest commit has build issues on windows

gwaldron/osgearth#1574

@JackBoosY JackBoosY added the depends:upstream-changes Waiting on a change to the upstream project label Sep 8, 2020
@JackBoosY
Copy link
Contributor

@ankurverma85 Please ping me if the upstream fixed that issue.

@ankurvdev
Copy link
Contributor Author

@ankurverma85 Please ping me if the upstream fixed that issue.

The upstream commit breaks the builds on windows due to an earlier commit from a couple weeks back
gwaldron/osgearth#1574

So until that bug is fixed we cannot move to the upstream commit.
The build failures are due to some missing opengl macros and i'm not sure what the right fix there is

@ankurvdev
Copy link
Contributor Author

@JackBoosY , the build break in osgearth seems to be fixed.
Thanks @jasonbeverage for the fix.
I moved to a newer commit and the build pipeline are passing.

Can you go ahead and merge the pull request ?

@JackBoosY JackBoosY removed the depends:upstream-changes Waiting on a change to the upstream project label Sep 17, 2020
@JackBoosY
Copy link
Contributor

LGTM, use the official changes.

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Sep 17, 2020
@ankurvdev
Copy link
Contributor Author

how do i get it merged.
I dont think i have the necessary permissions

@JackBoosY
Copy link
Contributor

@ankurverma85 Please wait for my colleague to review and merge.

@ankurvdev
Copy link
Contributor Author

ping .. @JackBoosY can we get some traction on this please

@JackBoosY
Copy link
Contributor

@ras0219-msft Ping for review and merge this PR.

@ankurvdev
Copy link
Contributor Author

ping .. @ras0219-msft , @JackBoosY
Can we please get this merged

@ankurvdev
Copy link
Contributor Author

ping .. @ras0219-msft , @JackBoosY
Can we please get this merged

@PhoebeHui
Copy link
Contributor

@dan-shaw, could you make it a priority to merge this PR?

@ankurvdev
Copy link
Contributor Author

Ping @dan-shaw . Can we please get this merged
its been a month since this port has been broken.

@BillyONeal BillyONeal merged commit acd2f59 into microsoft:master Oct 2, 2020
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Oct 2, 2020
@Jimmy-Hu
Merge pull request #343 from microsoft/master
d73ad9f 
[osgearth] update to latest to fix build issue with latest geos (microsoft#13385)
@ankurvdev ankurvdev deleted the osgearth branch November 21, 2020 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhoebeHui PhoebeHui PhoebeHui approved these changes

@JackBoosY JackBoosY JackBoosY approved these changes

Assignees

@JackBoosY JackBoosY

@dan-shaw dan-shaw

Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[osgearth:x64-windows] build failure
5 participants
@ankurvdev @JackBoosY @PhoebeHui @BillyONeal @dan-shaw