diff mbox series

[5/6] package/x11r7/xserver_xorg-server: disable GLAMOR support with NVIDIA drivers

Message ID 20200512131646.14821-5-jskrzypnik@novomatic-tech.com
State Superseded
Headers show
Series None | expand

Commit Message

Jakub Skrzypnik May 12, 2020, 1:16 p.m. UTC
NVIDIA GLX extension doesn't support GLAMOR and won't let compile X11 server.

Even if there's libglvnd enabled and you have Mesa together with it, running
X11 with GLAMOR enabled will crash on loading NVIDIA's own GLX extension.

Signed-off-by: Jakub Skrzypnik <jskrzypnik@novomatic-tech.com>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 8ccc04224d..44f93a99ed 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -191,7 +191,11 @@  XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
 XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
+ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y)
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor
+else
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
+endif
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor
 endif