Hello community, here is the log from the commit of package xf86-video-r128 for openSUSE:Factory checked in at 2015-02-10 20:16:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-r128 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-r128.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-r128" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-r128/xf86-video-r128.changes 2013-10-25 18:55:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-r128.new/xf86-video-r128.changes 2015-02-10 20:16:54.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 6 11:59:43 UTC 2015 - [email protected] + +- U_Only-declare-PCITAG-if-we-need-it.patch + * fixes build against xorg-server 1.17 + +------------------------------------------------------------------- New: ---- U_Only-declare-PCITAG-if-we-need-it.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-r128.spec ++++++ --- /var/tmp/diff_new_pack.3cncQB/_old 2015-02-10 20:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.3cncQB/_new 2015-02-10 20:16:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-r128 # -# 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 @@ 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_Only-declare-PCITAG-if-we-need-it.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -58,6 +59,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ U_Only-declare-PCITAG-if-we-need-it.patch ++++++ >From 9eb693640136bc8bcbe706d642519b4eb23286d4 Mon Sep 17 00:00:00 2001 From: Connor Behan <[email protected]> Date: Wed, 27 Nov 2013 18:14:43 -0800 Subject: [PATCH] Only declare PCITAG if we need it If libpciaccess is available, we do not need to declare the deprecated PciTag member because it will not be used. Signed-off-by: Connor Behan <[email protected]> Reviewed-by: Alex Deucher <[email protected]> --- src/r128.h | 2 ++ src/r128_driver.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/r128.h b/src/r128.h index 90071b4..ee0b1d4 100644 --- a/src/r128.h +++ b/src/r128.h @@ -301,7 +301,9 @@ struct r128_2d_state { typedef struct { EntityInfoPtr pEnt; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif int Chipset; Bool Primary; diff --git a/src/r128_driver.c b/src/r128_driver.c index 04a4537..0a0b82b 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1957,9 +1957,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) } info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); - info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), - PCI_DEV_DEV(info->PciInfo), - PCI_DEV_FUNC(info->PciInfo)); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "PCI bus %d card %d func %d\n", @@ -1968,6 +1965,10 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) PCI_DEV_FUNC(info->PciInfo)); #ifndef XSERVER_LIBPCIACCESS + info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), + PCI_DEV_DEV(info->PciInfo), + PCI_DEV_FUNC(info->PciInfo)); + if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail; if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail; -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
