[arch-commits] Commit in nvidia-304xx/trunk (PKGBUILD linux-3.7.patch uapi-3.7.patch)

[Andreas Radke]

    Date: Thursday, March 7, 2013 @ 19:06:25
  Author: andyrtr
Revision: 179602

upgpkg: nvidia-304xx 304.84-1

upstream update 304.84

Modified:
  nvidia-304xx/trunk/PKGBUILD
Deleted:
  nvidia-304xx/trunk/linux-3.7.patch
  nvidia-304xx/trunk/uapi-3.7.patch

-----------------+
 PKGBUILD        |   14 ++++----------
 linux-3.7.patch |   24 ------------------------
 uapi-3.7.patch  |   42 ------------------------------------------
 3 files changed, 4 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-07 17:47:25 UTC (rev 179601)
+++ PKGBUILD	2013-03-07 18:06:25 UTC (rev 179602)
@@ -2,9 +2,9 @@
 # Maintainer : Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia-304xx
-pkgver=304.64
+pkgver=304.84
 _extramodules=extramodules-3.8-ARCH
-pkgrel=5
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,21 +14,17 @@
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('linux-3.7.patch'
-        'uapi-3.7.patch')
-md5sums=('7c684fab691b15d55a79fd8f9b1a224d'
-         '502d00dc850148d61fc06c907601498e')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('6964415cf648a5f4f38117b168369de2')
+    md5sums+=('3f9f724c5448e5b6952ad22092bdda83')
 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+=('76007ed4b72afd334e26377b646f5f7e')
+    md5sums+=('c26461c11170d8447d1464c37ff7c66b')
 fi
 
 build() {
@@ -36,8 +32,6 @@
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
-    patch -Np0 -i "${srcdir}/uapi-3.7.patch"
-    patch -Np3 -i "${srcdir}/linux-3.7.patch"
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 

Deleted: linux-3.7.patch
===================================================================
--- linux-3.7.patch	2013-03-07 17:47:25 UTC (rev 179601)
+++ linux-3.7.patch	2013-03-07 18:06:25 UTC (rev 179602)
@@ -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: uapi-3.7.patch
===================================================================
--- uapi-3.7.patch	2013-03-07 17:47:25 UTC (rev 179601)
+++ uapi-3.7.patch	2013-03-07 18:06:25 UTC (rev 179602)
@@ -1,42 +0,0 @@
---- conftest.sh.dist	2012-10-11 19:18:22.704848496 -0400
-+++ conftest.sh	2012-10-12 20:35:55.707213868 -0400
-@@ -20,6 +20,7 @@
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
- 
-@@ -118,7 +119,7 @@
-         fi
-     fi
- 
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     test_xen
- 
-@@ -146,10 +147,10 @@
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
-     fi
---- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
-+++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
-@@ -450,7 +450,7 @@
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
- 
--        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+	 vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
- 
- #if defined(VM_DRIVER_PAGES)