xserver: Branch 'server-1.20-branch' - 4 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 6 18:27:12 UTC 2019
configure.ac | 4 ++--
glamor/glamor_egl.h | 1 +
glamor/glamor_priv.h | 1 +
glx/meson.build | 4 ++--
hw/xwayland/xwayland-glamor-eglstream.c | 1 +
hw/xwayland/xwayland-glamor-gbm.c | 1 +
hw/xwayland/xwayland-glamor.c | 1 +
7 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 642c1f83b9ed2452ceb20457a4423a8f52a7a8c4
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Nov 4 20:03:17 2019 +0100
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 at redhat.com>
(cherry picked from commit 741bd73429e337071f49509ddcc5fb392e20b0f6)
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 7d9a7d4fb..661c11d90 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 291e060cf..febc0b910 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 7ea6def61..48e330a0f 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>
commit 2f55e8dc270fb65e8ff013c5e846a1a510c761e0
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 9 16:03:17 2019 -0400
meson: Apparently 1.2 is < 1.2.0
Siiiigh.
(cherry picked from commit 3340ddf37743fdf197dfc16a97107435ff53c6e4)
diff --git a/glx/meson.build b/glx/meson.build
index e25e108cd..559b1feda 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -74,7 +74,7 @@ if build_glx
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
- dependency('gl', version: '>= 1.2.0'),
+ dependency('gl', version: '>= 1.2'),
],
)
commit e16eb696f2238796827794d2d3b23f268cf4daf0
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 9 15:17:47 2019 -0400
meson: Fix another reference to "gl" 9.2.0
Previous commit e6ef2b12 missed a spot.
(cherry picked from commit c7486613b0dc586f93f6ba293d9b55c69995b05c)
diff --git a/glx/meson.build b/glx/meson.build
index bd5c62fea..e25e108cd 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -74,7 +74,7 @@ if build_glx
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
- dependency('gl', version: '>= 9.2.0'),
+ dependency('gl', version: '>= 1.2.0'),
],
)
commit a57729d3180ee4bc3ae012cfd03fe5188d858a83
Author: Marvin Schmidt <marv at exherbo.org>
Date: Tue Sep 24 09:58:43 2019 +0200
build: glx: Lower gl version to work with libglvnd
When using mesa with libglvnd support, mesa will no longer install the
gl, glx, egl pkg-config files but instead let libglvnd provide them.
libglvnd maintainers decided to change the versioning as it was
mesa-specific previously. Now the libraries have versions of the API
they expose[1].
This causes problems when building the X server:
checking for glproto >= 1.4.17 gl >= 9.2.0... no
configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
Requested 'gl >= 9.2.0' but version of gl is 1.2
Lower the version requirement to 1.2 to allow building against libglvnd
provided libraries
[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
(cherry picked from commit e6ef2b12404dfec7f23592a3524d2a63d9d25802)
diff --git a/configure.ac b/configure.ac
index cb9765a70..42950ff19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -765,7 +765,7 @@ LIBDRI="dri >= 7.8.0"
LIBDRM="libdrm >= 2.4.89"
LIBEGL="egl"
LIBGBM="gbm >= 10.2.0"
-LIBGL="gl >= 7.1.0"
+LIBGL="gl >= 1.2"
LIBXEXT="xext >= 1.0.99.4"
LIBXFONT="xfont2 >= 2.0.0"
LIBXI="xi >= 1.2.99.1"
@@ -1116,7 +1116,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
yes,yes | auto,yes)
AC_DEFINE(DRI2, 1, [Build DRI2 extension])
DRI2=yes
- LIBGL="gl >= 9.2.0"
+ LIBGL="gl >= 1.2"
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
;;
esac
diff --git a/glx/meson.build b/glx/meson.build
index 69d558e78..bd5c62fea 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -39,7 +39,7 @@ if build_glx
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
- dependency('gl', version: '>= 9.2.0'),
+ dependency('gl', version: '>= 1.2'),
],
c_args: [
glx_align64,
More information about the xorg-commit
mailing list