pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

webkitgtk: 2.26.4 -> 2.28.0

prune libglvnd patch, this is what gentoo uses.

authored by

Tor Hedin Brønner and committed by
Jan Tojnar 25a79ccc ca7c2fc0

+2 -576
+2 -2
pkgs/development/libraries/webkitgtk/default.nix
··· 62 62 63 63 stdenv.mkDerivation rec { 64 64 pname = "webkitgtk"; 65 - version = "2.26.4"; 65 + version = "2.28.0"; 66 66 67 67 outputs = [ "out" "dev" ]; 68 68 69 69 src = fetchurl { 70 70 url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; 71 - sha256 = "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3"; 71 + sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"; 72 72 }; 73 73 74 74 patches = optionals stdenv.isLinux [
-574
pkgs/development/libraries/webkitgtk/libglvnd-headers.patch
··· 1 - diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py 2 - index a408dac4..92ddca90 100644 3 - --- a/Source/ThirdParty/ANGLE/scripts/generate_loader.py 4 - +++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py 5 - @@ -201,6 +201,8 @@ def main(): 6 - 7 - libegl_preamble = """#include <EGL/egl.h> 8 - #include <EGL/eglext.h> 9 - +#include <EGL/eglmesaext.h> 10 - +#include <EGL/eglmesaext.h> 11 - """ 12 - 13 - util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES 14 - @@ -215,6 +217,8 @@ util_egl_preamble = """#include "util/util_export.h" 15 - 16 - #include <EGL/egl.h> 17 - #include <EGL/eglext.h> 18 - +#include <EGL/eglmesaext.h> 19 - +#include <EGL/eglmesaext.h> 20 - """ 21 - 22 - util_wgl_preamble = """ 23 - diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h 24 - index 68c65d8b..0dc9c8e3 100644 25 - --- a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h 26 - +++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h 27 - @@ -14,6 +14,7 @@ 28 - 29 - #include <EGL/egl.h> 30 - #include <EGL/eglext.h> 31 - +#include <EGL/eglmesaext.h> 32 - #include <angle_gl.h> 33 - 34 - #include <cstdint> 35 - diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h 36 - index cd651150..17719bc2 100644 37 - --- a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h 38 - +++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h 39 - @@ -14,6 +14,7 @@ 40 - 41 - #include <EGL/egl.h> 42 - #include <EGL/eglext.h> 43 - +#include <EGL/eglmesaext.h> 44 - #include <angle_gl.h> 45 - 46 - #include <cstdint> 47 - diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py 48 - index 2f77e725..5ea54f1f 100644 49 - --- a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py 50 - +++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py 51 - @@ -71,6 +71,7 @@ header_template = """// GENERATED FILE - DO NOT EDIT. 52 - #include <angle_gl.h> 53 - #include <EGL/egl.h> 54 - #include <EGL/eglext.h> 55 - +#include <EGL/eglmesaext.h> 56 - 57 - #include <cstdint> 58 - 59 - diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h 60 - index 7a1429a4..dd20bcca 100644 61 - --- a/Source/ThirdParty/ANGLE/src/common/utilities.h 62 - +++ b/Source/ThirdParty/ANGLE/src/common/utilities.h 63 - @@ -11,6 +11,7 @@ 64 - 65 - #include <EGL/egl.h> 66 - #include <EGL/eglext.h> 67 - +#include <EGL/eglmesaext.h> 68 - 69 - #include <math.h> 70 - #include <string> 71 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp 72 - index 4134226d..5dd1065f 100644 73 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp 74 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp 75 - @@ -15,6 +15,7 @@ 76 - #include <vector> 77 - 78 - #include <EGL/eglext.h> 79 - +#include <EGL/eglmesaext.h> 80 - #include "angle_gl.h" 81 - 82 - #include "common/debug.h" 83 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp 84 - index 13ae4e61..b964b755 100644 85 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp 86 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp 87 - @@ -12,6 +12,7 @@ 88 - #include <iterator> 89 - 90 - #include <EGL/eglext.h> 91 - +#include <EGL/eglmesaext.h> 92 - #include <platform/Platform.h> 93 - 94 - #include "common/debug.h" 95 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp 96 - index 21064073..a46628bd 100644 97 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp 98 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp 99 - @@ -17,6 +17,7 @@ 100 - #include <vector> 101 - 102 - #include <EGL/eglext.h> 103 - +#include <EGL/eglmesaext.h> 104 - #include <platform/Platform.h> 105 - 106 - #include "common/debug.h" 107 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h 108 - index 37df5b0c..b2e3885b 100644 109 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h 110 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h 111 - @@ -11,6 +11,7 @@ 112 - 113 - #include <EGL/egl.h> 114 - #include <EGL/eglext.h> 115 - +#include <EGL/eglmesaext.h> 116 - #include "angle_gl.h" 117 - #include "common/angleutils.h" 118 - #include "common/debug.h" 119 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp 120 - index b7bc84c8..538cb3e0 100644 121 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp 122 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp 123 - @@ -10,6 +10,7 @@ 124 - #include "libANGLE/Stream.h" 125 - 126 - #include <EGL/eglext.h> 127 - +#include <EGL/eglmesaext.h> 128 - #include <platform/Platform.h> 129 - 130 - #include "common/debug.h" 131 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h 132 - index 9157aa51..d8e58f2d 100644 133 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h 134 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h 135 - @@ -14,6 +14,7 @@ 136 - 137 - #include <EGL/egl.h> 138 - #include <EGL/eglext.h> 139 - +#include <EGL/eglmesaext.h> 140 - 141 - #include "common/angleutils.h" 142 - #include "libANGLE/AttributeMap.h" 143 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp 144 - index 6daec4f6..941f34ca 100644 145 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp 146 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp 147 - @@ -11,6 +11,7 @@ 148 - #include "libANGLE/Surface.h" 149 - 150 - #include <EGL/eglext.h> 151 - +#include <EGL/eglmesaext.h> 152 - 153 - #include "libANGLE/Config.h" 154 - #include "libANGLE/Context.h" 155 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h 156 - index ea1a0510..db7cf0c8 100644 157 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h 158 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h 159 - @@ -11,6 +11,7 @@ 160 - 161 - #include <EGL/egl.h> 162 - #include <EGL/eglext.h> 163 - +#include <EGL/eglmesaext.h> 164 - 165 - #include "common/angleutils.h" 166 - #include "libANGLE/Error.h" 167 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp 168 - index ba5cf532..43304da5 100644 169 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp 170 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp 171 - @@ -13,6 +13,7 @@ 172 - #include "libANGLE/Display.h" 173 - 174 - #include <EGL/eglext.h> 175 - +#include <EGL/eglmesaext.h> 176 - 177 - namespace rx 178 - { 179 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp 180 - index de60dfff..93b5bdf8 100644 181 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp 182 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp 183 - @@ -9,6 +9,7 @@ 184 - #include "libANGLE/renderer/d3d/DisplayD3D.h" 185 - 186 - #include <EGL/eglext.h> 187 - +#include <EGL/eglmesaext.h> 188 - 189 - #include "libANGLE/Config.h" 190 - #include "libANGLE/Context.h" 191 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp 192 - index a7255d0d..a7e37777 100644 193 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp 194 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp 195 - @@ -20,6 +20,7 @@ 196 - #include "libANGLE/renderer/d3d/TextureStorage.h" 197 - 198 - #include <EGL/eglext.h> 199 - +#include <EGL/eglmesaext.h> 200 - 201 - namespace rx 202 - { 203 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp 204 - index 61dc8ffa..87276514 100644 205 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp 206 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp 207 - @@ -19,6 +19,7 @@ 208 - #include "libANGLE/renderer/d3d/d3d11/formatutils11.h" 209 - 210 - #include <EGL/eglext.h> 211 - +#include <EGL/eglmesaext.h> 212 - #include <tchar.h> 213 - #include <algorithm> 214 - 215 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h 216 - index 443cadd6..e64bdfc4 100644 217 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h 218 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h 219 - @@ -12,6 +12,7 @@ 220 - 221 - #include <EGL/egl.h> 222 - #include <EGL/eglext.h> 223 - +#include <EGL/eglmesaext.h> 224 - #include <GLES2/gl2.h> 225 - 226 - #include "common/angleutils.h" 227 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp 228 - index 33dfa6b0..eb3393d2 100644 229 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp 230 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp 231 - @@ -9,6 +9,7 @@ 232 - #include "libANGLE/renderer/d3d/d3d11/Renderer11.h" 233 - 234 - #include <EGL/eglext.h> 235 - +#include <EGL/eglmesaext.h> 236 - #include <versionhelpers.h> 237 - #include <sstream> 238 - 239 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp 240 - index fe4def6e..2550b52c 100644 241 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp 242 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp 243 - @@ -9,6 +9,7 @@ 244 - #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h" 245 - 246 - #include <EGL/eglext.h> 247 - +#include <EGL/eglmesaext.h> 248 - 249 - #include "libANGLE/features.h" 250 - #include "libANGLE/renderer/d3d/DisplayD3D.h" 251 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp 252 - index f4a4ce43..0cad5540 100644 253 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp 254 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp 255 - @@ -9,6 +9,7 @@ 256 - #include "libANGLE/renderer/d3d/d3d9/Renderer9.h" 257 - 258 - #include <EGL/eglext.h> 259 - +#include <EGL/eglmesaext.h> 260 - #include <sstream> 261 - 262 - #include "common/utilities.h" 263 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp 264 - index a89e1365..0fe4fa98 100644 265 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp 266 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp 267 - @@ -18,6 +18,7 @@ 268 - #include "libANGLE/renderer/gl/SurfaceGL.h" 269 - 270 - #include <EGL/eglext.h> 271 - +#include <EGL/eglmesaext.h> 272 - 273 - namespace rx 274 - { 275 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp 276 - index 10b15594..7ae1ac6b 100644 277 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp 278 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp 279 - @@ -9,6 +9,7 @@ 280 - #include "libANGLE/renderer/gl/RendererGL.h" 281 - 282 - #include <EGL/eglext.h> 283 - +#include <EGL/eglmesaext.h> 284 - 285 - #include "common/debug.h" 286 - #include "libANGLE/AttributeMap.h" 287 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h 288 - index 115a7afb..abb200e6 100644 289 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h 290 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h 291 - @@ -11,6 +11,7 @@ 292 - 293 - #include <EGL/egl.h> 294 - #include <EGL/eglext.h> 295 - +#include <EGL/eglmesaext.h> 296 - 297 - #include <string> 298 - #include <vector> 299 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp 300 - index 47ed6ce0..9d11560c 100644 301 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp 302 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp 303 - @@ -14,6 +14,7 @@ 304 - #include <unistd.h> 305 - 306 - #include <EGL/eglext.h> 307 - +#include <EGL/eglmesaext.h> 308 - 309 - #include <drm_fourcc.h> 310 - #include <gbm.h> 311 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp 312 - index 23b4a5c5..daeb5789 100644 313 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp 314 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp 315 - @@ -9,6 +9,7 @@ 316 - #include "libANGLE/renderer/gl/glx/DisplayGLX.h" 317 - 318 - #include <EGL/eglext.h> 319 - +#include <EGL/eglmesaext.h> 320 - #include <algorithm> 321 - #include <cstring> 322 - #include <fstream> 323 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp 324 - index 698b51e2..32e6126f 100644 325 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp 326 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp 327 - @@ -27,6 +27,7 @@ 328 - #include "libANGLE/renderer/gl/formatutilsgl.h" 329 - 330 - #include <EGL/eglext.h> 331 - +#include <EGL/eglmesaext.h> 332 - #include <algorithm> 333 - #include <sstream> 334 - 335 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp 336 - index 5b686321..16ae890f 100644 337 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp 338 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp 339 - @@ -18,6 +18,7 @@ 340 - #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h" 341 - 342 - #include <EGL/eglext.h> 343 - +#include <EGL/eglmesaext.h> 344 - 345 - namespace rx 346 - { 347 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp 348 - index 12679ba7..93503812 100644 349 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp 350 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp 351 - @@ -28,6 +28,7 @@ 352 - #include "platform/Platform.h" 353 - 354 - #include <EGL/eglext.h> 355 - +#include <EGL/eglmesaext.h> 356 - #include <sstream> 357 - #include <string> 358 - 359 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp 360 - index df900f4d..4385be88 100644 361 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp 362 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp 363 - @@ -13,6 +13,7 @@ 364 - #include "libANGLE/renderer/vulkan/vk_utils.h" 365 - 366 - #include <EGL/eglext.h> 367 - +#include <EGL/eglmesaext.h> 368 - 369 - #include "common/debug.h" 370 - #include "common/platform.h" 371 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp 372 - index 1c0b25f4..64e96f73 100644 373 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp 374 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp 375 - @@ -22,6 +22,7 @@ 376 - #include "libANGLE/formatutils.h" 377 - 378 - #include <EGL/eglext.h> 379 - +#include <EGL/eglmesaext.h> 380 - 381 - namespace egl 382 - { 383 - diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h 384 - index a671bb0d..248f0ae8 100644 385 - --- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h 386 - +++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h 387 - @@ -15,6 +15,7 @@ 388 - 389 - #include <EGL/egl.h> 390 - #include <EGL/eglext.h> 391 - +#include <EGL/eglmesaext.h> 392 - 393 - namespace gl 394 - { 395 - diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h 396 - index ae4a427c..a802b65d 100644 397 - --- a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h 398 - +++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h 399 - @@ -13,6 +13,7 @@ 400 - 401 - #include <EGL/egl.h> 402 - #include <EGL/eglext.h> 403 - +#include <EGL/eglmesaext.h> 404 - 405 - extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig; 406 - extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers; 407 - diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h 408 - index 3c64b290..96201b31 100644 409 - --- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h 410 - +++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h 411 - @@ -11,6 +11,7 @@ 412 - 413 - #include <EGL/egl.h> 414 - #include <EGL/eglext.h> 415 - +#include <EGL/eglmesaext.h> 416 - #include <export.h> 417 - 418 - extern "C" { 419 - diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp 420 - index 777b09e1..dbb0bd2f 100644 421 - --- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp 422 - +++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp 423 - @@ -24,6 +24,7 @@ 424 - 425 - #include <EGL/egl.h> 426 - #include <EGL/eglext.h> 427 - +#include <EGL/eglmesaext.h> 428 - 429 - #include "deClock.h" 430 - #include "deMemory.h" 431 - diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp 432 - index 6b4a25bf..1c4ac864 100644 433 - --- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp 434 - +++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp 435 - @@ -22,6 +22,7 @@ 436 - 437 - #include <EGL/egl.h> 438 - #include <EGL/eglext.h> 439 - +#include <EGL/eglmesaext.h> 440 - 441 - #include "egluGLContextFactory.hpp" 442 - #include "tcuANGLENativeDisplayFactory.h" 443 - diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp 444 - index 90abb931..aea4e153 100644 445 - --- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp 446 - +++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp 447 - @@ -10,6 +10,7 @@ 448 - 449 - #include <EGL/egl.h> 450 - #include <EGL/eglext.h> 451 - +#include <EGL/eglmesaext.h> 452 - #include <X11/Xlib.h> 453 - 454 - #include "test_utils/ANGLETest.h" 455 - diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h 456 - index e888a239..71606b8c 100644 457 - --- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h 458 - +++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h 459 - @@ -11,6 +11,7 @@ 460 - 461 - #include <EGL/egl.h> 462 - #include <EGL/eglext.h> 463 - +#include <EGL/eglmesaext.h> 464 - 465 - #include <string> 466 - 467 - diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp 468 - index 7fdddcc6..e40b8905 100644 469 - --- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp 470 - +++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp 471 - @@ -10,6 +10,7 @@ 472 - 473 - #include <EGL/egl.h> 474 - #include <EGL/eglext.h> 475 - +#include <EGL/eglmesaext.h> 476 - 477 - #include <map> 478 - #include <string> 479 - diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h 480 - index 7bc7a027..ebb2827b 100644 481 - --- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h 482 - +++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h 483 - @@ -16,6 +16,7 @@ 484 - 485 - #include <EGL/egl.h> 486 - #include <EGL/eglext.h> 487 - +#include <EGL/eglmesaext.h> 488 - 489 - #include "GLSLANG/ShaderLang.h" 490 - #include "angle_test_instantiate.h" 491 - diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h 492 - index ba6ccf4a..563d2578 100644 493 - --- a/Source/ThirdParty/ANGLE/util/OSPixmap.h 494 - +++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h 495 - @@ -13,6 +13,7 @@ 496 - 497 - #include <EGL/egl.h> 498 - #include <EGL/eglext.h> 499 - +#include <EGL/eglmesaext.h> 500 - 501 - #include "util/Event.h" 502 - #include "util/util_export.h" 503 - diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h 504 - index 3cdb458c..3178fa44 100644 505 - --- a/Source/ThirdParty/ANGLE/util/OSWindow.h 506 - +++ b/Source/ThirdParty/ANGLE/util/OSWindow.h 507 - @@ -15,6 +15,7 @@ 508 - 509 - #include <EGL/egl.h> 510 - #include <EGL/eglext.h> 511 - +#include <EGL/eglmesaext.h> 512 - 513 - #include "util/Event.h" 514 - #include "util/util_export.h" 515 - diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h 516 - index 5fbec82f..77a30330 100644 517 - --- a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h 518 - +++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h 519 - @@ -15,6 +15,7 @@ 520 - 521 - #include <EGL/egl.h> 522 - #include <EGL/eglext.h> 523 - +#include <EGL/eglmesaext.h> 524 - 525 - ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig; 526 - ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers; 527 - diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 528 - index a8a82d70..050893a9 100644 529 - --- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 530 - +++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 531 - @@ -29,6 +29,7 @@ 532 - #else 533 - #include <EGL/egl.h> 534 - #include <EGL/eglext.h> 535 - +#include <EGL/eglmesaext.h> 536 - #endif 537 - 538 - #if USE(CAIRO) 539 - diff --git a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 540 - index 05f92c22..636df34a 100644 541 - --- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 542 - +++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 543 - @@ -35,6 +35,7 @@ 544 - #include <wayland-egl.h> 545 - #include <EGL/egl.h> 546 - #include <EGL/eglext.h> 547 - +#include <EGL/eglmesaext.h> 548 - #include <wtf/Assertions.h> 549 - 550 - namespace WebCore { 551 - diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 552 - index 8c81119b..bf9ed4bd 100644 553 - --- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 554 - +++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 555 - @@ -38,6 +38,7 @@ 556 - #if USE(EGL) 557 - #include <EGL/egl.h> 558 - #include <EGL/eglext.h> 559 - +#include <EGL/eglmesaext.h> 560 - #endif 561 - 562 - namespace WebCore { 563 - diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 564 - index 973b3168..5586236a 100644 565 - --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 566 - +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 567 - @@ -35,6 +35,7 @@ 568 - #include <gdk/gdkwayland.h> 569 - #include <EGL/egl.h> 570 - #include <EGL/eglext.h> 571 - +#include <EGL/eglmesaext.h> 572 - #include <WebCore/CairoUtilities.h> 573 - #include <WebCore/GLContext.h> 574 - 575 1 diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp 576 2 index 8d848ce4..46d42c11 100644 577 3 --- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp