Accepting request 284502 from X11:XOrg

- U_don-t-use-PCITAG-in-struct-anymore.patch
  * fixes build against xorg-server 1.17

OBS-URL: https://build.opensuse.org/request/show/284502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xf86-video-voodoo?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2015-02-10 19:17:29 +00:00 committed by Git OBS Bridge
commit 987a2ce179
3 changed files with 35 additions and 1 deletions

View File

@ -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 */
--
1.8.4.5

View File

@ -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

View File

@ -1,7 +1,7 @@
#
# spec file for package xf86-video-voodoo
#
# Copyright (c) 2013 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