xf86-video-cirrus: update to 1.5.3.

This commit is contained in:
Juan RP 2015-05-08 07:14:55 +02:00
parent 75fc82173f
commit 14e21fb648
2 changed files with 3 additions and 59 deletions
srcpkgs/xf86-video-cirrus

View file

@ -1,56 +0,0 @@
From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Sat, 20 Sep 2014 18:51:17 +1000
Subject: cirrus: don't use pciTag
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 36f2039..bd5e52f 100644
--- src/alp_driver.c
+++ 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
--- src/cir.h
+++ 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
--- src/lg_driver.c
+++ 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;
--
cgit v0.10.2

View file

@ -1,7 +1,7 @@
# Template build file for 'xf86-video-cirrus'.
pkgname=xf86-video-cirrus
version=1.5.2
revision=5
version=1.5.3
revision=1
lib32disabled=yes
build_style=gnu-configure
hostmakedepends="pkg-config"
@ -12,4 +12,4 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab