x11-drivers/nvidia-drivers && x11-misc/nvidia-settings && sys-kernel/nvidia-drivers-dkms : version bump, enable libglvnd (legacy 390)

4 files changed, 94 insertions, 0 deletions

diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index f874156e..361546d1 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1,3 +1,4 @@
 DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670f461a11af28a31b07a266b633e5547751871da2cbe5753bc5f11f8a109bda50387b422984d2afff2d7284d8564edb4405421b6 SHA512 6afad9db6c56d475e34f6f4ee7a8a8351e132aab69fd3ad467a5f559a70cebda09dbd3ecfddd699b59c50903b81450b00c9197d05e149c759c2bb5d0a72d6fe8
+DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
 DIST NVIDIA-Linux-x86_64-430.34.run 110148373 BLAKE2B 300dbc3edc30048717f4a9643981a2846552fd310dd0651c497664c7979f7afde6f9e77e5b9fa45bea22ffe6562999cd305e4f3b878b8e39af19f8b3ee1c3f1a SHA512 a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e
 DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b
diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch
new file mode 100644
index 00000000..344771d2
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/kernel-5.2.patch
@@ -0,0 +1,18 @@
+diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c
+--- a/kernel/nvidia-uvm/uvm8_tools.c	2019-01-27 16:12:22.000000000 +0000
++++ b/kernel/nvidia-uvm/uvm8_tools.c	2019-07-09 04:42:40.134899491 +0000
+@@ -204,12 +204,14 @@
+     return event_tracker != NULL && !event_tracker->is_queue;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+ static void put_user_pages(struct page **pages, NvU64 page_count)
+ {
+     NvU64 i;
+     for (i = 0; i < page_count; i++)
+         put_page(pages[i]);
+ }
++#endif
+ 
+ static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
+ {
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.132-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.132-conf.patch
new file mode 100644
index 00000000..a121e93b
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.132-conf.patch
@@ -0,0 +1,28 @@
+diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
+--- a/kernel/dkms.conf	2018-03-22 05:39:53.000000000 +0000
++++ b/kernel/dkms.conf	2018-04-09 16:18:23.177125417 +0100
+@@ -1,12 +1,20 @@
+-PACKAGE_NAME="nvidia"
+-PACKAGE_VERSION="__VERSION_STRING"
++PACKAGE_NAME="nvidia-drivers-dkms"
++PACKAGE_VERSION="390.132"
+ AUTOINSTALL="yes"
+ 
+ # By default, DKMS will add KERNELRELEASE to the make command line; however,
+ # this will cause the kernel module build to infer that it was invoked via
+ # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
+ # the 'make' command name to suppress this behavior.
+-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
+ 
+ # The list of kernel modules will be generated by nvidia-installer at runtime.
+-__DKMS_MODULES
++BUILT_MODULE_NAME[0]="nvidia"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
++BUILT_MODULE_NAME[1]="nvidia-uvm"
++DEST_MODULE_LOCATION[1]="/extra/dkms"
++BUILT_MODULE_NAME[2]="nvidia-modeset"
++DEST_MODULE_LOCATION[2]="/extra/dkms"
++BUILT_MODULE_NAME[3]="nvidia-drm"
++DEST_MODULE_LOCATION[3]="/extra/dkms"
++
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.132.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.132.ebuild
new file mode 100644
index 00000000..686076bc
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.132.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA driver sources for linux"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/390132"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+PATCHES=( 
+	"${FILESDIR}"/kernel-4.16.patch
+	"${FILESDIR}"/"${P}"-conf.patch
+)
+
+S="${WORKDIR}/${AMD64_NV_PACKAGE}"
+
+src_unpack() {
+	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
+}
+
+src_install() {
+	dodir usr/src/${P}
+	insinto usr/src/${P}
+	doins -r "${S}"/kernel/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}