summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.SRCINFO18
-rwxr-xr-xPKGBUILD14
-rw-r--r--linux-4.6.patch50
3 files changed, 14 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af59c7144779..9d0fe3de45a4 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
# Wed Feb 10 11:39:03 UTC 2016
pkgbase = nvidia-full-beta
- pkgver = 364.19
+ pkgver = 367.18
pkgrel = 1
url = http://www.nvidia.com/
arch = i686
@@ -10,19 +10,17 @@ pkgbase = nvidia-full-beta
makedepends = linux-headers
options = !strip
source = 20-nvidia.conf
- source = linux-4.6.patch
md5sums = 2640eac092c220073f0668a7aaff61f7
- md5sums = 3064bd437b26adac246f301f54f2814c
- source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/364.19/NVIDIA-Linux-x86-364.19.run
- md5sums_i686 = 8a4015213c4a8f1c80e9520d04a32a7b
- source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/364.19/NVIDIA-Linux-x86_64-364.19-no-compat32.run
- md5sums_x86_64 = ad7a0b1855b3913390fb75b4cc3a26dc
+ source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/367.18/NVIDIA-Linux-x86-367.18.run
+ md5sums_i686 = 9ae023927692dab99f23a006865fa966
+ source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/367.18/NVIDIA-Linux-x86_64-367.18-no-compat32.run
+ md5sums_x86_64 = 0e01ed625c26ad4e4b44a7b139a3e363
pkgname = nvidia-full-beta
pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
install = nvidia-full-beta.install
depends = linux
- depends = nvidia-utils-full-beta>=364.19
+ depends = nvidia-utils-full-beta>=367.18
depends = libgl
provides = nvidia
conflicts = nvidia-96xx
@@ -37,7 +35,7 @@ pkgname = nvidia-utils-full-beta
optdepends = gtk3: nvidia-settings (GTK+ v3)
optdepends = opencl-nvidia-full-beta: OpenCL support
optdepends = xorg-server-devel: nvidia-xconfig
- provides = nvidia-utils=364.19
+ provides = nvidia-utils=367.18
provides = nvidia-settings
provides = libglvnd
conflicts = nvidia-utils
@@ -67,7 +65,7 @@ pkgname = lib32-nvidia-utils-full-beta
depends = lib32-zlib
depends = lib32-gcc-libs
optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
- provides = lib32-nvidia-utils=364.19
+ provides = lib32-nvidia-utils=367.18
provides = lib32-libglvnd
conflicts = lib32-nvidia-utils
conflicts = lib32-libglvnd
diff --git a/PKGBUILD b/PKGBUILD
index 712839e6cb83..c0263648946c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
_lib32=0
pkgname=('nvidia-full-beta' 'nvidia-utils-full-beta' 'nvidia-libgl-full-beta' 'opencl-nvidia-full-beta')
-pkgver=364.19
+pkgver=367.18
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -26,15 +26,13 @@ elif [[ $_lib32 = 1 ]] || pacman -Q lib32-nvidia-utils-full-beta &>/dev/null; th
fi
# Source
-source=('20-nvidia.conf'
- 'linux-4.6.patch')
+source=('20-nvidia.conf')
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run")
-md5sums=('2640eac092c220073f0668a7aaff61f7'
- '3064bd437b26adac246f301f54f2814c')
-md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
-md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('a7ca202401b5fd27f04f89c0dedaaf59')
+md5sums=('2640eac092c220073f0668a7aaff61f7')
+md5sums_i686=('9ae023927692dab99f23a006865fa966')
+md5sums_x86_64=('0e01ed625c26ad4e4b44a7b139a3e363')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('3b08d38b21d485c0d680b065415e1e21')
# Auto-detect patches (e.g. linux-4.1.patch)
for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
diff --git a/linux-4.6.patch b/linux-4.6.patch
deleted file mode 100644
index 3dde4730532b..000000000000
--- a/linux-4.6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -77,7 +77,7 @@
- static struct drm_framebuffer *internal_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
- uint64_t nvkms_params_ptr,
- uint64_t nvkms_params_size
- )
-@@ -199,7 +199,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- )
- {
- return internal_framebuffer_create(dev, file, cmd, 0, 0);
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -45,7 +45,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- );
-
- int nvidia_drm_add_nvkms_fb(
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -31,6 +31,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
-+#include "nv-mm.h"
- #include "nv-pgprot.h"
-
- MODULE_PARM_DESC(
-@@ -121,8 +122,7 @@
-
- down_read(&mm->mmap_sem);
-
-- pages_pinned = get_user_pages(current, mm,
-- address, pages_count, write, force,
-+ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
- user_pages, NULL);
- up_read(&mm->mmap_sem); \ No newline at end of file