libepoxy: Define MESA_EGL_NO_X11_HEADERS when GLX is disabled

This helps when libepoxy is compiled with egl but glx is disabled
it also depends on GL implementation provided eglplatform.h to be
using MESA_EGL_NO_X11_HEADERS to exclude X11 headers, e.g. mesa,
mali-userland implementations use this define to exclude x11
headers

(From OE-Core rev: 2655f7d26847424ac207e6e468a78a4ad293c4e9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 31 insertions, 0 deletions

diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch
new file mode 100644
index 0000000000..ebe5754a7a
--- /dev/null
+++ b/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch
@@ -0,0 +1,30 @@
+From 62e178ddae24c7633d2a03b129dc52261e0a15bf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 7 Feb 2018 00:48:03 -0800
+Subject: [PATCH] Define MESA_EGL_NO_X11_HEADERS before including eglplatform.h
+ when X11 is disabled
+
+This helps in compiling when GL implementations e.g. mesa use
+this define to exclude X11 headers
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted [https://github.com/anholt/libepoxy/pull/153]
+
+ src/dispatch_common.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: libepoxy-1.4.3/src/dispatch_common.h
+===================================================================
+--- libepoxy-1.4.3.orig/src/dispatch_common.h
++++ libepoxy-1.4.3/src/dispatch_common.h
+@@ -46,6 +46,9 @@
+ #include "epoxy/glx.h"
+ #endif
+ #if PLATFORM_HAS_EGL
++#if !PLATFORM_HAS_GLX
++#define MESA_EGL_NO_X11_HEADERS 1
++#endif
+ #include "epoxy/egl.h"
+ #endif
+ #if PLATFORM_HAS_WGL
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
index 72167a2fb8..8a5cb8f49f 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
 SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
            file://Add-fallback-definition-for-EGL-CAST.patch \
            file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \
+           file://0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch \
            "
 SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed"
 SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6"