From 41cbb80e25a93948459ac7785833e8e64b2f8e28 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 16 Oct 2019 15:16:53 +0200 Subject: [PATCH] Add new define EGL_NO_X11 for newer mesa library Define both MESA_EGL_NO_X11_HEADERS and EGL_NO_X11 for backward combatibility. --- glgen.sh | 7 ++++++- include/wlr/render/egl.h | 7 ++++++- include/wlr/render/interface.h | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/glgen.sh b/glgen.sh index daa98b00..7324fdf6 100755 --- a/glgen.sh +++ b/glgen.sh @@ -64,9 +64,14 @@ cat > "$OUTDIR/$BASE.h" << EOF #include #include -#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND +#ifndef MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS #endif +#ifndef EGL_NO_X11 +#define EGL_NO_X11 +#endif +#endif #include #include diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index 915de5c0..efded0b6 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -11,9 +11,14 @@ #include -#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND +#ifndef MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS #endif +#ifndef EGL_NO_X11 +#define EGL_NO_X11 +#endif +#endif #include #include diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 088b1efa..21c1e044 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -11,9 +11,14 @@ #include -#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS +#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND +#ifndef MESA_EGL_NO_X11_HEADERS #define MESA_EGL_NO_X11_HEADERS #endif +#ifndef EGL_NO_X11 +#define EGL_NO_X11 +#endif +#endif #include #include