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

Felix Yan fyan at archlinux.org
Fri Dec 19 16:10:30 UTC 2014


    Date: Friday, December 19, 2014 @ 17:10:29
  Author: fyan
Revision: 227789

upgpkg: nvidia-304xx 304.125-5

fix FS#43147

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-19 15:20:27 UTC (rev 227788)
+++ PKGBUILD	2014-12-19 16:10:29 UTC (rev 227789)
@@ -5,7 +5,7 @@
 pkgname=nvidia-304xx
 pkgver=304.125
 _extramodules=extramodules-3.18-ARCH
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,16 +23,20 @@
     md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
-   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+    _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
     md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0')
 fi
 
+source+=('nv-drm.patch')
+md5sums+=('79671a27131da619a33eb02ed0c2c031')
+
 prepare() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
-    cd "${pkg}"
+    cd "${_pkg}"
     # patches here
+    patch -p0 -i "$srcdir/nv-drm.patch"
 }
 
 build() {

Added: nv-drm.patch
===================================================================
--- nv-drm.patch	                        (rev 0)
+++ nv-drm.patch	2014-12-19 16:10:29 UTC (rev 227789)
@@ -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",



More information about the arch-commits mailing list