diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-04-08 20:02:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-04-08 20:02:47 +0000 |
| commit | db86fb7b7df7f3719307a6836ef0d37f25cf7b16 (patch) | |
| tree | 0a9a4791ffe330a2dfbb1c679fba1f462f355f85 /x11-drivers | |
| parent | Stable for ppc, wrt bug #500368 (diff) | |
| download | gentoo-2-db86fb7b7df7f3719307a6836ef0d37f25cf7b16.tar.gz gentoo-2-db86fb7b7df7f3719307a6836ef0d37f25cf7b16.tar.bz2 gentoo-2-db86fb7b7df7f3719307a6836ef0d37f25cf7b16.zip | |
Add patch to fix building w/linux-3.14 #506466 by tman. Also switch over to default unpack from unpacker eclass.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'x11-drivers')
3 files changed, 25 insertions, 11 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 5710e996ba9b..25826f759e6d 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.544 2014/04/07 13:27:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.545 2014/04/08 20:02:47 vapier Exp $ + + 08 Apr 2014; Mike Frysinger <vapier@gentoo.org> + +files/nvidia-drivers-334.21-linux-3.14.patch, + nvidia-drivers-334.21-r3.ebuild: + Add patch to fix building w/linux-3.14 #506466 by tman. Also switch over to + default unpack from unpacker eclass. 07 Apr 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-331.49-r3.ebuild, nvidia-drivers-334.21-r3.ebuild: diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch new file mode 100644 index 000000000000..5a1705e14006 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch @@ -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 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild index 6bec0fe30ffe..63d7d96185ee 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # 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.2 2014/04/07 13:27:45 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 @@ -158,15 +158,6 @@ pkg_setup() { fi } -src_unpack() { - if use kernel_FreeBSD; then - unpack ${A} - elif use kernel_linux; then - cd "${S}" - unpack_makeself - fi -} - src_prepare() { # Please add a brief description for every added patch @@ -186,6 +177,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch fi + epatch "${FILESDIR}"/${P}-linux-3.14.patch + # Allow user patches so they can support RC kernels and whatever else epatch_user } |