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

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 13:04:00
  Author: andyrtr
Revision: 179706

upgpkg: xf86-video-dummy 0.3.6-3

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

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 11:55:56 UTC (rev 179705)
+++ PKGBUILD	2013-03-09 12:04:00 UTC (rev 179706)
@@ -3,21 +3,23 @@
 
 pkgname=xf86-video-dummy
 pkgver=0.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org dummy 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')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798'
+            '06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb')
 
 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 12:04:00 UTC (rev 179706)
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe