[arch-commits] Commit in xf86-video-sisusb/trunk (PKGBUILD git-fixes.patch)
Laurent Carlier
lcarlier at archlinux.org
Mon Nov 21 13:25:42 UTC 2016
Date: Monday, November 21, 2016 @ 13:25:41
Author: lcarlier
Revision: 281735
upgpkg: xf86-video-sisusb 0.9.6-8
xorg-server-1.19 rebuild
Modified:
xf86-video-sisusb/trunk/PKGBUILD
xf86-video-sisusb/trunk/git-fixes.patch
-----------------+
PKGBUILD | 10 +++++-----
git-fixes.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-21 12:23:21 UTC (rev 281734)
+++ PKGBUILD 2016-11-21 13:25:41 UTC (rev 281735)
@@ -3,17 +3,17 @@
pkgname=xf86-video-sisusb
pkgver=0.9.6
-pkgrel=7
+pkgrel=8
pkgdesc="X.org SiS USB 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')
+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 git-fixes.patch)
sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
- '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
+ '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
prepare() {
cd ${pkgname}-${pkgver}
Modified: git-fixes.patch
===================================================================
--- git-fixes.patch 2016-11-21 12:23:21 UTC (rev 281734)
+++ git-fixes.patch 2016-11-21 13:25:41 UTC (rev 281735)
@@ -27,3 +27,35 @@
/* NO SilkenMouse. Never. Ever. */
--
cgit v0.9.0.2-2-gbebe
+From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Mon, 21 Nov 2016 14:13:23 +0100
+Subject: [PATCH] Adapt BlockHandler signature for ABI 23
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/compat-api.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+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
+--
+2.10.2
+
+
More information about the arch-commits
mailing list