From 14e21fb6487d4eef06ffb3d074ecb2fbee212a0e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 May 2015 07:14:55 +0200 Subject: [PATCH] xf86-video-cirrus: update to 1.5.3. --- .../patches/df389885adf71ed.patch | 56 ------------------- srcpkgs/xf86-video-cirrus/template | 6 +- 2 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch diff --git a/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch b/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch deleted file mode 100644 index 2a896632396..00000000000 --- a/srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch +++ /dev/null @@ -1,56 +0,0 @@ -From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Sat, 20 Sep 2014 18:51:17 +1000 -Subject: cirrus: don't use pciTag - -Signed-off-by: Dave Airlie - -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 - diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 8a1b3c7ae62..1c114b2ddcb 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -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 " distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7 +checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab