[arch-commits] Commit in nvidia/trunk (PKGBUILD nvidia-linux-3.12.patch)

[Sven-Hendrik Haase]

    Date: Friday, November 15, 2013 @ 22:40:31
  Author: svenstaro
Revision: 199770

upgpkg: nvidia 331.20-1

Updating to 331.20

Modified:
  nvidia/trunk/PKGBUILD
Deleted:
  nvidia/trunk/nvidia-linux-3.12.patch

-------------------------+
 PKGBUILD                |   13 ++++++-------
 nvidia-linux-3.12.patch |   40 ----------------------------------------
 2 files changed, 6 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-15 21:36:26 UTC (rev 199769)
+++ PKGBUILD	2013-11-15 21:40:31 UTC (rev 199770)
@@ -2,9 +2,9 @@
 # Maintainer : Thomas Baechler <thomas at archlinux.org>
 
 pkgname=nvidia
-pkgver=325.15
+pkgver=331.20
 _extramodules=extramodules-3.12-ARCH
-pkgrel=11
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,19 +14,19 @@
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=('nvidia-linux-3.12.patch')
-md5sums=('d267069bc456de269424b4e1b46a3745')
+#source=('nvidia-linux-3.12.patch')
+#md5sums=('d267069bc456de269424b4e1b46a3745')
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums+=('528fc538584de6446384b9cec3099d6c')
+    md5sums+=('801aa04a087891690f1cac09575b2ba9')
 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+=('63b2caa0cb128efa1a7808d7bddb2074')
+    md5sums+=('28295eed56c2ca996401c0093279620f')
 fi
 
 prepare() {
@@ -33,7 +33,6 @@
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
-    patch -Np1 -i ${srcdir}/nvidia-linux-3.12.patch
 }
 
 build() {

Deleted: nvidia-linux-3.12.patch
===================================================================
--- nvidia-linux-3.12.patch	2013-11-15 21:36:26 UTC (rev 199769)
+++ nvidia-linux-3.12.patch	2013-11-15 21:40:31 UTC (rev 199770)
@@ -1,40 +0,0 @@
-diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c
---- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c	2013-08-01 02:49:26.000000000 +0200
-+++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c	2013-11-06 01:16:40.547079457 +0100
-@@ -106,7 +106,6 @@
-     .unlocked_ioctl = drm_ioctl,
-     .mmap = drm_gem_mmap,
-     .poll = drm_poll,
--    .fasync = drm_fasync,
-     .read = drm_read,
-     .llseek = noop_llseek,
- };
-@@ -202,12 +201,7 @@
-     memset(&nv_obj->base, 0, sizeof(nv_obj->base));
-     nv_obj->pages = pages;
- 
--    ret = drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
--    if (ret)
--    {
--        status = RM_ERR_OPERATING_SYSTEM;
--        goto done;
--    }
-+    drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
- 
-     ret = drm_gem_handle_create(file_priv, &nv_obj->base, handle);
-     if (ret)
-diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h
---- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h	2013-08-01 02:49:26.000000000 +0200
-+++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h	2013-11-06 01:15:41.838303440 +0100
-@@ -958,7 +958,11 @@
- #endif
- 
- #if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
- #define NV_NUM_PHYSPAGES                num_physpages
-+#else
-+#define NV_NUM_PHYSPAGES                get_num_physpages()
-+#endif
- #define NV_GET_CURRENT_PROCESS()        current->tgid
- #define NV_IN_ATOMIC()                  in_atomic()
- #define NV_LOCAL_BH_DISABLE()           local_bh_disable()