1 |
commit: f2cda5a999588b6deb5041ff6d5a6ae31624feca |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 29 23:36:19 2015 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 29 23:36:37 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cda5a9 |
7 |
|
8 |
x11-drivers/xf86-video-voodoo: Add patch to fix compilation. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/550642 |
11 |
|
12 |
.../files/xf86-video-voodoo-1.2.5-no-PCITAG.patch | 26 ++++++++++++++++++++++ |
13 |
.../xf86-video-voodoo-1.2.5.ebuild | 6 ++++- |
14 |
2 files changed, 31 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch b/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch |
17 |
new file mode 100644 |
18 |
index 0000000..31e7079 |
19 |
--- /dev/null |
20 |
+++ b/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch |
21 |
@@ -0,0 +1,26 @@ |
22 |
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 |
23 |
+From: Dave Airlie <airlied@××××××.com> |
24 |
+Date: Mon, 22 Sep 2014 10:56:02 +1000 |
25 |
+Subject: [PATCH] don't use PCITAG in struct anymore |
26 |
+ |
27 |
+--- |
28 |
+ src/voodoo.h | 2 ++ |
29 |
+ 1 file changed, 2 insertions(+) |
30 |
+ |
31 |
+diff --git a/src/voodoo.h b/src/voodoo.h |
32 |
+index bfed497..c3eb64e 100644 |
33 |
+--- a/src/voodoo.h |
34 |
++++ b/src/voodoo.h |
35 |
+@@ -23,7 +23,9 @@ typedef struct { |
36 |
+ |
37 |
+ Bool Voodoo2; /* Set if Voodoo2 */ |
38 |
+ pciVideoPtr PciInfo; /* PCI data */ |
39 |
++#ifndef XSERVER_LIBPCIACCESS |
40 |
+ PCITAG PciTag; |
41 |
++#endif |
42 |
+ CARD32 PhysBase; |
43 |
+ |
44 |
+ CARD32 Width; /* Current width */ |
45 |
+-- |
46 |
+2.4.6 |
47 |
+ |
48 |
|
49 |
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild |
50 |
index 2917b2f..dffd9e8 100644 |
51 |
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild |
52 |
+++ b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild |
53 |
@@ -1,4 +1,4 @@ |
54 |
-# Copyright 1999-2012 Gentoo Foundation |
55 |
+# Copyright 1999-2015 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Id$ |
58 |
|
59 |
@@ -12,3 +12,7 @@ IUSE="" |
60 |
RDEPEND=">=x11-base/xorg-server-1.0.99" |
61 |
DEPEND="${RDEPEND} |
62 |
x11-proto/xf86dgaproto" |
63 |
+ |
64 |
+PATCHES=( |
65 |
+ "${FILESDIR}"/${P}-no-PCITAG.patch |
66 |
+) |