summaryrefslogtreecommitdiff
path: root/x11/xf86-video-sis
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-11-16 21:46:27 +0000
committerwiz <wiz@pkgsrc.org>2016-11-16 21:46:27 +0000
commitcb12fae41c6af55d40337cd41cfce11db4dc5df3 (patch)
tree85a700d34e047d921cf3abc25fa0fcf578756ea2 /x11/xf86-video-sis
parenta642dbc6f39d57584212a737b55b4e7c00a1178d (diff)
downloadpkgsrc-cb12fae41c6af55d40337cd41cfce11db4dc5df3.tar.gz
Fix build with xorg-server-1.19.
Diffstat (limited to 'x11/xf86-video-sis')
-rw-r--r--x11/xf86-video-sis/distinfo3
-rw-r--r--x11/xf86-video-sis/patches/patch-src_compat-api.h20
2 files changed, 22 insertions, 1 deletions
diff --git a/x11/xf86-video-sis/distinfo b/x11/xf86-video-sis/distinfo
index 1e42f72e11c..6ffc487e3c2 100644
--- a/x11/xf86-video-sis/distinfo
+++ b/x11/xf86-video-sis/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/11/16 21:53:48 wiz Exp $
SHA1 (xf86-video-sis-0.10.8.tar.bz2) = 8607cebaf87f3870dfe347bef4db5650a4a0a082
RMD160 (xf86-video-sis-0.10.8.tar.bz2) = 386cfd6a3162a1c83af7dc6be3715fca8b0f0797
SHA512 (xf86-video-sis-0.10.8.tar.bz2) = 3740acb13b087fc80c495eeb46ca8f050c6a489f7c1ec60fbee0cdfae26e516dc1a73dd6716aafbf16d8bd904a52db00cdbd538543e12792df1e43a6cbc1b72e
Size (xf86-video-sis-0.10.8.tar.bz2) = 734785 bytes
+SHA1 (patch-src_compat-api.h) = c6ba716306841c8104f6fbe762ce460a1d6d204c
diff --git a/x11/xf86-video-sis/patches/patch-src_compat-api.h b/x11/xf86-video-sis/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..eae2fed2c53
--- /dev/null
+++ b/x11/xf86-video-sis/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:53:48 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig 2015-08-29 23:34:25.000000000 +0000
++++ 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