diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2017-11-18 09:02:20 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:32 +0000 |
commit | 6e181f94d6497f40cd4134b9b815df82519b2e32 (patch) | |
tree | 029190a347b5b0619d93938cfced1ad65d5f7e35 /meta/recipes-graphics/libepoxy/libepoxy | |
parent | ae8d879006064f0a8bf6f26332bf5ef922a64e5c (diff) | |
download | poky-6e181f94d6497f40cd4134b9b815df82519b2e32.tar.gz |
libepoxy: Fix build break for EGL_CAST dependency
This is a backport [1] to fix the following build error:
| In file included from /home/r60874/upstream/xwayland/tmp/work/armv7at2hf-neon-mx6qdl-fslc-linux-gnueabi/gtk+3/3.22.17-r0/recipe-sysroot/usr/include/epoxy/egl.h:46:0,
| from ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.h:32,
| from ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c:24:
| ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize':
| ../../../gtk+-3.22.17/gdk/wayland/gdkglcontext-wayland.c:179:43: error: expected expression before 'EGLContext'
| : EGL_NO_CONTEXT,
| ^
[1] https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8
(From OE-Core rev: b468e28194be39f6d6a2084bb51773c45253d5f7)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libepoxy/libepoxy')
-rw-r--r-- | meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch new file mode 100644 index 0000000000..b9297257dc --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Add fallback definition for EGL_CAST | ||
2 | |||
3 | The EGL API update from d11104f introduced a dependency on the | ||
4 | EGL_CAST() macro, provided by an updated eglplatform.h. Given that we | ||
5 | don't provide eglplatform.h, add a fallback definition for if we're | ||
6 | building against Mesa 17.0.x or similar. | ||
7 | |||
8 | https://bugs.gentoo.org/show_bug.cgi?id=623926 | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] | ||
11 | |||
12 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | ||
13 | |||
14 | Index: libepoxy-1.4.3/src/gen_dispatch.py | ||
15 | =================================================================== | ||
16 | --- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500 | ||
17 | +++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 | ||
18 | @@ -491,6 +491,15 @@ | ||
19 | self.outln('#include "epoxy/gl.h"') | ||
20 | if self.target == "egl": | ||
21 | self.outln('#include "EGL/eglplatform.h"') | ||
22 | + # Account for older eglplatform.h, which doesn't define | ||
23 | + # the EGL_CAST macro. | ||
24 | + self.outln('#ifndef EGL_CAST') | ||
25 | + self.outln('#if defined(__cplusplus)') | ||
26 | + self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))') | ||
27 | + self.outln('#else') | ||
28 | + self.outln('#define EGL_CAST(type, value) ((type) (value))') | ||
29 | + self.outln('#endif') | ||
30 | + self.outln('#endif') | ||
31 | else: | ||
32 | # Add some ridiculous inttypes.h redefinitions that are | ||
33 | # from khrplatform.h and not included in the XML. We | ||