summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-10 19:25:29 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-05-10 20:59:14 +0200
commit11b75510f7ffea381936b7e85f27c813559b9cbc (patch)
tree1c0f49955ee5e6d9a9537957711a0aebdc2b2deb
parent20a10d967e35d7c7bd06ee66cd32d0760aa2c367 (diff)
downloadhardware-11b75510f7ffea381936b7e85f27c813559b9cbc.tar.gz
hardware-11b75510f7ffea381936b7e85f27c813559b9cbc.tar.xz
nvidia-drivers: version bump to 381.22
-rw-r--r--metadata/repository_mask.conf2
-rw-r--r--packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0 (renamed from packages/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.exheres-0)0
-rw-r--r--packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib17
3 files changed, 14 insertions, 5 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 4e6dbae..0394a7b 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[>=379.00] [[
+x11-drivers/nvidia-drivers[>381.22] [[
author = [ Wulf C. Krueger <philantrop@exherbo.org> ]
date = [ 26 May 2016 ]
token = testing
diff --git a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.exheres-0 b/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0
index c9a99eb..c9a99eb 100644
--- a/packages/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.exheres-0
+++ b/packages/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.exheres-0
diff --git a/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib b/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
index 172840e..0f98aaf 100644
--- a/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
+++ b/packages/x11-drivers/nvidia-drivers/nvidia-drivers.exlib
@@ -17,12 +17,12 @@ X86_PNV="NVIDIA-Linux-x86-${PV}.run"
DOWNLOADS="
listed-only:
- http://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_PNV}
- http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_PNV}
+ https://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_PNV}
+ https://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_PNV}
ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_PNV}
- http://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_PNV}
- http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_PNV}
+ https://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_PNV}
+ https://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_PNV}
ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_PNV}
"
@@ -326,6 +326,15 @@ nvidia_alternatives() {
"${IMAGE}"/usr/$(exhost --target)/lib/libEGL.so.${PV}
fi
+ if ever at_least 381.22 ; then
+ local modules=( egl opengl nvifr )
+ for module in "${modules[@]}"; do
+ edo mv "${IMAGE}"/usr/$(exhost --target)/lib/MODULE\:${module}/* \
+ "${IMAGE}"/usr/$(exhost --target)/lib/
+ edo rmdir "${IMAGE}"/usr/$(exhost --target)/lib/MODULE\:${module}
+ done
+ fi
+
if ever at_least 361.16 ; then
# The next line INTENTIONALLY overwrites the existing non-GLVND libGL.so.${PV}.
# We want to support the OpenGL Vendor-Neutral Driver (GLVND) which will