[arch-commits] Commit in nvidia-304xx/trunk (PKGBUILD nvidia_3.13_kernel.patch)

[Felix Yan]

    Date: Wednesday, March 12, 2014 @ 18:34:56
  Author: fyan
Revision: 207593

upgpkg: nvidia-304xx 304.121-1

Modified:
  nvidia-304xx/trunk/PKGBUILD
Deleted:
  nvidia-304xx/trunk/nvidia_3.13_kernel.patch

--------------------------+
 PKGBUILD                 |   19 ++++++++-----------
 nvidia_3.13_kernel.patch |   25 -------------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-12 17:20:58 UTC (rev 207592)
+++ PKGBUILD	2014-03-12 17:34:56 UTC (rev 207593)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia-304xx
-pkgver=304.119
+pkgver=304.121
 _extramodules=extramodules-3.13-ARCH
-pkgrel=2
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,19 +15,17 @@
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('nvidia_3.13_kernel.patch')
-md5sums=('f1569a1ce7f9293b876c2b72f3fd7c9e')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('a2acb8066ac296005dbf560ee83ae6d9')
+    source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
 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+=('fb93002115c99f15b6ca393a90a9c9ec')
+    source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+    md5sums=('41e6d2b6325e5b0ae9889cfbd6bec696')
 fi
 
 
@@ -33,8 +32,6 @@
 prepare() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
-    cd "${_pkg}"
-    patch -p1 -i "${srcdir}"/nvidia_3.13_kernel.patch
 }
 
 build() {

Deleted: nvidia_3.13_kernel.patch
===================================================================
--- nvidia_3.13_kernel.patch	2014-03-12 17:20:58 UTC (rev 207592)
+++ nvidia_3.13_kernel.patch	2014-03-12 17:34:56 UTC (rev 207593)
@@ -1,25 +0,0 @@
-diff -Nur NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c
---- NVIDIA-Linux-x86_64-304.117-no-compat32.orig/kernel/nv-acpi.c	2013-11-27 06:25:42.000000000 +0100
-+++ NVIDIA-Linux-x86_64-304.117-no-compat32/kernel/nv-acpi.c	2014-01-26 12:25:06.443610357 +0100
-@@ -15,6 +15,10 @@
- #include "nv-linux.h"
- #include "nv-reg.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
-+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
-+#endif
-+
- #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
- 
- static int         nv_acpi_add             (struct acpi_device *);
-@@ -299,7 +303,10 @@
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);