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 Signed-off-by: Tom Hochstein <[email protected]> --- .../Add-fallback-definition-for-EGL-CAST.patch | 31 ++++++++++++++++++++++ recipes-graphics/libepoxy/libepoxy_%.bbappend | 3 +++ 2 files changed, 34 insertions(+) create mode 100644 recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch create mode 100644 recipes-graphics/libepoxy/libepoxy_%.bbappend diff --git a/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch new file mode 100644 index 0000000..daa1785 --- /dev/null +++ b/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch @@ -0,0 +1,31 @@ +Add fallback definition for EGL_CAST + +The EGL API update from d11104f introduced a dependency on the +EGL_CAST() macro, provided by an updated eglplatform.h. Given that we +don't provide eglplatform.h, add a fallback definition for if we're +building against Mesa 17.0.x or similar. + +https://bugs.gentoo.org/show_bug.cgi?id=623926 + +Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] + +Index: libepoxy-1.4.3/src/gen_dispatch.py +=================================================================== +--- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500 ++++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 +@@ -491,6 +491,15 @@ + self.outln('#include "epoxy/gl.h"') + if self.target == "egl": + self.outln('#include "EGL/eglplatform.h"') ++ # Account for older eglplatform.h, which doesn't define ++ # the EGL_CAST macro. ++ self.outln('#ifndef EGL_CAST') ++ self.outln('#if defined(__cplusplus)') ++ self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))') ++ self.outln('#else') ++ self.outln('#define EGL_CAST(type, value) ((type) (value))') ++ self.outln('#endif') ++ self.outln('#endif') + else: + # Add some ridiculous inttypes.h redefinitions that are + # from khrplatform.h and not included in the XML. We diff --git a/recipes-graphics/libepoxy/libepoxy_%.bbappend b/recipes-graphics/libepoxy/libepoxy_%.bbappend new file mode 100644 index 0000000..2655037 --- /dev/null +++ b/recipes-graphics/libepoxy/libepoxy_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://Add-fallback-definition-for-EGL-CAST.patch" -- 1.9.1 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
