99 lines
3.0 KiB
Diff
99 lines
3.0 KiB
Diff
From 4b10693a62c06234fae69c3f50dc9af541b6d804 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 4 Nov 2019 20:03:17 +0100
|
|
Subject: [PATCH xserver] 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>
|
|
---
|
|
glamor/glamor_egl.h | 1 +
|
|
glamor/glamor_priv.h | 1 +
|
|
hw/xwayland/xwayland-glamor-eglstream.c | 1 +
|
|
hw/xwayland/xwayland-glamor-gbm.c | 1 +
|
|
hw/xwayland/xwayland-glamor.c | 1 +
|
|
6 files changed, 6 insertions(+)
|
|
|
|
diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
|
|
index 2f7566b24..8f6ed7840 100644
|
|
--- a/glamor/glamor_egl.h
|
|
+++ b/glamor/glamor_egl.h
|
|
@@ -28,6 +28,7 @@
|
|
#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 10c74c1b5..ea7a8bc96 100644
|
|
--- a/glamor/glamor_priv.h
|
|
+++ b/glamor/glamor_priv.h
|
|
@@ -40,6 +40,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..36b749aaf 100644
|
|
--- a/hw/xwayland/xwayland-glamor-eglstream.c
|
|
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
|
|
@@ -33,6 +33,7 @@
|
|
#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 354695060..e3d35ce10 100644
|
|
--- a/hw/xwayland/xwayland-glamor-gbm.c
|
|
+++ b/hw/xwayland/xwayland-glamor-gbm.c
|
|
@@ -36,6 +36,7 @@
|
|
#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 dc07f7933..bf7f0ffb4 100644
|
|
--- a/hw/xwayland/xwayland-glamor.c
|
|
+++ b/hw/xwayland/xwayland-glamor.c
|
|
@@ -26,6 +26,7 @@
|
|
#include "xwayland.h"
|
|
|
|
#define MESA_EGL_NO_X11_HEADERS
|
|
+#define EGL_NO_X11
|
|
#include <glamor_egl.h>
|
|
|
|
#include <glamor.h>
|
|
--
|
|
2.23.0
|
|
|