From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39415139694 for ; Tue, 11 Apr 2017 07:07:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40E1E21C072; Tue, 11 Apr 2017 07:07:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21AED21C072 for ; Tue, 11 Apr 2017 07:07:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49ECB33BEAE for ; Tue, 11 Apr 2017 07:07:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1777369BC for ; Tue, 11 Apr 2017 07:07:22 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1491894440.6593722f33f09717f05320e435313c862296fbac.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-drivers-304.135-endif.patch x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ x11-drivers/nvidia-drivers/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 6593722f33f09717f05320e435313c862296fbac X-VCS-Branch: master Date: Tue, 11 Apr 2017 07:07:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e0c3a5b2-ac54-4bf3-b6df-ebf326ad1a84 X-Archives-Hash: f3bc450213169091941e9a0282f63d08 commit: 6593722f33f09717f05320e435313c862296fbac Author: Jeroen Roovers gentoo org> AuthorDate: Tue Apr 11 07:07:04 2017 +0000 Commit: Jeroen Roovers gentoo 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