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

[Evangelos Foutras]

    Date: Thursday, February 21, 2013 @ 01:58:40
  Author: foutrelis
Revision: 178377

upgpkg: nvidia 313.18-4

Linux 3.8 rebuild.

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

-----------------+
 PKGBUILD        |   15 +++++++++------
 linux-3.8.patch |   12 ++++++++++++
 nvidia.install  |    6 +++---
 3 files changed, 24 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-21 00:55:01 UTC (rev 178376)
+++ PKGBUILD	2013-02-21 00:58:40 UTC (rev 178377)
@@ -3,19 +3,21 @@
 
 pkgname=nvidia
 pkgver=313.18
-_extramodules=extramodules-3.7-ARCH
-pkgrel=3
+_extramodules=extramodules-3.8-ARCH
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+depends=('linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.8' 'linux-headers<3.9')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('linux-3.7.patch')
-md5sums=('7c684fab691b15d55a79fd8f9b1a224d')
+source=('linux-3.7.patch'
+        'linux-3.8.patch')
+md5sums=('7c684fab691b15d55a79fd8f9b1a224d'
+         '9b20edcefc8ad28f40bdf9a5e26ef731')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
@@ -35,6 +37,7 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
     patch -Np3 -i "${srcdir}"/linux-3.7.patch
+    patch -Np1 -i "${srcdir}"/linux-3.8.patch
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 

Added: linux-3.8.patch
===================================================================
--- linux-3.8.patch	                        (rev 0)
+++ linux-3.8.patch	2013-02-21 00:58:40 UTC (rev 178377)
@@ -0,0 +1,12 @@
+Index: kernel/conftest.sh
+===================================================================
+--- kernel/conftest.sh.orig
++++ kernel/conftest.sh
+@@ -160,6 +160,7 @@ build_cflags() {
+ 
+     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
++        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
+         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
+     elif [ "$ARCH" = "arm" ]; then

Modified: nvidia.install
===================================================================
--- nvidia.install	2013-02-21 00:55:01 UTC (rev 178376)
+++ nvidia.install	2013-02-21 00:58:40 UTC (rev 178377)
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-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.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }