[arch-commits] Commit in nvidia/trunk (PKGBUILD nvidia.install)

[Tobias Powalowski]

    Date: Monday, March 19, 2012 @ 07:14:27
  Author: tpowa
Revision: 153748

upgpkg: nvidia 295.20-4

bump to 3.3 series

Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install

----------------+
 PKGBUILD       |   12 ++++++++----
 nvidia.install |    6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-19 11:14:05 UTC (rev 153747)
+++ PKGBUILD	2012-03-19 11:14:27 UTC (rev 153748)
@@ -3,14 +3,14 @@
 
 pkgname=nvidia
 pkgver=295.20
-_extramodules=extramodules-3.2-ARCH
+_extramodules=extramodules-3.3-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.2' 'linux-headers<3.3')
+depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
@@ -32,6 +32,10 @@
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
+    # fix for 3.3 kernel
+    sed 's/CFLAGS="$CFLAGS -I$SOURCES\/arch\/x86\/include"/CFLAGS="$CFLAGS \
+                   -I$SOURCES\/arch\/x86\/include \
+                   -I$SOURCES\/arch\/x86\/include\/generated"/' -i conftest.sh
     make SYSSRC=/lib/modules/"${_kernver}/build" module
 }
 

Modified: nvidia.install
===================================================================
--- nvidia.install	2012-03-19 11:14:05 UTC (rev 153747)
+++ nvidia.install	2012-03-19 11:14:27 UTC (rev 153748)
@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
+    EXTRAMODULES='extramodules-3.3-ARCH'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
+    EXTRAMODULES='extramodules-3.3-ARCH'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
+    EXTRAMODULES='extramodules-3.3-ARCH'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }