From aff99f040a4d8c454f4a3cb817f71e8f460d6fe9 Mon Sep 17 00:00:00 2001
From: SupervisedThinking <supervisedthinking@gmail.com>
Date: Thu, 23 Dec 2021 18:58:55 +0100
Subject: [PATCH] xorg-server: updated configure script - updated GLX lib
 handling - added indirect rendering

---
 .../xserver/xorg-server/scripts/xorg-configure   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure
index 02774711ea..a7e9a97c35 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
@@ -58,7 +58,6 @@ logger -t Xorg "### creating needed directories and symlinks ###"
 
   # Used to support GeForce 600 Series & newer
   if [ "${1}" = "nvidia" ]; then
-    ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
     ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1
     ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so
@@ -68,6 +67,11 @@ logger -t Xorg "### creating needed directories and symlinks ###"
     ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi
     ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig
     insmod /var/lib/nvidia.ko
+    # GL/GLX (GLVND)
+    ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
+    ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
+    # indirect rendering
+    ln -sf /usr/lib/libGLX_nvidia.so.0 /var/lib/libGLX_indirect.so.0
     XORG_ARGS="${XORG_ARGS} -ignoreABI"
   # Used to support GeForce 500 Series & older
   elif [ "${1}" = "nvidia-legacy" ]; then
@@ -81,11 +85,19 @@ logger -t Xorg "### creating needed directories and symlinks ###"
     ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi
     ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig
     insmod /var/lib/nvidia.ko
+    # GLX (NON-GLVND)
+    ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX.so
+    # indirect rendering
+    ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX_indirect.so.0
     XORG_ARGS="${XORG_ARGS} -ignoreABI"
   # Used for AMD & Intel GPUs supported by MESA 3D
   else
-    ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
+    # GL/GLX (GLVND)
+    ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
+    ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
+    # indirect rendering
+    ln -sf /usr/lib/libGLX_mesa.so.0 /var/lib/libGLX_indirect.so.0
   fi
 
 ################################################################################