From 922e6366e29b78edf8b8d864a124a7de23d572c5 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Wed, 18 Sep 2019 21:38:59 +0200
Subject: [PATCH 1/3] libepoxy: fix typo

---
 packages/graphics/libepoxy/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graphics/libepoxy/package.mk b/packages/graphics/libepoxy/package.mk
index 21d48e0c3a..0c4ad61989 100644
--- a/packages/graphics/libepoxy/package.mk
+++ b/packages/graphics/libepoxy/package.mk
@@ -25,5 +25,5 @@ if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
 fi
 
 if [ "${DISPLAYSERVER}" != "x11" ]; then
-  PKG_MESON_OPTS_TARGET="-D glx=no"
+  PKG_MESON_OPTS_TARGET="-Dglx=no"
 fi

From 243dc0877a8098e8d97525740c0f41b1158cd477 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Wed, 18 Sep 2019 21:40:01 +0200
Subject: [PATCH 2/3] xf86-video-nvidia: restore the mess

---
 .../x11/driver/xf86-video-nvidia/package.mk   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index 15db0f100a..688e483be7 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -34,7 +34,7 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers
-    cp -P nvidia_drv.so           ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-main_drv.so
+    cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-main_drv.so
     ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so
 
   mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions
@@ -45,28 +45,28 @@ makeinstall_target() {
     cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11
 
   mkdir -p ${INSTALL}/usr/lib
-    cp -P libnvidia-glcore.so.${PKG_VERSION}   ${INSTALL}/usr/lib
-    cp -P libnvidia-ml.so.${PKG_VERSION}       ${INSTALL}/usr/lib
-    ln -sf /var/lib/libnvidia-ml.so.1          ${INSTALL}/usr/lib/libnvidia-ml.so.1
-    cp -P libnvidia-tls.so.${PKG_VERSION}      ${INSTALL}/usr/lib
-    cp -P libGLX_nvidia.so.${PKG_VERSION}      ${INSTALL}/usr/lib/libGLX_nvidia.so.0
+    cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib
+    cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib
+    ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1
+    cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib
+    cp -P libGLX_nvidia.so.${PKG_VERSION} ${INSTALL}/usr/lib/libGLX_nvidia.so.0
 
   mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia
-    ln -sf /var/lib/nvidia.ko      ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko
-    cp -P kernel/nvidia-uvm.ko     ${INSTALL}/$(get_full_module_dir)/nvidia
+    ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko
+    cp -P kernel/nvidia-uvm.ko ${INSTALL}/$(get_full_module_dir)/nvidia
     cp -P kernel/nvidia-modeset.ko ${INSTALL}/$(get_full_module_dir)/nvidia
 
   mkdir -p ${INSTALL}/usr/lib/nvidia
     cp -P kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia
 
   mkdir -p ${INSTALL}/usr/bin
-    ln -s /var/lib/nvidia-smi     ${INSTALL}/usr/bin/nvidia-smi
-    cp nvidia-smi                 ${INSTALL}/usr/bin/nvidia-main-smi
+    ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi
+    cp nvidia-smi ${INSTALL}/usr/bin/nvidia-main-smi
     ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig
-    cp nvidia-xconfig             ${INSTALL}/usr/bin/nvidia-main-xconfig
+    cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-main-xconfig
 
   mkdir -p ${INSTALL}/usr/lib/vdpau
-    cp libvdpau_nvidia.so*               ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
-    ln -sf /var/lib/libvdpau_nvidia.so   ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
+    cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-main.so.1
+    ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so
     ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
 }

From 1f9c62f4d1b535a3772f2d4115c2b958b67a1967 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Wed, 18 Sep 2019 21:40:28 +0200
Subject: [PATCH 3/3] xorg-server: restore the mess

---
 .../xorg-server/scripts/xorg-configure        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure
index 045e842876..02774711ea 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
@@ -58,33 +58,33 @@ 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/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
-    ln -sf /usr/lib/nvidia/nvidia.ko                         /var/lib/nvidia.ko
-    ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1          /var/lib/libvdpau_nvidia.so.1
-    ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1          /var/lib/libvdpau_nvidia.so
-    ln -sf /usr/bin/nvidia-main-smi                          /var/lib/nvidia-smi
-    ln -sf /usr/bin/nvidia-main-xconfig                      /var/lib/nvidia-xconfig
+    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
+    ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko
+    ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1
+    ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so
+    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
     XORG_ARGS="${XORG_ARGS} -ignoreABI"
   # Used to support GeForce 500 Series & older
   elif [ "${1}" = "nvidia-legacy" ]; then
-    ln -sf /usr/lib/libGL_nvidia-legacy.so.1                        /var/lib/libGL.so
+    ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so
-    ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@         /var/lib/libnvidia-ml.so.1
-    ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so       /var/lib/nvidia_drv.so
-    ln -sf /usr/lib/nvidia-legacy/nvidia.ko                         /var/lib/nvidia.ko
-    ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1               /var/lib/libvdpau_nvidia.so.1
-    ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1               /var/lib/libvdpau_nvidia.so
-    ln -sf /usr/bin/nvidia-legacy-smi                               /var/lib/nvidia-smi
-    ln -sf /usr/bin/nvidia-legacy-xconfig                           /var/lib/nvidia-xconfig
+    ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1
+    ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so
+    ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko
+    ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1
+    ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so
+    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
     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/libGL_glvnd.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
   fi