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

[Laurent Carlier]

    Date: Thursday, February 5, 2015 @ 22:28:36
  Author: lcarlier
Revision: 230861

upgpkg: xf86-video-voodoo 1.2.5-6

xorg-server 1.17 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 21:23:45 UTC (rev 230860)
+++ PKGBUILD	2015-02-05 21:28:36 UTC (rev 230861)
@@ -3,18 +3,24 @@
 
 pkgname=xf86-video-voodoo
 pkgver=1.2.5
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'xf86dgaproto')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto')
+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=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.diff)
+sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8'
+            'ab21fc45573bb309f3ad413a3242a48e0850b0fe36f30cad8443a2555cafcd66')
 
+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:28:36 UTC (rev 230861)
@@ -0,0 +1,23 @@
+From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Mon, 22 Sep 2014 10:56:02 +1000
+Subject: don't use PCITAG in struct anymore
+
+
+diff --git a/src/voodoo.h b/src/voodoo.h
+index bfed497..c3eb64e 100644
+--- a/src/voodoo.h
++++ b/src/voodoo.h
+@@ -23,7 +23,9 @@ typedef struct {
+   
+   Bool		      Voodoo2;		/* Set if Voodoo2 */
+   pciVideoPtr	      PciInfo;		/* PCI data */
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG	      PciTag;
++#endif
+   CARD32	      PhysBase;
+   
+   CARD32	      Width;		/* Current width */
+-- 
+cgit v0.10.2
+