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

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 18:53:20
  Author: andyrtr
Revision: 179765

upgpkg: xf86-video-vesa 2.3.2-3

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

Added:
  xf86-video-vesa/trunk/git-fixes.patch
Modified:
  xf86-video-vesa/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 +++++++-----
 git-fixes.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 17:48:20 UTC (rev 179764)
+++ PKGBUILD	2013-03-09 17:53:20 UTC (rev 179765)
@@ -3,24 +3,27 @@
 
 pkgname=xf86-video-vesa
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 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
-        revert-kernelcheck.patch)
+        revert-kernelcheck.patch
+        git-fixes.patch)
 sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
+            'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2013-03-09 17:53:20 UTC (rev 179765)
@@ -0,0 +1,55 @@
+From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
+From: Alexandr Shadchin <alexandr.shadchin at gmail.com>
+Date: Sat, 18 Aug 2012 14:53:34 +0000
+Subject: Fix check function in VESASaveRestore
+
+Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 8ac77da..11cd26c 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
+ {
+     VESAPtr pVesa;
+ 
+-    if (MODE_QUERY < 0 || function > MODE_RESTORE)
++    if (function < MODE_QUERY || function > MODE_RESTORE)
+ 	return (FALSE);
+ 
+     pVesa = VESAGetRec(pScrn);
+--
+cgit v0.9.0.2-2-gbebe
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe