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

[Andreas Radke]

    Date: Wednesday, June 24, 2015 @ 19:07:10
  Author: andyrtr
Revision: 241256

upgpkg: xf86-video-vesa 2.3.4-1

upstream update 2.3.4

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

-----------------+
 PKGBUILD        |   17 +++++++---------
 git-fixes.patch |   55 ------------------------------------------------------
 2 files changed, 8 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 16:48:17 UTC (rev 241255)
+++ PKGBUILD	2015-06-24 17:07:10 UTC (rev 241256)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-vesa
-pkgver=2.3.2
-pkgrel=6
+pkgver=2.3.4
+pkgrel=1
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
@@ -12,17 +12,16 @@
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
 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
-        revert-kernelcheck.patch
-        git-fixes.patch)
-sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
-            'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        revert-kernelcheck.patch)
+sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1'
+            'SKIP'
+            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax at nwnk.net>"
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
-  patch -Np1 -i ${srcdir}/git-fixes.patch
 }
 
 build() {

Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch	2015-06-24 16:48:17 UTC (rev 241255)
+++ git-fixes.patch	2015-06-24 17:07:10 UTC (rev 241256)
@@ -1,55 +0,0 @@
-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