glamor/xwayland: Define EGL_NO_X11
Define EGL_NO_X11 everywhere were we also define MESA_EGL_NO_X11_HEADERS,
EGL_NO_X11 is the MESA_EGL_NO_X11_HEADERS equivalent for the egl headers
shipped with libglvnd.
This fixes the xserver not building with the libglvnd-1.2.0 headers:
In file included from /usr/include/EGL/eglplatform.h:128,
from /usr/include/epoxy/egl_generated.h:11,
from /usr/include/epoxy/egl.h:46,
from glamor_priv.h:43,
from glamor_composite_glyphs.c:25:
/usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC'
222 | *GC;
| ^~
In file included from glamor.h:34,
from glamor_priv.h:32,
from glamor_composite_glyphs.c:25:
../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here
282 | } GC;
| ^~
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit 741bd73429
)
This commit is contained in:
parent
2f55e8dc27
commit
642c1f83b9
|
@ -28,6 +28,7 @@
|
||||||
#define GLAMOR_EGL_H
|
#define GLAMOR_EGL_H
|
||||||
|
|
||||||
#define MESA_EGL_NO_X11_HEADERS
|
#define MESA_EGL_NO_X11_HEADERS
|
||||||
|
#define EGL_NO_X11
|
||||||
#include <epoxy/gl.h>
|
#include <epoxy/gl.h>
|
||||||
#include <epoxy/egl.h>
|
#include <epoxy/egl.h>
|
||||||
#include <glamor_egl_ext.h>
|
#include <glamor_egl_ext.h>
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include <epoxy/gl.h>
|
#include <epoxy/gl.h>
|
||||||
#ifdef GLAMOR_HAS_GBM
|
#ifdef GLAMOR_HAS_GBM
|
||||||
#define MESA_EGL_NO_X11_HEADERS
|
#define MESA_EGL_NO_X11_HEADERS
|
||||||
|
#define EGL_NO_X11
|
||||||
#include <epoxy/egl.h>
|
#include <epoxy/egl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "wayland-eglstream-controller-client-protocol.h"
|
#include "wayland-eglstream-controller-client-protocol.h"
|
||||||
|
|
||||||
#define MESA_EGL_NO_X11_HEADERS
|
#define MESA_EGL_NO_X11_HEADERS
|
||||||
|
#define EGL_NO_X11
|
||||||
#include <glamor_egl.h>
|
#include <glamor_egl.h>
|
||||||
#include <glamor.h>
|
#include <glamor.h>
|
||||||
#include <glamor_transform.h>
|
#include <glamor_transform.h>
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <drm_fourcc.h>
|
#include <drm_fourcc.h>
|
||||||
|
|
||||||
#define MESA_EGL_NO_X11_HEADERS
|
#define MESA_EGL_NO_X11_HEADERS
|
||||||
|
#define EGL_NO_X11
|
||||||
#include <gbm.h>
|
#include <gbm.h>
|
||||||
#include <glamor_egl.h>
|
#include <glamor_egl.h>
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "xwayland.h"
|
#include "xwayland.h"
|
||||||
|
|
||||||
#define MESA_EGL_NO_X11_HEADERS
|
#define MESA_EGL_NO_X11_HEADERS
|
||||||
|
#define EGL_NO_X11
|
||||||
#include <glamor_egl.h>
|
#include <glamor_egl.h>
|
||||||
|
|
||||||
#include <glamor.h>
|
#include <glamor.h>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user