Wed Nov 16 21:53:48 2016 UTC ()
Fix build with xorg-server-1.19.
(wiz)
diff -r1.10 -r1.11 pkgsrc/x11/xf86-video-sis/distinfo
diff -r0 -r1.1 pkgsrc/x11/xf86-video-sis/patches/patch-src_compat-api.h
--- pkgsrc/x11/xf86-video-sis/distinfo 2015/11/04 03:29:03 1.10
+++ pkgsrc/x11/xf86-video-sis/distinfo 2016/11/16 21:53:48 1.11
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.10 2015/11/04 03:29:03 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.11 2016/11/16 21:53:48 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (xf86-video-sis-0.10.8.tar.bz2) = 8607cebaf87f3870dfe347bef4db5650a4a0a082 | | 3 | SHA1 (xf86-video-sis-0.10.8.tar.bz2) = 8607cebaf87f3870dfe347bef4db5650a4a0a082 |
| 4 | RMD160 (xf86-video-sis-0.10.8.tar.bz2) = 386cfd6a3162a1c83af7dc6be3715fca8b0f0797 | | 4 | RMD160 (xf86-video-sis-0.10.8.tar.bz2) = 386cfd6a3162a1c83af7dc6be3715fca8b0f0797 |
| 5 | SHA512 (xf86-video-sis-0.10.8.tar.bz2) = 3740acb13b087fc80c495eeb46ca8f050c6a489f7c1ec60fbee0cdfae26e516dc1a73dd6716aafbf16d8bd904a52db00cdbd538543e12792df1e43a6cbc1b72e | | 5 | SHA512 (xf86-video-sis-0.10.8.tar.bz2) = 3740acb13b087fc80c495eeb46ca8f050c6a489f7c1ec60fbee0cdfae26e516dc1a73dd6716aafbf16d8bd904a52db00cdbd538543e12792df1e43a6cbc1b72e |
| 6 | Size (xf86-video-sis-0.10.8.tar.bz2) = 734785 bytes | | 6 | Size (xf86-video-sis-0.10.8.tar.bz2) = 734785 bytes |
| | | 7 | SHA1 (patch-src_compat-api.h) = c6ba716306841c8104f6fbe762ce460a1d6d204c |
$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