summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2017-04-11 09:07:04 +0200
committerJeroen Roovers <jer@gentoo.org>2017-04-11 09:07:20 +0200
commit6593722f33f09717f05320e435313c862296fbac (patch)
treea58a5c82f41babedb9754aa0d54bcfad398206ca /x11-drivers
parentdev-perl/Alien-wxWidgets: Bump to version 0.680.0 (diff)
downloadgentoo-6593722f33f09717f05320e435313c862296fbac.tar.gz
gentoo-6593722f33f09717f05320e435313c862296fbac.tar.bz2
gentoo-6593722f33f09717f05320e435313c862296fbac.zip
x11-drivers/nvidia-drivers: Fix building without CONFIG_MTRR (bug #614706 by David Flogeras).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch12
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild2
2 files changed, 14 insertions, 0 deletions
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 000000000000..f902c742b742
--- /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 f1f1cab7dc55..1946ef0b4059 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