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

[Ionuț Mircea Bîru]

    Date: Tuesday, March 5, 2013 @ 19:17:31
  Author: ioni
Revision: 179504

update to 313.26

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

-----------------+
 PKGBUILD        |   24 +++++++++---------------
 linux-3.7.patch |   24 ------------------------
 linux-3.8.patch |   12 ------------
 nvidia.install  |    6 +++---
 4 files changed, 12 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-05 17:39:25 UTC (rev 179503)
+++ PKGBUILD	2013-03-05 18:17:31 UTC (rev 179504)
@@ -2,33 +2,29 @@
 # Maintainer : Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia
-pkgver=313.18
-_extramodules=extramodules-3.8-ARCH
-pkgrel=4
+pkgver=313.26
+_extramodules=extramodules-3.7-ARCH
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.8' 'linux-headers<3.9')
+depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('linux-3.7.patch'
-        'linux-3.8.patch')
-md5sums=('7c684fab691b15d55a79fd8f9b1a224d'
-         '9b20edcefc8ad28f40bdf9a5e26ef731')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('780c37c28a6e06e9571cafe348b7da64')
+    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums=('3c2f5138d0fec58b27e26c5b37d845b8')
 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+=('fa17a260793a38b4b8ae367db2e03b39')
+    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums=('2d35124fa5a4b009f170fe893b5d07e3')
 fi
 
 build() {
@@ -36,8 +32,6 @@
     cd "${srcdir}"
     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
 }
 

Deleted: linux-3.7.patch
===================================================================
--- linux-3.7.patch	2013-03-05 17:39:25 UTC (rev 179503)
+++ linux-3.7.patch	2013-03-05 18:17:31 UTC (rev 179504)
@@ -1,24 +0,0 @@
-the nvidia drivers are trying to test for version 2.6.6, but fail to take into
-account the first digit.  so 3.7.0+ ends up failing the test.
-
-https://bugs.gentoo.org/447566
-
---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1697,13 +1697,15 @@
-                 # kernel older than 2.6.6, that's all we require to
-                 # build the module.
-                 #
-+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
-                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
--                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
-+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
-             fi
-         fi

Deleted: linux-3.8.patch
===================================================================
--- linux-3.8.patch	2013-03-05 17:39:25 UTC (rev 179503)
+++ linux-3.8.patch	2013-03-05 18:17:31 UTC (rev 179504)
@@ -1,12 +0,0 @@
-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-03-05 17:39:25 UTC (rev 179503)
+++ nvidia.install	2013-03-05 18:17:31 UTC (rev 179504)
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.7-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.8-ARCH'
+    EXTRAMODULES='extramodules-3.7-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.8-ARCH'
+    EXTRAMODULES='extramodules-3.7-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }