[packages/xorg-driver-video-sis] - fix building with xserver 1.19 - rel 5

[baggins]

commit c060df2d23073b542c87c941854e0c92dda42b2b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 28 20:06:02 2016 +0100

    - fix building with xserver 1.19
    - rel 5

 xorg-driver-video-sis.spec |  4 +++-
 xserver-1.19.patch         | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-sis.spec b/xorg-driver-video-sis.spec
index c2aaca9..62382dd 100644
--- a/xorg-driver-video-sis.spec
+++ b/xorg-driver-video-sis.spec
@@ -2,12 +2,13 @@ Summary:	X.org video driver for SiS and XGI video chips
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla układów graficznych SiS i XGI
 Name:		xorg-driver-video-sis
 Version:	0.10.8
-Release:	4
+Release:	5
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-%{version}.tar.bz2
 # Source0-md5:	c173c4ce572eb19db5dfdc8a858c6c67
 Patch0:		%{name}-x32.patch
+Patch1:		xserver-1.19.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
@@ -59,6 +60,7 @@ XGI Volari Z7 (zwanych serią 315/330/340).
 %prep
 %setup -q -n xf86-video-sis-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=18304
 # (not used anyway when xserver uses libpciaccess)
diff --git a/xserver-1.19.patch b/xserver-1.19.patch
new file mode 100644
index 0000000..a73ba2d
--- /dev/null
+++ b/xserver-1.19.patch
@@ -0,0 +1,16 @@
+--- xf86-video-chips-1.2.6/src/compat-api.h~	2015-09-26 18:28:01.000000000 +0200
++++ xf86-video-chips-1.2.6/src/compat-api.h	2016-11-28 09:12:37.337570460 +0100
+@@ -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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-sis.git/commitdiff/c060df2d23073b542c87c941854e0c92dda42b2b