From 3dc10093f5074ac32f3904bfdb336d5c7b2fa6e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 6 Mar 2010 00:16:20 +0100 Subject: [PATCH] xf86-video-nvidia: - upgrade to NVIDIA-Linux-195.36.08 --- .../patches.upstream/autoconf-location.diff | 47 ------------------- ...drivers-190.42-r4-acpi_walk_namespace.diff | 17 ------- packages/x11/driver/xf86-video-nvidia/url | 4 +- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff b/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff deleted file mode 100644 index 95f75374bf..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/autoconf-location.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur xf86-video-nvidia/usr/src/nv/conftest.sh xf86-video-nvidia.patch/usr/src/nv/conftest.sh ---- xf86-video-nvidia/usr/src/nv/conftest.sh 2009-12-19 00:10:53.000000000 +0100 -+++ xf86-video-nvidia.patch/usr/src/nv/conftest.sh 2010-01-21 14:20:31.000000000 +0100 -@@ -33,14 +33,14 @@ - # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats - # the kernel as a stand-alone kernel. - # -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # - # We are looking at a configured source tree; verify - # that it's not a Xen kernel. - # -- echo "#include -+ echo "#include - #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) - #error CONFIG_XEN defined! - #endif -@@ -110,7 +110,7 @@ - fi - } - --CONFTEST_PREAMBLE="#include -+CONFTEST_PREAMBLE="#include - #if defined(CONFIG_XEN) && \ - defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) - #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION -@@ -1365,7 +1365,7 @@ - # - RET=1 - VERBOSE=$7 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -@@ -1419,7 +1419,7 @@ - # - RET=1 - VERBOSE=$7 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff b/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff deleted file mode 100644 index 5fbeac5e92..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/nvidia-drivers-190.42-r4-acpi_walk_namespace.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- NVIDIA-Linux-x86_64-190.42-pkg2/usr/src/nv/nvacpi.c.orig 2009-12-14 02:52:35.000000000 +0100 -+++ NVIDIA-Linux-x86_64-190.42-pkg2/usr/src/nv/nvacpi.c 2009-12-14 02:51:45.000000000 +0100 -@@ -507,8 +507,14 @@ - - *handlesPresent = 0; - -+ #if ACPI_CA_VERSION < 0x20091112 - acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, nv_acpi_find_methods, NULL, NULL); -+ #else -+ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, -+ ACPI_UINT32_MAX, nv_acpi_find_methods, NULL, NULL, NULL); -+ #endif -+ - - if (nvif_handle) - { diff --git a/packages/x11/driver/xf86-video-nvidia/url b/packages/x11/driver/xf86-video-nvidia/url index 60b1a30797..2c529b2237 100644 --- a/packages/x11/driver/xf86-video-nvidia/url +++ b/packages/x11/driver/xf86-video-nvidia/url @@ -1,2 +1,2 @@ -ftp://download.nvidia.com/XFree86/Linux-x86/195.30/NVIDIA-Linux-x86-195.30-pkg0.run -ftp://download.nvidia.com/XFree86/Linux-x86_64/195.30/NVIDIA-Linux-x86_64-195.30-pkg0.run \ No newline at end of file +ftp://download.nvidia.com/XFree86/Linux-x86/195.36.08/NVIDIA-Linux-x86-195.36.08-pkg0.run +ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.08/NVIDIA-Linux-x86_64-195.36.08-pkg0.run \ No newline at end of file