[arch-commits] Commit in nvidia/trunk (3 files)

[Tobias Powalowski]

    Date: Tuesday, September 3, 2013 @ 09:51:41
  Author: tpowa
Revision: 193875

upgpkg: nvidia 325.15-6

rebuild against 3.11

Added:
  nvidia/trunk/nvidia-linux-3.11.patch
Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install

-------------------------+
 PKGBUILD                |   11 +++++++----
 nvidia-linux-3.11.patch |   25 +++++++++++++++++++++++++
 nvidia.install          |    6 +++---
 3 files changed, 35 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-03 07:49:45 UTC (rev 193874)
+++ PKGBUILD	2013-09-03 07:51:41 UTC (rev 193875)
@@ -3,17 +3,19 @@
 
 pkgname=nvidia
 pkgver=325.15
-_extramodules=extramodules-3.10-ARCH
-pkgrel=5
+_extramodules=extramodules-3.11-ARCH
+pkgrel=6
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.10' 'linux<3.11' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.10' 'linux-headers<3.11')
+depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.11' 'linux-headers<3.12')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
+source=('nvidia-linux-3.11.patch')
+md5sums=('5c962760de069ed4ad34e64d5988686a')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
@@ -32,6 +34,7 @@
     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
 }
 

Added: nvidia-linux-3.11.patch
===================================================================
--- nvidia-linux-3.11.patch	                        (rev 0)
+++ nvidia-linux-3.11.patch	2013-09-03 07:51:41 UTC (rev 193875)
@@ -0,0 +1,25 @@
+From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001
+From: Lukas Elsner <open at 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
+

Modified: nvidia.install
===================================================================
--- nvidia.install	2013-09-03 07:49:45 UTC (rev 193874)
+++ nvidia.install	2013-09-03 07:51:41 UTC (rev 193875)
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.10-ARCH'
+    EXTRAMODULES='extramodules-3.11-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.10-ARCH'
+    EXTRAMODULES='extramodules-3.11-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
         echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.10-ARCH'
+    EXTRAMODULES='extramodules-3.11-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }