From 95b22619e08adc3d407925c5eb4758dd9164c8fa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 21 Apr 2019 00:35:57 +0000
Subject: [PATCH] Fix missing headers when building without X11

The deleted includes are redundant, because other headers will include
the necessary files. Additionally, they cause build failures, because
including EGL/egl.h or EGL/eglext.h directly, instead of through
wlr/render/egl.h or wlr/render/interface.h, will mean that
MESA_EGL_NO_X11_HEADERS will not have been defined, and so the EGL
headers will attempt to pull in unnecessary X11 headers that may not
exist on the system.

For the headers produced by glgen.sh, the includes couldn't simply be
deleted, because no other header would include the EGL headers. Neither
wlr/render/egl.h or wlr/render/interface.h felt appropriate to include,
so I opted instead to copy the MESA_EGL_NO_X11_HEADERS definition before
the EGL includes.
---
 backend/drm/drm.c         | 2 --
 backend/drm/renderer.c    | 2 --
 backend/headless/output.c | 2 --
 backend/wayland/backend.c | 2 --
 glgen.sh                  | 5 +++++
 include/render/gles2.h    | 2 --
 render/egl.c              | 2 --
 rootston/output.c         | 1 -
 8 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index f179f835..f86f63b8 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -2,8 +2,6 @@
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <drm_mode.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <errno.h>
 #include <gbm.h>
 #include <GLES2/gl2.h>
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 72cfd430..1771e725 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -1,6 +1,4 @@
 #include <assert.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <gbm.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/backend/headless/output.c b/backend/headless/output.c
index b3b41d46..6d3b6f96 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -1,6 +1,4 @@
 #include <assert.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <stdlib.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/wlr_renderer.h>
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 2a937de7..7c8bb4e0 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -5,8 +5,6 @@
 
 #include <wlr/config.h>
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <wayland-server.h>
 
 #include <wlr/backend/interface.h>
diff --git a/glgen.sh b/glgen.sh
index fb3bb3c6..daa98b00 100755
--- a/glgen.sh
+++ b/glgen.sh
@@ -62,6 +62,11 @@ cat > "$OUTDIR/$BASE.h" << EOF
 #define $INCLUDE_GUARD
 
 #include <stdbool.h>
+#include <wlr/config.h>
+
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
+#define MESA_EGL_NO_X11_HEADERS
+#endif
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 593c7d1c..7e0782d4 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -1,8 +1,6 @@
 #ifndef RENDER_GLES2_H
 #define RENDER_GLES2_H
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <stdbool.h>
diff --git a/render/egl.c b/render/egl.c
index 450f8fc7..ceed1fe6 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -1,5 +1,3 @@
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
 #include <assert.h>
 #include <drm_fourcc.h>
 #include <stdio.h>
diff --git a/rootston/output.c b/rootston/output.c
index dd1f010b..e83cdc1f 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -13,7 +13,6 @@
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
-#include <wlr/xwayland.h>
 #include "rootston/config.h"
 #include "rootston/layers.h"
 #include "rootston/output.h"