From abb79bf6407dae3d5a9922e7d62e115de2b08c66 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Mon, 2 Sep 2019 23:40:50 +0200
Subject: [PATCH] xf86-video-nvidia: updated to support libglvnd / clean up

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

diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk
index f16813c7aa..15db0f100a 100644
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@@ -11,63 +11,62 @@ PKG_SHA256="19ff49073e88245666825722e2c814d369ab4d01b2883a954ce0bfbe9c3b22ab"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.nvidia.com/"
-PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
-PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server libvdpau"
-PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PKG_VERSION}/NVIDIA-Linux-x86_64-${PKG_VERSION}-no-compat32.run"
+PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server libvdpau libglvnd"
+PKG_NEED_UNPACK="${LINUX_DEPENDS}"
 PKG_LONGDESC="The Xorg driver for NVIDIA video chips."
 PKG_TOOLCHAIN="manual"
 
 unpack() {
-  [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
+  [ -d ${PKG_BUILD} ] && rm -rf ${PKG_BUILD}
 
-  sh $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME --extract-only --target $PKG_BUILD
+  sh ${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME} --extract-only --target ${PKG_BUILD}
 }
 
 make_target() {
   unset LDFLAGS
 
   cd kernel
-    make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
-    $STRIP --strip-debug nvidia.ko
+    make module CC=${CC} SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
+    ${STRIP} --strip-debug nvidia.ko
   cd ..
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
-    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}/drivers
+    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
-  # rename to not conflicting with Mesa libGL.so
-    cp -P libglxserver_nvidia.so.$PKG_VERSION $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
+  mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions
+  # rename to avoid conflicts with X.Org-Server module libglx.so 
+    cp -P libglxserver_nvidia.so.${PKG_VERSION} ${INSTALL}/${XORG_PATH_MODULES}/extensions/libglx_nvidia.so
 
-  mkdir -p $INSTALL/etc/X11
-    cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
+  mkdir -p ${INSTALL}/etc/X11
+    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
-  # rename to not conflicting with Mesa libGL.so
-    cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1
+  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
 
-  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
-    cp -P kernel/nvidia-modeset.ko $INSTALL/$(get_full_module_dir)/nvidia
+  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
+    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/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-xconfig $INSTALL/usr/bin/nvidia-xconfig
-    cp nvidia-xconfig $INSTALL/usr/bin/nvidia-main-xconfig
+  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-xconfig ${INSTALL}/usr/bin/nvidia-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
-    ln -sf /var/lib/libvdpau_nvidia.so.1 $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so.1
+  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
+    ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1
 }