diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-27 10:06:51 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-27 10:06:51 +0000 |
| commit | 1b5f36062887f3af038ef894e7684b2c7c820d3a (patch) | |
| tree | 3efefe8d994891cf85490084806b8f8448ab2c55 /user/cogl/fix-wayland-egl-check.patch | |
| parent | 72532a92425e0a589051e8b4d15d37100854b3c7 (diff) | |
| parent | 2b9ac7f02392d3f255042f9f76cec3259b63a71d (diff) | |
| download | packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.gz packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.bz2 packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.xz packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.zip | |
Merge branch 'bump.aerdan.20190426' into 'master'
Bump.aerdan.20190426
See merge request !224
Diffstat (limited to 'user/cogl/fix-wayland-egl-check.patch')
| -rw-r--r-- | user/cogl/fix-wayland-egl-check.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/user/cogl/fix-wayland-egl-check.patch b/user/cogl/fix-wayland-egl-check.patch deleted file mode 100644 index 72ec484e5..000000000 --- a/user/cogl/fix-wayland-egl-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c cogl-1.22.2.new/cogl/winsys/cogl-winsys-egl.c ---- cogl-1.22.2/cogl/winsys/cogl-winsys-egl.c 2016-08-26 11:18:16.000000000 -0500 -+++ cogl-1.22.2.new/cogl/winsys/cogl-winsys-egl.c 2018-09-07 08:28:36.950138458 -0500 -@@ -1029,7 +1029,7 @@ - egl_ctx = EGL_NO_CONTEXT; - else - #endif --#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT -+#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT - /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used - * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ - if (target == EGL_WAYLAND_BUFFER_WL) |