Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a06677fbde0ba439652c8351140d651dcc6293c8
commit a06677fbde0ba439652c8351140d651dcc6293c8 Author: DeX77 <[email protected]> Date: Tue Jul 26 11:10:52 2016 +0200 nvidia-367.35-1-x86_64 * version bump * fix build for kernel 4.7 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 8dcb3f4..04a8d9c 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Michel Hermier <[email protected]> pkgname=nvidia -pkgver=367.27 -pkgrel=4 +pkgver=367.35 +pkgrel=1 archs=('i686' 'x86_64') _F_kernelmod_scriptlet=nvidia.install Finclude kernel-module @@ -21,20 +21,22 @@ case "$CARCH" in i686) _F_nvidia_name="NVIDIA-Linux-x86-${pkgver}" source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/${_F_nvidia_name}.run";) - sha1sums=('26fbf11adad7d3f87df6705ec8cf223d5ab6ba2a');; + sha1sums=('8cfa97e0e914832ab46f09c3e41d3fb3024502e1');; x86_64) _F_nvidia_name="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_F_nvidia_name}.run";) - sha1sums=('5b0ce9507f09d68af5c557a062868368cd096d00');; + sha1sums=('694cdc83d4da57c72a4975f345198beb4c8ad720');; esac source=("${source[@]}" \ modprobe-nvidia.conf \ - xorg-nvidia.conf ) + xorg-nvidia.conf \ + kernel-4.7.patch ) sha1sums=("${sha1sums[@]}" \ 'a2bf63eb7dffdfc9268534654d3864e865af6834' \ - '15455cb16a6638ee348dc01620c7f64234178ac8' ) + '15455cb16a6638ee348dc01620c7f64234178ac8' \ + '6531dab3216afe8a918d62356c00e4870454eba2') build () { cd $Fsrcdir @@ -44,7 +46,7 @@ build () { Fcd . cd $Fsrcdir/${_F_nvidia_name} - #Fpatchall + Fpatchall # Build the kernel module Fexec cd $Fsrcdir/${_F_nvidia_name}/kernel || Fdie diff --git a/source/x11-extra/nvidia/kernel-4.7.patch b/source/x11-extra/nvidia/kernel-4.7.patch new file mode 100644 index 0000000..d581a5e --- /dev/null +++ b/source/x11-extra/nvidia/kernel-4.7.patch @@ -0,0 +1,42 @@ +diff -ur NVIDIA-Linux-x86_64-367.27/kernel/nvidia-drm/nvidia-drm-fb.c b/kernel/nvidia-drm/nvidia-drm-fb.c +--- NVIDIA-Linux-x86_64-367.27/kernel/nvidia-drm/nvidia-drm-fb.c 2016-06-10 02:38:43.000000000 +0200 ++++ b/kernel/nvidia-drm/nvidia-drm-fb.c 2016-06-14 02:45:44.263506669 +0200 +@@ -114,7 +114,7 @@ + * We don't support any planar format, pick up first buffer only. + */ + +- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); ++ gem = drm_gem_object_lookup(file, cmd->handles[0]); + + if (gem == NULL) + { +diff -ur NVIDIA-Linux-x86_64-367.27/kernel/nvidia-drm/nvidia-drm-gem.c b/kernel/nvidia-drm/nvidia-drm-gem.c +--- NVIDIA-Linux-x86_64-367.27/kernel/nvidia-drm/nvidia-drm-gem.c 2016-06-10 02:38:43.000000000 +0200 ++++ b/kernel/nvidia-drm/nvidia-drm-gem.c 2016-06-14 02:45:44.263506669 +0200 +@@ -408,7 +408,7 @@ + + mutex_lock(&dev->struct_mutex); + +- gem = drm_gem_object_lookup(dev, file, handle); ++ gem = drm_gem_object_lookup(file, handle); + + if (gem == NULL) + { +diff -ur NVIDIA-Linux-x86_64-367.27/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h +--- NVIDIA-Linux-x86_64-367.27/kernel/nvidia-uvm/uvm_linux.h 2016-06-10 02:37:08.000000000 +0200 ++++ b/kernel/nvidia-uvm/uvm_linux.h 2016-06-14 02:49:35.214495381 +0200 +@@ -563,12 +563,13 @@ + INIT_RADIX_TREE(tree, GFP_NOWAIT); + } + ++/* + static bool radix_tree_empty(struct radix_tree_root *tree) + { + void *dummy; + return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; + } +- ++*/ + + #if !defined(NV_USLEEP_RANGE_PRESENT) + static void __sched usleep_range(unsigned long min, unsigned long max) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
