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

[Laurent Carlier]

    Date: Monday, November 21, 2016 @ 18:46:36
  Author: lcarlier
Revision: 281781

upgpkg: xf86-video-i740 1.3.5-1

xorg-server-1.19 rebuild

Added:
  xf86-video-i740/trunk/git-fixes.patch
    (from rev 281780, xf86-video-i740/trunk/git-fix.diff)
Modified:
  xf86-video-i740/trunk/PKGBUILD
Deleted:
  xf86-video-i740/trunk/git-fix.diff

-----------------+
 PKGBUILD        |   21 ++++++++++++---------
 git-fix.diff    |   32 --------------------------------
 git-fixes.patch |   28 ++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-21 18:37:31 UTC (rev 281780)
+++ PKGBUILD	2016-11-21 18:46:36 UTC (rev 281781)
@@ -2,22 +2,25 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-i740
-pkgver=1.3.4
-pkgrel=7
+pkgver=1.3.5
+pkgrel=1
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
-sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
-            '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        git-fixes.patch)
+sha256sums=('1ce02dd0a11fbf6b43b8bca6663c67149d7d740c8985ae18bd956eddeaffe324'
+            'SKIP'
+            '5abbbd7d008dac0958b8bc628165864cfc03ffe76375fe1de02cd6857222b71e')
+validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git-fix.diff
+  patch -Np1 -i ../git-fixes.patch
 }
 
 build() {

Deleted: git-fix.diff
===================================================================
--- git-fix.diff	2016-11-21 18:37:31 UTC (rev 281780)
+++ git-fix.diff	2016-11-21 18:46:36 UTC (rev 281781)
@@ -1,32 +0,0 @@
-From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Thu, 10 Jan 2013 03:21:52 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/i740_driver.c b/src/i740_driver.c
-index 1c82198..7c1051d 100644
---- a/src/i740_driver.c
-+++ b/src/i740_driver.c
-@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- #include "compiler.h"
- 
--/* Drivers using the mi implementation of backing store need: */
--
--#include "mibstore.h"
--
- /* All drivers using the vgahw module need this */
- /* This driver needs to be modified to not use vgaHW for multihead operation */
- #include "vgaHW.h"
-@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
-     }
-   }
- 
--  miInitializeBackingStore(pScreen);
-   xf86SetBackingStore(pScreen);
-   xf86SetSilkenMouse(pScreen);
- 
---
-cgit v0.9.0.2-2-gbebe

Copied: xf86-video-i740/trunk/git-fixes.patch (from rev 281780, xf86-video-i740/trunk/git-fix.diff)
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2016-11-21 18:46:36 UTC (rev 281781)
@@ -0,0 +1,28 @@
+From 74e5a49cbf3b99ce0eb2b78a47a9008a1900bcf4 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+