Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=026e0e0617c901d624cf48d49a2ab9386562deb4
commit 026e0e0617c901d624cf48d49a2ab9386562deb4
Author: James Buren <r...@frugalware.org>
Date: Mon May 13 07:32:50 2013 -0500
nvidia-304.88-1-x86_64
* version bump
* rebuild with kernel 3.9
* remove kernel 3.7 patch
diff --git a/source/x11-extra/nvidia/FrugalBuild
b/source/x11-extra/nvidia/FrugalBuild
index 5b18a2d..2c56f49 100644
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Michel Hermier <herm...@frugalware.org>
pkgname=nvidia
-pkgver=304.64
-pkgrel=8
+pkgver=304.88
+pkgrel=1
archs=('i686' 'x86_64')
_F_kernelmod_scriptlet=nvidia.install
Finclude kernel-module
@@ -28,19 +28,17 @@ case "$CARCH" in
i686)
_F_nvidia_name="NVIDIA-Linux-x86-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/${_F_nvidia_name}.run";)
- sha1sums=('71f3306adcaa094cdc5b2f7a7ba83aa94ce6876a');;
+ sha1sums=('94104b3ce0d537667a551bd1d41c8990404693fb');;
x86_64)
_F_nvidia_name="NVIDIA-Linux-${CARCH}-${pkgver}-no-compat32"
source=("http://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_F_nvidia_name}.run";)
- sha1sums=('3d81e0ec0862b8837189f4d3ba97c5a92926e87d');;
+ sha1sums=('026597ffbd0fd14c801ef9a56bc2fc30234eb1bc');;
esac
source=("${source[@]}" \
- kernel-3.7.patch \
modprobe-nvidia.conf \
xorg-nvidia.conf)
sha1sums=("${sha1sums[@]}" \
- '45f7c62b7da6ce07f02f81bb914885d169d68f1e' \
'a2bf63eb7dffdfc9268534654d3864e865af6834' \
'15455cb16a6638ee348dc01620c7f64234178ac8')
diff --git a/source/x11-extra/nvidia/kernel-3.7.patch
b/source/x11-extra/nvidia/kernel-3.7.patch
deleted file mode 100644
index 4c0f29a..0000000
--- a/source/x11-extra/nvidia/kernel-3.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh 2012-12-12 16:37:50.774115729 -0600
-+++ b/kernel/conftest.sh 2012-12-12 16:38:03.750119976 -0600
-@@ -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
-diff -ur a/kernel/nv-mmap.c b/kernel/nv-mmap.c
---- a/kernel/nv-mmap.c 2012-12-12 16:37:50.773115728 -0600
-+++ b/kernel/nv-mmap.c 2012-12-12 16:38:03.752119978 -0600
-@@ -463,7 +463,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)
- vma->vm_flags |= VM_DRIVER_PAGES;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
