Date: Wednesday, September 2, 2015 @ 10:59:50 Author: fyan Revision: 245191
upgpkg: nvidia-304xx 304.128-1 Modified: nvidia-304xx/trunk/PKGBUILD Deleted: nvidia-304xx/trunk/nvidia-3.19.patch nvidia-304xx/trunk/nvidia-4.0.patch -------------------+ PKGBUILD | 18 ++++++------------ nvidia-3.19.patch | 21 --------------------- nvidia-4.0.patch | 28 ---------------------------- 3 files changed, 6 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-02 08:40:30 UTC (rev 245190) +++ PKGBUILD 2015-09-02 08:59:50 UTC (rev 245191) @@ -4,9 +4,9 @@ pkgbase=nvidia-304xx pkgname=(nvidia-304xx nvidia-304xx-dkms) -pkgver=304.125 +pkgver=304.128 _extramodules=extramodules-4.1-ARCH -pkgrel=23 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" makedepends=('libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.1' 'linux-headers<4.2') @@ -15,14 +15,10 @@ options=(!strip) source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - 'nv-drm.patch' - 'nvidia-3.19.patch' - 'nvidia-4.0.patch') -sha512sums=('cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7' - '3b50d1353ff6cfee9042455b78e889c198e40dfe832dde79eda1a47d9f1f02b29f0161f1ac694dc7502eb2a94bad6b98244568cc353f387b02de6cae1c17d4ae' - 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f' - 'f52a9f82a73eef9e27046c51ce0b2671ee2893f9b12e17c722f17416c39ac0b8d7d5b1fed51b6ab6f36670b036cd96d5cfeae37300ef041c029fd3d3d136ff3d' - 'd00a2a4c5bf38041cf9e4f61aa0ad0d6123451839eb272c36d7e466d77b33d90415cfa6f96a3a9da8688a1048e93a03169f808e6b2ddc2d9d148bab8485dae27') + 'nv-drm.patch') +sha512sums=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90' + 'fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2' + 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -33,8 +29,6 @@ cd "${_pkg}" # patches here patch -p0 -i "$srcdir/nv-drm.patch" - patch -p1 -i "$srcdir/nvidia-3.19.patch" - patch -p0 -i "$srcdir/nvidia-4.0.patch" } build() { Deleted: nvidia-3.19.patch =================================================================== --- nvidia-3.19.patch 2015-09-02 08:40:30 UTC (rev 245190) +++ nvidia-3.19.patch 2015-09-02 08:59:50 UTC (rev 245191) @@ -1,21 +0,0 @@ -diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c ---- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100 -@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - long nv_kern_compat_ioctl( -@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - /* Deleted: nvidia-4.0.patch =================================================================== --- nvidia-4.0.patch 2015-09-02 08:40:30 UTC (rev 245190) +++ nvidia-4.0.patch 2015-09-02 08:59:50 UTC (rev 245191) @@ -1,28 +0,0 @@ ---- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800 -+++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800 -@@ -35,8 +35,13 @@ - unsigned long cr0 = read_cr0(); - write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); - wbinvd(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) -+ *cr4 = __read_cr4(); -+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); -+#else - *cr4 = read_cr4(); - if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); -+#endif - __flush_tlb(); - } - -@@ -46,7 +46,11 @@ - wbinvd(); - __flush_tlb(); - write_cr0((cr0 & 0x9fffffff)); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) -+ if (cr4 & 0x80) __write_cr4(cr4); -+#else - if (cr4 & 0x80) write_cr4(cr4); -+#endif - } - - static int nv_determine_pat_mode(void)