Hello community, here is the log from the commit of package xf86-video-cirrus for openSUSE:Factory checked in at 2015-02-10 20:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-cirrus (Old) and /work/SRC/openSUSE:Factory/.xf86-video-cirrus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-cirrus" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-cirrus/xf86-video-cirrus.changes 2014-02-21 19:43:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-cirrus.new/xf86-video-cirrus.changes 2015-02-10 20:16:14.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 6 11:09:49 UTC 2015 - [email protected] + +- U_cirrus-don-t-use-pciTag.patch + * fixes build against xorg-server 1.17 + +------------------------------------------------------------------- New: ---- U_cirrus-don-t-use-pciTag.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-cirrus.spec ++++++ --- /var/tmp/diff_new_pack.giaa3W/_old 2015-02-10 20:16:15.000000000 +0100 +++ /var/tmp/diff_new_pack.giaa3W/_new 2015-02-10 20:16:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-cirrus # -# 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 @@ -28,6 +28,7 @@ Patch0: u_cirrus-qemu.patch # PATCH-FIX-UPSTREAM cirrus-1.3.2-virt-16bpp.patch [email protected] -- Use 16bpp when running in virt (Fedora) Patch1: u_cirrus-virt-16bpp.patch +Patch2: U_cirrus-don-t-use-pciTag.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -53,6 +54,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure ++++++ U_cirrus-don-t-use-pciTag.patch ++++++ >From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001 From: Dave Airlie <[email protected]> Date: Sat, 20 Sep 2014 18:51:17 +1000 Subject: [PATCH] cirrus: don't use pciTag Signed-off-by: Dave Airlie <[email protected]> --- src/alp_driver.c | 2 ++ src/cir.h | 2 ++ src/lg_driver.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/alp_driver.c b/src/alp_driver.c index 36f2039..bd5e52f 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) pCir->Chipset = pCir->pEnt->chipset; /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (!xf86IsPc98()) diff --git a/src/cir.h b/src/cir.h index 0a5d403..84f64b5 100644 --- a/src/cir.h +++ b/src/cir.h @@ -23,7 +23,9 @@ typedef struct { ScrnInfoPtr pScrn; CARD32 properties; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif unsigned long PIOReg; union { struct lgRec *lg; diff --git a/src/lg_driver.c b/src/lg_driver.c index c20bbd0..589d14e 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif if (xf86LoadSubModule(pScrn, "int10")) { xf86Int10InfoPtr int10InfoPtr; -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
