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.

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

[libepoxy] Update to 1.5.4 #11448

Merged

Conversation

c72578
Copy link
Contributor

@c72578 c72578 commented May 19, 2020

  • New upstream version 1.5.4
  • Use simplified file(INSTALL ...) for copyright file
  • Add libepoxy-1.5.4_Add_call_convention_to_mock_function.patch

Describe the pull request

  • What does your PR fix? Fixes #

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    • Supported:
      libepoxy:x64-windows
      libepoxy:x86-windows
    • Not supported:
      libepoxy:arm64-windows
      libepoxy:arm-uwp
      libepoxy:x64-osx
      libepoxy:x64-uwp
      libepoxy:x64-windows-static
  • Does your PR follow the maintainer guide?
    Yes

@c72578
Copy link
Contributor Author

c72578 commented May 19, 2020

The patch libepoxy-1.5.4_Add_call_convention_to_mock_function.patch fixes the following error:
libepoxy:x86-windows:

[7/30] cl @test/9f86d08@@gl_version@exe/gl_version.c.obj.rsp
FAILED: test/9f86d08@@gl_version@exe/gl_version.c.obj 
cl @test/9f86d08@@gl_version@exe/gl_version.c.obj.rsp
../src/1.5.4-f99b1bd487/test/gl_version.c(79): error C2440: '=': cannot convert from 'const GLubyte *(__cdecl *)(GLenum)' to 'const GLubyte *(__stdcall *)(GLenum)'

The upstream fix can be found here:
anholt/libepoxy#220

@PhoebeHui PhoebeHui self-assigned this May 19, 2020
- New upstream version 1.5.4
- Use simplified file(INSTALL ...) for copyright file
- Add libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
@c72578 c72578 force-pushed the 2020-05-19_libepoxy_Update_to_1.5.4 branch from 4a31bf0 to 8aae5a5 Compare May 19, 2020 21:16
@c72578 c72578 marked this pull request as ready for review May 19, 2020 21:35
@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label May 20, 2020
@strega-nil strega-nil merged commit 0567431 into microsoft:master May 20, 2020
@strega-nil
Copy link
Contributor

Thanks @c72578 :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants