From 80d7c1ad75cc4cd3aa844d5ff34fee723966d9fc Mon Sep 17 00:00:00 2001
From: fafryd <dz1125.bug.tracker@gmail.com>
Date: Sat, 19 Oct 2019 21:58:09 +0200
Subject: [PATCH] replace MESA_EGL_NO_X11_HEADERS hack with upstream EGL_NO_X11

---
 glamor/glamor_egl.h                     | 2 +-
 glamor/glamor_priv.h                    | 2 +-
 hw/xwayland/xwayland-glamor-eglstream.c | 2 +-
 hw/xwayland/xwayland-glamor-gbm.c       | 2 +-
 hw/xwayland/xwayland-glamor.c           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
index 2f7566b24..af1c707d2 100644
--- a/glamor/glamor_egl.h
+++ b/glamor/glamor_egl.h
@@ -27,7 +27,7 @@
 #ifndef GLAMOR_EGL_H
 #define GLAMOR_EGL_H
 
-#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <glamor_egl_ext.h>
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 7d9a7d4fb..bcdaf4040 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -39,7 +39,7 @@
 
 #include <epoxy/gl.h>
 #ifdef GLAMOR_HAS_GBM
-#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
 #include <epoxy/egl.h>
 #endif
 
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index c62c0d2ac..e665b963e 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -32,7 +32,7 @@
 #include "wayland-eglstream-client-protocol.h"
 #include "wayland-eglstream-controller-client-protocol.h"
 
-#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
 #include <glamor_egl.h>
 #include <glamor.h>
 #include <glamor_transform.h>
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 291e060cf..c92d6073f 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -35,7 +35,7 @@
 #include <xf86drm.h>
 #include <drm_fourcc.h>
 
-#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
 #include <gbm.h>
 #include <glamor_egl.h>
 
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 7ea6def61..587ef5ed0 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -25,7 +25,7 @@
 
 #include "xwayland.h"
 
-#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
 #include <glamor_egl.h>
 
 #include <glamor.h>
-- 
2.23.0