Fix build with xorg-server-1.19.

6 files changed, 78 insertions, 3 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
diff --git a/x11/xf86-video-tdfx/distinfo b/x11/xf86-video-tdfx/distinfo
index 081fff3b70c..6adbc8cb461 100644
--- a/x11/xf86-video-tdfx/distinfo
+++ b/x11/xf86-video-tdfx/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 21:51:13 wiz Exp $
 
 SHA1 (xf86-video-tdfx-1.4.6.tar.bz2) = a6c5abc7a957c7396b57d36a09f4f5e0143e4d15
 RMD160 (xf86-video-tdfx-1.4.6.tar.bz2) = f0c4441215f249691b04f4e4f214210d011db808
 SHA512 (xf86-video-tdfx-1.4.6.tar.bz2) = d47421000f7aaeabcd13700c39a0a869c2967e6e1d02526cc348155415ac62064f61bbc5416c75b7e44a55fa9124a9feabbe6008d43c41a2305c1a0c842f384c
 Size (xf86-video-tdfx-1.4.6.tar.bz2) = 368300 bytes
+SHA1 (patch-src_compat-api.h) = 5c78972b5783c93713be51f9118d52a48f91e959
diff --git a/x11/xf86-video-tdfx/patches/patch-src_compat-api.h b/x11/xf86-video-tdfx/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..fce21d0bf91
--- /dev/null
+++ b/x11/xf86-video-tdfx/patches/patch-src_compat-api.h
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:51:13 wiz Exp $
+
+commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jul 19 10:03:56 2016 -0400
+
+    Adapt Block/WakeupHandler signature for ABI 23
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+--- src/compat-api.h.orig	2013-02-07 07:56:21.000000000 +0000
++++ src/compat-api.h
+@@ -78,11 +78,19 @@
+ 
+ #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
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+ 
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
diff --git a/x11/xf86-video-trident/distinfo b/x11/xf86-video-trident/distinfo
index 75e0dc82425..dc4bea7673d 100644
--- a/x11/xf86-video-trident/distinfo
+++ b/x11/xf86-video-trident/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/11/16 21:46:27 wiz Exp $
 
 SHA1 (xf86-video-trident-1.3.7.tar.bz2) = b8cce16caa30e6725bdea078e05ab74b4b8020e7
 RMD160 (xf86-video-trident-1.3.7.tar.bz2) = c9279cdd9708fcfd251e2928277dbe82612dafbe
 SHA512 (xf86-video-trident-1.3.7.tar.bz2) = 39c3dac36095fa5103b9e3af8a6ffce9a42bb79d5d1c7e0c990badc2e469b9af96ca009a041fa892af972bc38ec19e8d014fb90da392bbd0ae8892b9c1fe0064
 Size (xf86-video-trident-1.3.7.tar.bz2) = 376898 bytes
+SHA1 (patch-src_compat-api.h) = 18d1012841abee48bff317830bc638c4a41d6591
diff --git a/x11/xf86-video-trident/patches/patch-src_compat-api.h b/x11/xf86-video-trident/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..d723af2bd4d
--- /dev/null
+++ b/x11/xf86-video-trident/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:46:27 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2015-03-30 17:12:58.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