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

[Tobias Powalowski]

    Date: Tuesday, December 11, 2012 @ 10:16:18
  Author: tpowa
Revision: 173139

upgpkg: nvidia-304xx 304.64-1

bump to 3.7 series

Added:
  nvidia-304xx/trunk/uapi-3.7.patch
Modified:
  nvidia-304xx/trunk/PKGBUILD
  nvidia-304xx/trunk/nvidia.install

----------------+
 PKGBUILD       |   20 +++++++++++++-------
 nvidia.install |    6 +++---
 uapi-3.7.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-11 15:10:59 UTC (rev 173138)
+++ PKGBUILD	2012-12-11 15:16:18 UTC (rev 173139)
@@ -3,13 +3,13 @@
 
 pkgname=nvidia-304xx
 pkgver=304.64
-_extramodules=extramodules-3.6-ARCH
+_extramodules=extramodules-3.7-ARCH
 pkgrel=1
 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
+depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
 conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
@@ -18,13 +18,17 @@
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('6964415cf648a5f4f38117b168369de2')
+    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+            'uapi-3.7.patch')
+    md5sums=('6964415cf648a5f4f38117b168369de2'
+             '502d00dc850148d61fc06c907601498e')
 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')
+    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+            'uapi-3.7.patch')
+    md5sums=('76007ed4b72afd334e26377b646f5f7e'
+             '502d00dc850148d61fc06c907601498e')
 fi
 
 build() {
@@ -32,6 +36,7 @@
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
+    patch -Np0 -i "${srcdir}/uapi-3.7.patch"
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
@@ -43,3 +48,4 @@
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 }
+

Modified: nvidia.install
===================================================================
--- nvidia.install	2012-12-11 15:10:59 UTC (rev 173138)
+++ nvidia.install	2012-12-11 15:16:18 UTC (rev 173139)
@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.6-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.6-ARCH'
+    EXTRAMODULES='extramodules-3.7-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
+    EXTRAMODULES='extramodules-3.7-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }

Added: uapi-3.7.patch
===================================================================
--- uapi-3.7.patch	                        (rev 0)
+++ uapi-3.7.patch	2012-12-11 15:16:18 UTC (rev 173139)
@@ -0,0 +1,42 @@
+--- 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)