kolan
/
Overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nvidia-drivers-334.21-r3 updated

This commit is contained in:
Kolan Sh 2014-04-09 11:10:00 +04:00
parent b3e3671e31
commit 383c7ba102
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch Normal file
View File

@ -0,0 +1,15 @@
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -273,8 +273,12 @@
#endif
#if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
#include <acpi/acpi.h>
#include <acpi/acpi_drivers.h>
+#else
+#include <linux/acpi.h>
+#endif
#if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
#define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
#endif

3
x11-drivers/nvidia-drivers/files/nvidia-uvm.conf.1 Normal file
View File

@ -0,0 +1,3 @@
# Nvidia UVM support
remove nvidia modprobe -r --ignore-remove nvidia-uvm nvidia

15
x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild
View File

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.1 2014/03/31 20:24:35 jer Exp $ # $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.3 2014/04/08 20:02:47 vapier Exp $
EAPI=5 EAPI=5
@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2 NVIDIA-r2" LICENSE="GPL-2 NVIDIA-r2"
SLOT="0" SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm" IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
RESTRICT="bindist mirror strip" RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true" EMULTILIB_PKG="true"
@ -158,15 +158,6 @@ pkg_setup() {
fi fi
} }
src_unpack() {
if use kernel_FreeBSD; then
unpack ${A}
elif use kernel_linux; then
cd "${S}"
unpack_makeself
fi
}
src_prepare() { src_prepare() {
# Please add a brief description for every added patch # Please add a brief description for every added patch
@ -186,6 +177,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
fi fi
epatch "${FILESDIR}"/${P}-linux-3.14.patch
# Allow user patches so they can support RC kernels and whatever else # Allow user patches so they can support RC kernels and whatever else
epatch_user epatch_user
} }