Date: Monday, November 25, 2013 @ 02:50:15 Author: eric Revision: 200297
upgpkg: nvidia-304xx-lts 304.116-1 Upstream update, Fix license, Remove old patch Modified: nvidia-304xx-lts/trunk/PKGBUILD Deleted: nvidia-304xx-lts/trunk/nvidia-linux-3.11.patch -------------------------+ PKGBUILD | 18 +++++++----------- nvidia-linux-3.11.patch | 25 ------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-25 01:34:26 UTC (rev 200296) +++ PKGBUILD 2013-11-25 01:50:15 UTC (rev 200297) @@ -2,9 +2,9 @@ # Maintainer: Andreas Radke <andy...@archlinux.org> pkgname=nvidia-304xx-lts -pkgver=304.108 +pkgver=304.116 _extramodules=extramodules-3.10-lts -pkgrel=9 +pkgrel=1 pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -15,19 +15,17 @@ license=('custom') install=nvidia-304xx-lts.install options=(!strip) -source=('nvidia-linux-3.11.patch') -md5sums=('5c962760de069ed4ad34e64d5988686a') if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums+=('ef453e32515c2176c67ebd95c770dc0e') + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('0626e8582fd81f14e7fbd906fbca1d51') 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+=('4e0e54de6735023f44c858a3006b3e18') + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('8b89d14e717ce7dd78c4d38cab930d1e') fi build() { @@ -35,7 +33,6 @@ cd "${srcdir}" sh "${_pkg}.run" --extract-only cd "${_pkg}/kernel" - patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } @@ -46,6 +43,5 @@ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf" gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - - # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. + install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE" } Deleted: nvidia-linux-3.11.patch =================================================================== --- nvidia-linux-3.11.patch 2013-11-25 01:34:26 UTC (rev 200296) +++ nvidia-linux-3.11.patch 2013-11-25 01:50:15 UTC (rev 200297) @@ -1,25 +0,0 @@ -From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 -From: Lukas Elsner <o...@mindrunner.de> -Date: Wed, 17 Jul 2013 01:16:04 +0200 -Subject: [PATCH] replace num_physpages with totalram_pages - ---- - kernel/nv-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h -index 4e5ed89..46c51ec 100644 ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) - #endif - - #if !defined(NV_VMWARE) --#define NV_NUM_PHYSPAGES num_physpages -+#define NV_NUM_PHYSPAGES totalram_pages - #define NV_GET_CURRENT_PROCESS() current->tgid - #define NV_IN_ATOMIC() in_atomic() - #define NV_LOCAL_BH_DISABLE() local_bh_disable() --- -1.8.3.2 -