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

Laurent Carlier lcarlier at archlinux.org
Mon Nov 21 12:14:44 UTC 2016


    Date: Monday, November 21, 2016 @ 12:14:44
  Author: lcarlier
Revision: 281731

upgpkg: xf86-video-trident 1.3.7-3

xorg-server-1.19 rebuild

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

-----------------+
 PKGBUILD        |   21 ++++++++++++++-------
 git-fixes.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-21 12:14:27 UTC (rev 281730)
+++ PKGBUILD	2016-11-21 12:14:44 UTC (rev 281731)
@@ -3,20 +3,27 @@
 
 pkgname=xf86-video-trident
 pkgver=1.3.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Trident 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' 'xf86dgaproto')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' 'xf86dgaproto')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        git-fixes.patch)
 sha256sums=('ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae'
-            'SKIP')
+            'SKIP'
+            '22571bf377e0cd37a8bd48e4d382f1d43010e1bde6382862c226052019120335')
 validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2016-11-21 12:14:44 UTC (rev 281731)
@@ -0,0 +1,28 @@
+From b5f4d35327863a14224d2a63885cd8b3b83a1815 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
+



More information about the arch-commits mailing list