summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2015-08-29 16:36:19 -0700
committerMatt Turner <mattst88@gentoo.org>2015-08-29 16:36:37 -0700
commitf2cda5a999588b6deb5041ff6d5a6ae31624feca (patch)
treedf02af7cd734b1c25f12da5ab54cecaedbfcd36c /x11-drivers/xf86-video-voodoo
parentmedia-libs/mesa: Install VAAPI drivers to correct location. (diff)
downloadgentoo-f2cda5a999588b6deb5041ff6d5a6ae31624feca.tar.gz
gentoo-f2cda5a999588b6deb5041ff6d5a6ae31624feca.tar.bz2
gentoo-f2cda5a999588b6deb5041ff6d5a6ae31624feca.zip
x11-drivers/xf86-video-voodoo: Add patch to fix compilation.
Bug: https://bugs.gentoo.org/550642
Diffstat (limited to 'x11-drivers/xf86-video-voodoo')
-rw-r--r--x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch26
-rw-r--r--x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild6
2 files changed, 31 insertions, 1 deletions
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
new file mode 100644
index 000000000000..31e7079fa0fe
--- /dev/null
+++ b/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch
@@ -0,0 +1,26 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: [PATCH] don't use PCITAG in struct anymore
+
+---
+ src/voodoo.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+
+ Bool Voodoo2; /* Set if Voodoo2 */
+ pciVideoPtr PciInfo; /* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ CARD32 PhysBase;
+
+ CARD32 Width; /* Current width */
+--
+2.4.6
+
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
index 2917b2f9bffa..dffd9e8dd27a 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,3 +12,7 @@ IUSE=""
RDEPEND=">=x11-base/xorg-server-1.0.99"
DEPEND="${RDEPEND}
x11-proto/xf86dgaproto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-PCITAG.patch
+)