[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit:     6593722f33f09717f05320e435313c862296fbac
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 07:07:04 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 07:07:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6593722f

x11-drivers/nvidia-drivers: Fix building without CONFIG_MTRR (bug #614706 by 
David Flogeras).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../nvidia-drivers/files/nvidia-drivers-304.135-endif.patch  | 12 ++++++++++++
 x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild     |  2 ++
 2 files changed, 14 insertions(+)

diff --git 
a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch 
b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch
new file mode 100644
index 00000000000..f902c742b74
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch
@@ -0,0 +1,12 @@
+--- a/kernel/os-agp.c
++++ b/kernel/os-agp.c
+@@ -180,8 +180,8 @@
+     {
+         nv_mtrr_del(nv->agp.arch_phys_wc_add_token, agp_info.aper_base,
+                     agp_info.aper_size << 20);
+-#endif
+     }
++#endif
+ release:
+     NV_AGPGART_BACKEND_RELEASE(drm_agp_p, nvl->agp_bridge);
+ bailout:

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index f1f1cab7dc5..1946ef0b405 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
@@ -151,6 +151,8 @@ src_prepare() {
        # Please add a brief description for every added patch
 
        if use kernel_linux; then
+               eapply "${FILESDIR}"/${P}-endif.patch
+
                if kernel_is lt 2 6 9 ; then
                        eerror "You must build this against 2.6.9 or higher 
kernels."
                fi