Date: Tuesday, August 6, 2013 @ 11:46:42 Author: tpowa Revision: 192141
upgpkg: nvidia 325.15-1 bump to latest version Modified: nvidia/trunk/PKGBUILD Deleted: nvidia/trunk/nvidia-linux-3.10.patch -------------------------+ PKGBUILD | 11 ++++------- nvidia-linux-3.10.patch | 34 ---------------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-08-06 08:51:33 UTC (rev 192140) +++ PKGBUILD 2013-08-06 09:46:42 UTC (rev 192141) @@ -2,9 +2,9 @@ # Maintainer : Thomas Baechler <[email protected]> pkgname=nvidia -pkgver=319.32 +pkgver=325.15 _extramodules=extramodules-3.10-ARCH -pkgrel=6 +pkgrel=1 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/"; @@ -14,19 +14,17 @@ license=('custom') install=nvidia.install options=(!strip) -source=('nvidia-linux-3.10.patch') -md5sums=('8323dcba90576dcae67c42d6ea94704e') if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) - md5sums+=('978339ff37c3207f3a39d3952721dcdb') + md5sums+=('528fc538584de6446384b9cec3099d6c') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) - md5sums+=('d181d856768868823df3bda4607a5315') + md5sums+=('63b2caa0cb128efa1a7808d7bddb2074') fi build() { @@ -34,7 +32,6 @@ cd "${srcdir}" sh "${_pkg}.run" --extract-only cd "${_pkg}/kernel" - patch -Np3 -i ${srcdir}/nvidia-linux-3.10.patch make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } Deleted: nvidia-linux-3.10.patch =================================================================== --- nvidia-linux-3.10.patch 2013-08-06 08:51:33 UTC (rev 192140) +++ nvidia-linux-3.10.patch 2013-08-06 09:46:42 UTC (rev 192141) @@ -1,34 +0,0 @@ -diff --git a/modules/nvidia-kernel/nv-i2c.c b/modules/nvidia-kernel/nv-i2c.c -index a702506..ece9c3c 100644 ---- a/modules/nvidia-kernel/nv-i2c.c -+++ b/modules/nvidia-kernel/nv-i2c.c -@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data) - if (!pI2cAdapter) return FALSE; - - // attempt release with the OS -- osstatus = i2c_del_adapter(pI2cAdapter); -+ i2c_del_adapter(pI2cAdapter); - -- if (!osstatus) -- { -- os_free_mem(pI2cAdapter); -- wasReleased = TRUE; -- } -+ os_free_mem(pI2cAdapter); -+ wasReleased = TRUE; - - return wasReleased; - } -diff --git a/modules/nvidia-kernel/nv-procfs.c b/modules/nvidia-kernel/nv-procfs.c -index 3e05ef5..75fc7e0 100644 ---- a/modules/nvidia-kernel/nv-procfs.c -+++ b/modules/nvidia-kernel/nv-procfs.c -@@ -14,6 +14,8 @@ - #include "os-interface.h" - #include "nv-linux.h" - -+#undef CONFIG_PROC_FS -+ - #if defined(CONFIG_PROC_FS) - - #include "nv_compiler.h" \ No newline at end of file
