summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-07-25 20:25:45 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-07-26 09:33:35 +0200
commit8b27be7f450977adcb459d62192285bb3c48471d (patch)
treed65b0a046d4d25782c39f30eb326133481296c6e
parent9de4b57c875ef8ac195fb41ecc263ec8058efbbd (diff)
downloadhardware-8b27be7f450977adcb459d62192285bb3c48471d.tar.gz
hardware-8b27be7f450977adcb459d62192285bb3c48471d.tar.xz
nvidia-drivers: version bump to 384.59
Change-Id: I83ca00d33049a61d20f7cdf4570b867b7ff96c83 Reviewed-on: https://galileo.mailstation.de/gerrit/9640 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--metadata/repository_mask.conf2
-rw-r--r--packages/x11-drivers/nvidia-drivers/files/nvidia-drivers-381.22-kernel-4.11.patch27
-rw-r--r--packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.exheres-011
-rw-r--r--packages/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.exheres-0 (renamed from packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0)0
-rw-r--r--packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib11
5 files changed, 12 insertions, 39 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 0394a7b..8a9c4c2 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -35,7 +35,7 @@ x11-dri/primus[~scm] [[
# Please do *not* remove this mask but, if necessary, use a high imaginary
# version to mask things.
-x11-drivers/nvidia-drivers[>381.22] [[
+x11-drivers/nvidia-drivers[>385.00] [[
author = [ Wulf C. Krueger <philantrop@exherbo.org> ]
date = [ 26 May 2016 ]
token = testing
diff --git a/packages/x11-drivers/nvidia-drivers/files/nvidia-drivers-381.22-kernel-4.11.patch b/packages/x11-drivers/nvidia-drivers/files/nvidia-drivers-381.22-kernel-4.11.patch
deleted file mode 100644
index 4d2f010..0000000
--- a/packages/x11-drivers/nvidia-drivers/files/nvidia-drivers-381.22-kernel-4.11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-+Source: https://github.com/rpmfusion/nvidia-kmod/blob/master/kernel_4.11.patch
-+Reason: Dirty hack to work with kernel 4.11
-
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -20,6 +20,8 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
-+#include <linux/version.h>
-+
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/err.h>
-@@ -196,7 +198,11 @@
- module_exit(nv_linux_drm_exit);
-
- #if defined(MODULE_LICENSE)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)
-+ MODULE_LICENSE("Dual MIT/GPL");
-+#else
- MODULE_LICENSE("MIT");
-+#endif
- #endif
- #if defined(MODULE_INFO)
- MODULE_INFO(supported, "external");
-
diff --git a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.exheres-0 b/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.exheres-0
deleted file mode 100644
index e7fa44d..0000000
--- a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.exheres-0
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2010 Ingmar Vanhassel <ingmar@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require nvidia-drivers
-
-PLATFORMS="~amd64 ~x86"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-381.22-kernel-4.11.patch
-)
-
diff --git a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0 b/packages/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.exheres-0
index c9a99eb..c9a99eb 100644
--- a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0
+++ b/packages/x11-drivers/nvidia-drivers/nvidia-drivers-384.59.exheres-0
diff --git a/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib b/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
index 0f98aaf..30436cc 100644
--- a/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
+++ b/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
@@ -186,6 +186,17 @@ src_install_256() {
-i .manifest
fi
+ # fill nvidia_icd.json.template and rename
+ if ever at_least 384.59 ; then
+ edo sed \
+ -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' \
+ -i nvidia_icd.json.template
+ edo sed \
+ -e 's:nvidia_icd.json.template:nvidia_icd.json:g' \
+ -i .manifest
+ edo mv nvidia_icd.json.template nvidia_icd.json
+ fi
+
# parse the .manifest file to figure out where to install stuff
while read line ; do
line=( $line )