[arch-commits] Commit in nvidia-340xx/trunk (PKGBUILD nv-drm.patch)

[Felix Yan]

    Date: Sunday, December 21, 2014 @ 05:39:21
  Author: fyan
Revision: 227855

upgpkg: nvidia-340xx 340.65-6

add patch to fix FS#43147

Added:
  nvidia-340xx/trunk/nv-drm.patch
Modified:
  nvidia-340xx/trunk/PKGBUILD

--------------+
 PKGBUILD     |    9 ++++++---
 nv-drm.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-21 04:23:41 UTC (rev 227854)
+++ PKGBUILD	2014-12-21 04:39:21 UTC (rev 227855)
@@ -4,7 +4,7 @@
 pkgname=nvidia-340xx
 pkgver=340.65
 _extramodules=extramodules-3.18-ARCH
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -15,9 +15,11 @@
 install=${pkgname}.install
 options=(!strip)
 source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+        nv-drm.patch)
 md5sums=('4aa6039b8543312b41a924bb87b0b2db'
-         '4558104f8601d27c7fd3e5cec7892345')
+         '4558104f8601d27c7fd3e5cec7892345'
+         '79671a27131da619a33eb02ed0c2c031')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -26,6 +28,7 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
+    patch -p0 -i ../nv-drm.patch
 }
 
 build() {

Added: nv-drm.patch
===================================================================
--- nv-drm.patch	                        (rev 0)
+++ nv-drm.patch	2014-12-21 04:39:21 UTC (rev 227855)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",