From 7b3be8a8700b79dddee341f060a6a1c013388193 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 7 Dec 2019 14:13:29 +0100
Subject: [PATCH] nvidia390: sync with the nvidia pkg (full switch to glvnd).

- Use nvidia-drm-outputclass.conf from the nvidia pkg.
- Get rid of INSTALL/REMOVE scripts, unnecessary.
- Install libglx.so into /usr/lib/nvidia/xorg.
---
 srcpkgs/nvidia390/INSTALL  |  7 -------
 srcpkgs/nvidia390/REMOVE   |  7 -------
 srcpkgs/nvidia390/template | 13 +++++--------
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/nvidia390/INSTALL
 delete mode 100644 srcpkgs/nvidia390/REMOVE

diff --git a/srcpkgs/nvidia390/INSTALL b/srcpkgs/nvidia390/INSTALL
deleted file mode 100644
index 6b065bedb4a..00000000000
--- a/srcpkgs/nvidia390/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-post)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia390/REMOVE b/srcpkgs/nvidia390/REMOVE
deleted file mode 100644
index e4d494ca015..00000000000
--- a/srcpkgs/nvidia390/REMOVE
+++ /dev/null
@@ -1,7 +0,0 @@
-# Regenerate initramfs.
-case ${ACTION} in
-purge)
-	echo "Regenerating initramfs, please wait..."
-	dracut -f -q --regenerate-all
-	;;
-esac
diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index 52f2c5bdcd2..fdd8cb72b83 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -50,8 +50,9 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions
-	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx-nvidia.so
+	vinstall libglx.so.${version} 755 usr/lib/nvidia/xorg
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so.1
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/nvidia/xorg/libglx.so
 
 	# GLX client libs
 	# Required for GLVND option
@@ -206,12 +207,9 @@ do_install() {
 	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
 	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
 
-	# Omit drm dracut module too
-	vmkdir usr/lib/dracut/dracut.conf.d
-	echo "omit_dracutmodules+=\" drm \"" > ${DESTDIR}/usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-
 	vmkdir /usr/share/X11/xorg.conf.d/
-	vinstall nvidia-drm-outputclass.conf 644 /usr/share/X11/xorg.conf.d 30-nvidia-drm-outputclass.conf
+	vinstall ${XBPS_SRCPKGDIR}/nvidia/files/nvidia-drm-outputclass.conf \
+		644 /usr/share/X11/xorg.conf.d 10-nvidia-drm-outputclass.conf
 }
 
 nvidia390-gtklibs_package() {
@@ -234,7 +232,6 @@ nvidia390-dkms_package() {
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modprobe.d
-		vmove usr/lib/dracut
 	}
 }
 nvidia390-opencl_package() {