[arch-commits] Commit in xf86-video-cirrus/repos (6 files)
Laurent Carlier
lcarlier at archlinux.org
Thu Feb 5 21:23:45 UTC 2015
Date: Thursday, February 5, 2015 @ 22:23:45
Author: lcarlier
Revision: 230860
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xf86-video-cirrus/repos/staging-i686/
xf86-video-cirrus/repos/staging-i686/PKGBUILD
(from rev 230859, xf86-video-cirrus/trunk/PKGBUILD)
xf86-video-cirrus/repos/staging-i686/git-fixes.diff
(from rev 230859, xf86-video-cirrus/trunk/git-fixes.diff)
xf86-video-cirrus/repos/staging-x86_64/
xf86-video-cirrus/repos/staging-x86_64/PKGBUILD
(from rev 230859, xf86-video-cirrus/trunk/PKGBUILD)
xf86-video-cirrus/repos/staging-x86_64/git-fixes.diff
(from rev 230859, xf86-video-cirrus/trunk/git-fixes.diff)
-------------------------------+
staging-i686/PKGBUILD | 35 +++++++++++++++++++++++++
staging-i686/git-fixes.diff | 56 ++++++++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 35 +++++++++++++++++++++++++
staging-x86_64/git-fixes.diff | 56 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 182 insertions(+)
Copied: xf86-video-cirrus/repos/staging-i686/PKGBUILD (from rev 230859, xf86-video-cirrus/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-02-05 21:23:45 UTC (rev 230860)
@@ -0,0 +1,35 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-cirrus
+pkgver=1.5.2
+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=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 git-fixes.diff)
+sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7'
+ '918037bbfc182815e77707b79059a51acb32bee68d16d38e355433136364354f')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-cirrus/repos/staging-i686/git-fixes.diff (from rev 230859, xf86-video-cirrus/trunk/git-fixes.diff)
===================================================================
--- staging-i686/git-fixes.diff (rev 0)
+++ staging-i686/git-fixes.diff 2015-02-05 21:23:45 UTC (rev 230860)
@@ -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
+
Copied: xf86-video-cirrus/repos/staging-x86_64/PKGBUILD (from rev 230859, xf86-video-cirrus/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-02-05 21:23:45 UTC (rev 230860)
@@ -0,0 +1,35 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-cirrus
+pkgver=1.5.2
+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=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 git-fixes.diff)
+sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7'
+ '918037bbfc182815e77707b79059a51acb32bee68d16d38e355433136364354f')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../git-fixes.diff
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Copied: xf86-video-cirrus/repos/staging-x86_64/git-fixes.diff (from rev 230859, xf86-video-cirrus/trunk/git-fixes.diff)
===================================================================
--- staging-x86_64/git-fixes.diff (rev 0)
+++ staging-x86_64/git-fixes.diff 2015-02-05 21:23:45 UTC (rev 230860)
@@ -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
+
More information about the arch-commits
mailing list