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

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 13:25:49
  Author: andyrtr
Revision: 179710

upgpkg: xf86-video-glint 1.2.8-3

rebuild for new X-ABI-VIDEODRV_VERSION=14; add a git fix

Added:
  xf86-video-glint/trunk/git-fix.diff
Modified:
  xf86-video-glint/trunk/PKGBUILD

--------------+
 PKGBUILD     |   14 ++++++++------
 git-fix.diff |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 12:08:16 UTC (rev 179709)
+++ PKGBUILD	2013-03-09 12:25:49 UTC (rev 179710)
@@ -3,22 +3,24 @@
 
 pkgname=xf86-video-glint
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org GLINT/Permedia video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221'
+            '8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  patch -Np1 -i ${srcdir}/git-fix.diff
+ ./configure --prefix=/usr
   make
 }
 

Added: git-fix.diff
===================================================================
--- git-fix.diff	                        (rev 0)
+++ git-fix.diff	2013-03-09 12:25:49 UTC (rev 179710)
@@ -0,0 +1,30 @@
+From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:38 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/glint_driver.c b/src/glint_driver.c
+index b6d20a9..aa78516 100644
+--- a/src/glint_driver.c
++++ b/src/glint_driver.c
+@@ -52,8 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+-
+ #include "pm3_regs.h"
+ #include "glint_regs.h"
+ #include "IBM.h"
+@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe