From fff9293c9b3cd5ab27eeb46f726bff60f04b6f76 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Sat, 26 Oct 2019 11:34:44 +0200
Subject: [PATCH] app/internal/window: work around missing
 MESA_EGL_NO_X11_HEADERS support

Some versions of eglplatform.h don't support the MESA_EGL_NO_X11_HEADER
define for cross-platform definitions of the EGL types. Remove the
define and use an explicit cast instead.

Fixes gio#46

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 app/internal/window/egl_linux.go   | 1 -
 app/internal/window/egl_wayland.go | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/internal/window/egl_linux.go b/app/internal/window/egl_linux.go
index da83c6e1..12fe4837 100644
--- a/app/internal/window/egl_linux.go
+++ b/app/internal/window/egl_linux.go
@@ -4,7 +4,6 @@ package window
 
 /*
 #cgo LDFLAGS: -lEGL
-#cgo CFLAGS: -DMESA_EGL_NO_X11_HEADERS
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/app/internal/window/egl_wayland.go b/app/internal/window/egl_wayland.go
index 0fdb6014..dbf5ce3b 100644
--- a/app/internal/window/egl_wayland.go
+++ b/app/internal/window/egl_wayland.go
@@ -38,7 +38,7 @@ func (w *window) eglDestroy() {
 }
 
 func (w *window) eglDisplay() _EGLNativeDisplayType {
-	return _EGLNativeDisplayType(w.display())
+	return _EGLNativeDisplayType(unsafe.Pointer(w.display()))
 }
 
 func (w *window) eglWindow(visID int) (_EGLNativeWindowType, int, int, error) {