Rebuild nvidia-custom for linux-custom 3.12

3 files changed, 17 insertions, 38 deletions

diff --git a/nvidia-custom/PKGBUILD b/nvidia-custom/PKGBUILD
index bcd2cff..fbbe95d 100644
--- a/nvidia-custom/PKGBUILD
+++ b/nvidia-custom/PKGBUILD
@@ -3,19 +3,19 @@
 
 pkgname=nvidia-custom
 pkgver=325.15
-_extramodules=extramodules-3.11-custom
-pkgrel=11
+_extramodules=extramodules-3.12-custom
+pkgrel=12
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-custom>=3.11' 'linux-custom<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-custom-headers>=3.11' 'linux-custom-headers<3.12')
+depends=('linux-custom>=3.12' 'linux-custom<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-custom-headers>=3.12' 'linux-custom-headers<3.13')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('nvidia-linux-3.11.patch')
-md5sums=('5c962760de069ed4ad34e64d5988686a')
+source=('nvidia-linux-3.12.patch')
+md5sums=('d267069bc456de269424b4e1b46a3745')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
@@ -29,12 +29,16 @@ elif [ "$CARCH" = "x86_64" ]; then
     md5sums+=('63b2caa0cb128efa1a7808d7bddb2074')
 fi
 
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch
+    cd "${_pkg}"
+    patch -Np1 -i ${srcdir}/nvidia-linux-3.12.patch
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${srcdir}"/"${_pkg}"/kernel
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
diff --git a/nvidia-custom/nvidia-linux-3.11.patch b/nvidia-custom/nvidia-linux-3.11.patch
deleted file mode 100644
index bb6fad9..0000000
--- a/nvidia-custom/nvidia-linux-3.11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001
-From: Lukas Elsner <open@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
-
diff --git a/nvidia-custom/nvidia.install b/nvidia-custom/nvidia.install
index 28ea071..3219c95 100644
--- a/nvidia-custom/nvidia.install
+++ b/nvidia-custom/nvidia.install
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.11-custom'
+    EXTRAMODULES='extramodules-3.12-custom'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.11-custom'
+    EXTRAMODULES='extramodules-3.12-custom'
     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_upgrade() {
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.11-custom'
+    EXTRAMODULES='extramodules-3.12-custom'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }