From a45e42bce3af849071ed758166a15354e9ba6b9ab18d4c59392333a779d2df1a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 6 Feb 2015 15:06:37 +0000 Subject: [PATCH] - U_don-t-use-PCITAG-in-struct-anymore.patch * fixes build against xorg-server 1.17 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-voodoo?expand=0&rev=11 --- U_don-t-use-PCITAG-in-struct-anymore.patch | 26 ++++++++++++++++++++++ xf86-video-voodoo.changes | 6 +++++ xf86-video-voodoo.spec | 4 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 U_don-t-use-PCITAG-in-struct-anymore.patch diff --git a/U_don-t-use-PCITAG-in-struct-anymore.patch b/U_don-t-use-PCITAG-in-struct-anymore.patch new file mode 100644 index 0000000..1c74710 --- /dev/null +++ b/U_don-t-use-PCITAG-in-struct-anymore.patch @@ -0,0 +1,26 @@ +From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +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 */ +-- +1.8.4.5 + diff --git a/xf86-video-voodoo.changes b/xf86-video-voodoo.changes index 835f667..9e647f8 100644 --- a/xf86-video-voodoo.changes +++ b/xf86-video-voodoo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 6 15:03:35 UTC 2015 - sndirsch@suse.com + +- U_don-t-use-PCITAG-in-struct-anymore.patch + * fixes build against xorg-server 1.17 + ------------------------------------------------------------------- Wed Aug 7 15:03:57 CEST 2013 - ro@suse.de diff --git a/xf86-video-voodoo.spec b/xf86-video-voodoo.spec index ad636d4..c90f991 100644 --- a/xf86-video-voodoo.spec +++ b/xf86-video-voodoo.spec @@ -1,7 +1,7 @@ # # spec file for package xf86-video-voodoo # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch0: U_don-t-use-PCITAG-in-struct-anymore.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -77,6 +78,7 @@ supported. %prep %setup -q +%patch0 -p1 %build %configure