mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 05:01:37 +08:00
3bffe1c049
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
14 lines
579 B
Diff
14 lines
579 B
Diff
diff --git a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
|
index d54583e8b..1921185f8 100644
|
|
--- a/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
|
+++ b/src/3rdparty/chromium/ui/gl/gl_bindings_autogen_gl.h
|
|
@@ -16,7 +16,7 @@
|
|
namespace gl {
|
|
|
|
class GLContext;
|
|
-
|
|
+typedef void *GLeglImageOES;
|
|
typedef void(GL_BINDING_CALL* glActiveShaderProgramProc)(GLuint pipeline,
|
|
GLuint program);
|
|
typedef void(GL_BINDING_CALL* glActiveTextureProc)(GLenum texture);
|