- fix building with xserver 1.17

- rel 8

diff --git a/pciaccess.patch b/pciaccess.patch
new file mode 100644 (file)
index 0000000..7fb91e9
--- /dev/null
+++ b/pciaccess.patch
@@ -0,0 +1,23 @@
+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: don't use PCITAG in struct anymore
+
+
+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 */
+-- 
+cgit v0.10.2
+

diff --git a/xorg-driver-video-voodoo.spec b/xorg-driver-video-voodoo.spec
index 1c5ceb50d1eec53044d8887ac4914f6f12966847..55675623037f463b5cc56405e590cbd8adddc165 100644 (file)
--- a/xorg-driver-video-voodoo.spec
+++ b/xorg-driver-video-voodoo.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for Voodoo1 and Voodoo2 video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych Voodoo1 i Voodoo2
 Name:          xorg-driver-video-voodoo
 Version:       1.2.5
-Release:       7
+Release:       8
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-%{version}.tar.bz2
 # Source0-md5: fe71b83352cb96c41ff6a73a46a05e20
+Patch0:                pciaccess.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -34,6 +35,7 @@ Sterownik obrazu X.org dla kart graficznych Voodoo1 i Voodoo2.
 
 %prep
 %setup -q -n xf86-video-voodoo-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}