summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2015-07-03 10:31:32 +0000
committerwiz <wiz@pkgsrc.org>2015-07-03 10:31:32 +0000
commiteab2504fa423a3466eb4356778d93f013daef7ab (patch)
treed1c002a58ce9848a94e08b609edfc659ad7e85fe /x11
parentf1371d0b5ca3968100b4f0dec18f1fc26df6fc0d (diff)
downloadpkgsrc-eab2504fa423a3466eb4356778d93f013daef7ab.tar.gz
Fix build using upstream patch.
Diffstat (limited to 'x11')
-rw-r--r--x11/xf86-video-voodoo/distinfo4
-rw-r--r--x11/xf86-video-voodoo/patches/patch-src_voodoo.h20
2 files changed, 22 insertions, 2 deletions
diff --git a/x11/xf86-video-voodoo/distinfo b/x11/xf86-video-voodoo/distinfo
index a18e57077a6..267e75f5594 100644
--- a/x11/xf86-video-voodoo/distinfo
+++ b/x11/xf86-video-voodoo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/07/02 03:37:49 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/07/03 10:31:32 wiz Exp $
SHA1 (xf86-video-voodoo-1.2.5.tar.bz2) = 7316df33814694ad2fb1617bcd92e6e42c3d184f
RMD160 (xf86-video-voodoo-1.2.5.tar.bz2) = 80d69602164641dfef9bb951f4ad694c06de9bc1
Size (xf86-video-voodoo-1.2.5.tar.bz2) = 305489 bytes
-SHA1 (patch-src_voodoo.h) = e964411361df6bc7eafd4fc8db19a84bf76c5876
+SHA1 (patch-src_voodoo.h) = bf1701a6a8b9ac14fab7b71d9faea4592f2a9cbc
diff --git a/x11/xf86-video-voodoo/patches/patch-src_voodoo.h b/x11/xf86-video-voodoo/patches/patch-src_voodoo.h
new file mode 100644
index 00000000000..d042c10dbcf
--- /dev/null
+++ b/x11/xf86-video-voodoo/patches/patch-src_voodoo.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_voodoo.h,v 1.1 2015/07/03 10:31:32 wiz Exp $
+
+commit 9172ae566a0e85313fc80ab62b4455393eefe593
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Sep 22 10:56:02 2014 +1000
+
+ don't use PCITAG in struct anymore
+
+--- src/voodoo.h.orig 2012-07-17 05:21:17.000000000 +0000
++++ 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 */