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

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 14:08:44
  Author: andyrtr
Revision: 179714

upgpkg: xf86-video-i128 1.3.6-3

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

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

--------------+
 PKGBUILD     |   12 +++++++-----
 git-fix.diff |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 12:31:30 UTC (rev 179713)
+++ PKGBUILD	2013-03-09 13:08:44 UTC (rev 179714)
@@ -3,21 +3,23 @@
 
 pkgname=xf86-video-i128
 pkgver=1.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Number 9 I128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' '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' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
+            '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  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 13:08:44 UTC (rev 179714)
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe