x11-drivers/nvidia-drivers : version bump (v460.39)

6 files changed, 10 insertions, 29 deletions

diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild
index 22df8001..84610822 100644
--- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild
+++ b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild
@@ -173,10 +173,10 @@ src_install() {
 	doexe ${NV_OBJ}/nvidia-smi
 
 	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-	#doexe ${NV_OBJ}/nvidia-modprobe
-	#fowners root:video /opt/bin/nvidia-modprobe
-	#fperms 4710 /opt/bin/nvidia-modprobe
-	#dosym /{opt,usr}/bin/nvidia-modprobe
+	doexe ${NV_OBJ}/nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
+	dosym /{opt,usr}/bin/nvidia-modprobe
 
 	# init
 	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a5f2344d..1df42e7d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-455.45.01.run 183481072 BLAKE2B 5756c788cff136692f0d6de4b33d74ad698fcc75cf2fb6f0adc6381a0377bea18eae0f728151ac8b2efb5508c7420c2df3be3fd7d0035b4477e3e3c97e85ab5c SHA512 dd2743cd2304d7f3afc0c3761cf6c848561bcaabcbdc27157d091a89974aff81bcd28aa3e204d33d406abdbafd14e9162f3cbabc950309e06e6cad7b6fa8df69
+DIST NVIDIA-Linux-x86_64-460.39.run 178310565 BLAKE2B 65931f34ff47de02933797f60128c66c8774f3b217b79e82f781cd50560835ec79c37b7e63fb50231a22646f0cd7cf968d1fbe1ec6c2b3732a1c565b68de7bcb SHA512 9275a58ff0e72c3ee033bd18fa9e9dbb0203d2961a63e7cc04444889118eb4029c60bb10c2af8f230c1aa4aa30769131ea8c01f3bc4e7453336ad9c03ba23b42
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-dkms-kmalloc.patch b/x11-drivers/nvidia-drivers/files/dkms.patch
index c3e9fbfb..3485b3ea 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-dkms-kmalloc.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms.patch
@@ -4,7 +4,7 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="455.45.01"
++PACKAGE_VERSION="460.39"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -25,16 +25,3 @@
 +BUILT_MODULE_NAME[3]="nvidia-drm"
 +DEST_MODULE_LOCATION[3]="/extra/dkms"
 +
---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c	2020-11-05 23:19:28.000000000 +0000
-+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c	2020-12-31 22:27:16.878028504 +0000
-@@ -282,8 +282,8 @@
-  * are called while nvkms_lock is held.
-  *************************************************************************/
- 
--/* Don't use kmalloc for allocations larger than 128k */
--#define KMALLOC_LIMIT (128 * 1024)
-+/* Don't use kmalloc for allocations larger than one page */
-+#define KMALLOC_LIMIT PAGE_SIZE
- 
- void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero)
- {
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch b/x11-drivers/nvidia-drivers/files/locale.patch
index aa2a7434..aa2a7434 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch
+++ b/x11-drivers/nvidia-drivers/files/locale.patch
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf
index 9c36f59b..a94d18ca 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf
@@ -3,6 +3,6 @@ Section "OutputClass"
     MatchDriver "nvidia-drm"
     Driver "nvidia"
     Option "AllowEmptyInitialConfiguration"
-    ModulePath "/usr/lib/nvidia/xorg"
-    ModulePath "/usr/lib/xorg/modules"
+    ModulePath "/usr/lib64/nvidia/xorg"
+    ModulePath "/usr/lib64/xorg/modules"
 EndSection
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39.ebuild
index 74242854..f65ee453 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39.ebuild
@@ -49,8 +49,8 @@ RDEPEND="
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 PATCHES=(
-	"${FILESDIR}"/${P}-dkms-kmalloc.patch
-	"${FILESDIR}"/${PN}-440.26-locale.patch
+	"${FILESDIR}"/dkms.patch
+	"${FILESDIR}"/locale.patch
 )
 
 pkg_setup() {
@@ -192,8 +192,6 @@ src_install() {
 	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
 	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
 
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
 	if has_multilib_profile && use multilib; then
 		local OABI=${ABI}
 		for ABI in $(multilib_get_enabled_abis); do
@@ -214,10 +212,6 @@ src_install() {
 	use X && doman "${NV_MAN}"/nvidia-xconfig.1
 	doman "${NV_MAN}"/nvidia-cuda-mps-control.1
 
-	readme.gentoo_create_doc
-
-	dodoc supported-gpus.json
-
 	docinto html
 	dodoc -r ${NV_DOC}/html/*
 }