Skip to content

[osg] fix x64-windows-static-md builds#15374

Merged
dan-shaw merged 5 commits intomicrosoft:masterfrom
ankurvdev:ankurv/osg
Jan 21, 2021
Merged

[osg] fix x64-windows-static-md builds#15374
dan-shaw merged 5 commits intomicrosoft:masterfrom
ankurvdev:ankurv/osg

Conversation

@ankurvdev
Copy link
Copy Markdown
Contributor

Describe the pull request

  • Remove dependencies on freeglut and fontconfig for windows
  • Fix symbol conflicts while linking the compiled libs with other static libraries

@JackBoosY JackBoosY self-assigned this Dec 30, 2020
@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Dec 30, 2020
@JackBoosY
Copy link
Copy Markdown
Contributor

Waiting for official reply.

@JackBoosY JackBoosY added the depends:upstream-changes Waiting on a change to the upstream project label Jan 4, 2021
@ankurvdev
Copy link
Copy Markdown
Contributor Author

Waiting for official reply.

Does that mean I can't get a go-ahead to merge unless
Someone from osg looks at the issue and comments?

Is there a reason we'd like to hold off on the workaround patch here?

@JackBoosY
Copy link
Copy Markdown
Contributor

@ankurverma85 According to our policy, any critical changes to the source code must be approved by upstream.
So let's wait a while ; )
I will merge this PR as soon as possible after the upstream approval.

ankurvdev and others added 3 commits January 8, 2021 22:27
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
@ankurvdev
Copy link
Copy Markdown
Contributor Author

Opened a pull request for the upstream patches

openscenegraph/OpenSceneGraph#1023

@JackBoosY
Copy link
Copy Markdown
Contributor

Waiting for official reply.

@ankurvdev
Copy link
Copy Markdown
Contributor Author

Waiting for official reply.

Upstream PR merged
Can we merge this now?

@JackBoosY JackBoosY removed the depends:upstream-changes Waiting on a change to the upstream project label Jan 19, 2021
@JackBoosY
Copy link
Copy Markdown
Contributor

Needs test all features.

@JackBoosY
Copy link
Copy Markdown
Contributor

Test all features successfully on x86-windows and x64-windows-static.

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jan 20, 2021
@dan-shaw dan-shaw merged commit 9d98893 into microsoft:master Jan 21, 2021
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Jan 21, 2021
[osg] fix x64-windows-static-md builds (microsoft#15374)
@ankurvdev ankurvdev deleted the ankurv/osg branch January 30, 2021 01:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[osg, osgearth] x64-windows-static-md build failure

3 participants