[arch-commits] Commit in xf86-video-cirrus/trunk (PKGBUILD git-fixes.diff)

[Laurent Carlier]

    Date: Thursday, February 5, 2015 @ 22:23:38
  Author: lcarlier
Revision: 230859

upgpkg: xf86-video-cirrus 1.5.2-5

xorg-server 1.17 rebuild

Added:
  xf86-video-cirrus/trunk/git-fixes.diff
Modified:
  xf86-video-cirrus/trunk/PKGBUILD

----------------+
 PKGBUILD       |   16 ++++++++++-----
 git-fixes.diff |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 21:16:14 UTC (rev 230858)
+++ PKGBUILD	2015-02-05 21:23:38 UTC (rev 230859)
@@ -3,18 +3,24 @@
 
 pkgname=xf86-video-cirrus
 pkgver=1.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
+sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7'
+            '918037bbfc182815e77707b79059a51acb32bee68d16d38e355433136364354f')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: git-fixes.diff
===================================================================
--- git-fixes.diff	                        (rev 0)
+++ git-fixes.diff	2015-02-05 21:23:38 UTC (rev 230859)
@@ -0,0 +1,56 @@
+From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at gmail.com>
+Date: Sat, 20 Sep 2014 18:51:17 +1000
+Subject: cirrus: don't use pciTag
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+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;
+-- 
+cgit v0.10.2
+