Date: Monday, November 21, 2016 @ 13:46:51 Author: lcarlier Revision: 281737
upgpkg: xf86-video-sis 0.10.8-3 xorg-server-1.19 rebuild Added: xf86-video-sis/trunk/git-fixes.patch Modified: xf86-video-sis/trunk/PKGBUILD -----------------+ PKGBUILD | 16 ++++++------- git-fixes.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-21 13:25:47 UTC (rev 281736) +++ PKGBUILD 2016-11-21 13:46:51 UTC (rev 281737) @@ -3,24 +3,24 @@ pkgname=xf86-video-sis pkgver=0.10.8 -pkgrel=2 +pkgrel=3 pkgdesc="X.org SiS 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') +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') optdepends=('sis-dri: DRI1 support from community repo') -groups=('xorg-drivers' 'xorg') +groups=('xorg-drivers') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - Xi.patch) + git-fixes.patch) sha256sums=('c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe' - '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672') + 'b3cbb937a94c5e0ea21e05005238b247ee146ba8640eda7bfbe8b382b25dde7b') prepare() { cd ${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/Xi.patch + patch -Np1 -i ${srcdir}/git-fixes.patch } build() { Added: git-fixes.patch =================================================================== --- git-fixes.patch (rev 0) +++ git-fixes.patch 2016-11-21 13:46:51 UTC (rev 281737) @@ -0,0 +1,62 @@ +From 328073e46f9b9fcc09e637c94496c90273a0a4f6 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <w...@netbsd.org> +Date: Sun, 13 Sep 2015 23:28:53 +0200 +Subject: [PATCH 1/2] Fix arguments for miSetPointerPosition. + +For the call for the API between versions 5 and 15. + +Reviewed-by: Connor Behan <connor.be...@gmail.com> +--- + src/sis_driver.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 854cb54..8f06164 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -9395,9 +9395,9 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y) + y = (int)dy; + } + #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13 +- miPointerSetPosition(inputInfo.pointer, Absolute, x, y); ++ miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y); + #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 +- miPointerSetPosition(inputInfo.pointer, x, y); ++ miPointerSetPosition(inputInfo.pointer, &x, &y); + #else + UpdateCurrentTime(); + miPointerAbsoluteCursor(x, y, currentTime.milliseconds); +-- +2.10.2 + +From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: [PATCH 2/2] Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <a...@redhat.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 +