Fix build with xorg-server-1.19.

21 files changed, 236 insertions, 13 deletions

diff --git a/x11/xf86-video-amdgpu/distinfo b/x11/xf86-video-amdgpu/distinfo
index c5358e43de2..038167be59e 100644
--- a/x11/xf86-video-amdgpu/distinfo
+++ b/x11/xf86-video-amdgpu/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/09/16 10:35:38 wiz Exp $
+$NetBSD: distinfo,v 1.6 2016/11/16 22:19:16 wiz Exp $
 
 SHA1 (xf86-video-amdgpu-1.1.2.tar.bz2) = 6f16fc95bd3d4ddc72e8c4e006097c3a3d75cdfd
 RMD160 (xf86-video-amdgpu-1.1.2.tar.bz2) = 8e9d3fd5a41411a80dbc67934fa5ed5ae8225bcc
 SHA512 (xf86-video-amdgpu-1.1.2.tar.bz2) = c381120000ba7ec1651f01e77e4093ccb939eb0e8925ea76532d6204b1072f3240cef412136ac4cf2a67268dfa9fda9bb455fe29874a4fd4a3be07d9a04b17ba
 Size (xf86-video-amdgpu-1.1.2.tar.bz2) = 383690 bytes
+SHA1 (patch-src_compat-api.h) = 889f2b3fd51140f94ad63968bc11c1d3f9283d94
diff --git a/x11/xf86-video-amdgpu/patches/patch-src_compat-api.h b/x11/xf86-video-amdgpu/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..cd185b95945
--- /dev/null
+++ b/x11/xf86-video-amdgpu/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:19:16 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2016-09-16 09:01:22.000000000 +0000
++++ src/compat-api.h
+@@ -73,8 +73,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-ati/distinfo b/x11/xf86-video-ati/distinfo
index a5517cf899f..1bb50bcc1a5 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2016/09/15 13:39:09 wiz Exp $
+$NetBSD: distinfo,v 1.27 2016/11/16 22:16:51 wiz Exp $
 
 SHA1 (xf86-video-ati-7.7.1.tar.bz2) = 146be259bd725a0252e2909e1320e42e0a11d582
 RMD160 (xf86-video-ati-7.7.1.tar.bz2) = dd69a7a766d43eee21217d1d347f94cdd0df9545
 SHA512 (xf86-video-ati-7.7.1.tar.bz2) = d8d05b59165cf835231694f190d7fd35d30e28f155d54a537b6ef4c6e60b15099a10d9f2ba4bd13ad9773248a7c3e8099703750129d758cb9c4478ec52d5a1ad
 Size (xf86-video-ati-7.7.1.tar.bz2) = 837869 bytes
+SHA1 (patch-src_compat-api.h) = 03f1698e2af2e91484ec050fc430721fd0568ba9
diff --git a/x11/xf86-video-ati/patches/patch-src_compat-api.h b/x11/xf86-video-ati/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..8b21c890c53
--- /dev/null
+++ b/x11/xf86-video-ati/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:16:51 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2016-09-15 08:52:47.000000000 +0000
++++ src/compat-api.h
+@@ -73,8 +73,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-chips/distinfo b/x11/xf86-video-chips/distinfo
index f51fe55bd98..ce4e7456f60 100644
--- a/x11/xf86-video-chips/distinfo
+++ b/x11/xf86-video-chips/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:29:01 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/11/16 22:14:53 wiz Exp $
 
 SHA1 (xf86-video-chips-1.2.6.tar.bz2) = b8312cd084ba6d5604a59c1f1469cf8fd612018a
 RMD160 (xf86-video-chips-1.2.6.tar.bz2) = b2196bd31d3dde2ee6c546d73faea128533a440a
 SHA512 (xf86-video-chips-1.2.6.tar.bz2) = 7844852fe514281f5613e6bc3254a207d6028663895228976edd77fc3b214e2fb344929eca238b632218f730ef30503ff14500b84289bc7ab3108888078e72f5
 Size (xf86-video-chips-1.2.6.tar.bz2) = 413528 bytes
 SHA1 (patch-configure) = 2a7d72260b5f1650e2aa6dc8c90cfc896f36ddb2
+SHA1 (patch-src_compat-api.h) = efdd840fd50e7d4dab154f12c6b1f5bdd325bb60
diff --git a/x11/xf86-video-chips/patches/patch-src_compat-api.h b/x11/xf86-video-chips/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..e46db0b0d54
--- /dev/null
+++ b/x11/xf86-video-chips/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:14:53 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2015-09-26 16:28:01.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-glint/distinfo b/x11/xf86-video-glint/distinfo
index 812faf000ff..6c5fbf1dda8 100644
--- a/x11/xf86-video-glint/distinfo
+++ b/x11/xf86-video-glint/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 22:12:12 wiz Exp $
 
 SHA1 (xf86-video-glint-1.2.8.tar.bz2) = 40f817c3aaac1b04bff28f4552bc4b4fe522013b
 RMD160 (xf86-video-glint-1.2.8.tar.bz2) = f1692d995cec5cb2f2a57471a5e2256f82d3467d
 SHA512 (xf86-video-glint-1.2.8.tar.bz2) = ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468
 Size (xf86-video-glint-1.2.8.tar.bz2) = 395371 bytes
-SHA1 (patch-src_glint__driver.c) = e757df21be4a5308d69366125b8d1c33ea626066
+SHA1 (patch-src_compat-api.h) = 41208bc3e931da61a966b48aa6c54ac24c3a8737
+SHA1 (patch-src_glint__driver.c) = 831fdbaabaaf91e83669c4a9a1b0d6242efe20c6
diff --git a/x11/xf86-video-glint/patches/patch-src_compat-api.h b/x11/xf86-video-glint/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..02bb5a65274
--- /dev/null
+++ b/x11/xf86-video-glint/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:12:12 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2012-06-06 11:05:28.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-glint/patches/patch-src_glint__driver.c b/x11/xf86-video-glint/patches/patch-src_glint__driver.c
index 921aafef877..0f8a52f6d05 100644
--- a/x11/xf86-video-glint/patches/patch-src_glint__driver.c
+++ b/x11/xf86-video-glint/patches/patch-src_glint__driver.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_glint__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
+$NetBSD: patch-src_glint__driver.c,v 1.2 2016/11/16 22:12:12 wiz Exp $
 
 From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
@@ -9,7 +9,7 @@ Signed-off-by: Adam Jackson <ajax@redhat.com>
 
 diff --git a/src/glint_driver.c b/src/glint_driver.c
 index b6d20a9..aa78516 100644
---- src/glint_driver.c
+--- src/glint_driver.c.orig	2012-07-16 02:50:47.000000000 +0000
 +++ src/glint_driver.c
 @@ -52,8 +52,6 @@
  #include "compiler.h"
@@ -27,3 +27,4 @@ index b6d20a9..aa78516 100644
 -    miInitializeBackingStore(pScreen);
      xf86SetBackingStore(pScreen);
      xf86SetSilkenMouse(pScreen);
+ 
diff --git a/x11/xf86-video-i740/distinfo b/x11/xf86-video-i740/distinfo
index 0976087fc11..e4096383cf9 100644
--- a/x11/xf86-video-i740/distinfo
+++ b/x11/xf86-video-i740/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 22:05:14 wiz Exp $
 
 SHA1 (xf86-video-i740-1.3.5.tar.bz2) = ceefa37c2605d633480735f3e9ce547d482ce8e5
 RMD160 (xf86-video-i740-1.3.5.tar.bz2) = 1f4b33691d1cd653f7a39009a37025e322fb17df
 SHA512 (xf86-video-i740-1.3.5.tar.bz2) = 7f477d7646e3b25a06eaa8a9e226a8955d6783152fe944bd12cd301b7e942b7e0dbfe49946c3d3dea9d2660ea91055909f5df68499434fda6c78b21bf4b9d827
 Size (xf86-video-i740-1.3.5.tar.bz2) = 321050 bytes
+SHA1 (patch-src_compat-api.h) = c6aa19bd94dac100d2a08ab0657d9b7b9bf8770d
diff --git a/x11/xf86-video-i740/patches/patch-src_compat-api.h b/x11/xf86-video-i740/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..db4e29e06d3
--- /dev/null
+++ b/x11/xf86-video-i740/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:05:14 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2013-02-07 07:55:46.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-mga/distinfo b/x11/xf86-video-mga/distinfo
index 7a7cc5c0bf2..6887c28ff39 100644
--- a/x11/xf86-video-mga/distinfo
+++ b/x11/xf86-video-mga/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/11/16 22:07:33 wiz Exp $
 
 SHA1 (xf86-video-mga-1.6.4.tar.bz2) = 2f8cecdb6fe3f0addb47a3a50928ff0705a31352
 RMD160 (xf86-video-mga-1.6.4.tar.bz2) = b04508bf4731397fa2881c180fc3555d400a70e5
 SHA512 (xf86-video-mga-1.6.4.tar.bz2) = 714bc477f7c72d640b045a4033fc49a7045ee239395f9aa8c622e9d4f5ca9098ba4ec28eaec5b839666eed37acb60c198d6ff606222c145c007fb320b52fff55
 Size (xf86-video-mga-1.6.4.tar.bz2) = 475858 bytes
+SHA1 (patch-src_compat-api.h) = 418d9e37eb39f121437ea4d9bc44cad63a7b3236
diff --git a/x11/xf86-video-mga/patches/patch-src_compat-api.h b/x11/xf86-video-mga/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..f3dd3bc551e
--- /dev/null
+++ b/x11/xf86-video-mga/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:07:33 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2015-02-19 19:51:35.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-nv/distinfo b/x11/xf86-video-nv/distinfo
index 3ff8f4a2cee..84b42965dcd 100644
--- a/x11/xf86-video-nv/distinfo
+++ b/x11/xf86-video-nv/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/11/16 22:03:40 wiz Exp $
 
 SHA1 (xf86-video-nv-2.1.20.tar.bz2) = 42b129be471d16444c5a7b443491e8d9e3e5df1a
 RMD160 (xf86-video-nv-2.1.20.tar.bz2) = 1245e6fb40728ec5b874d1a7cbc6836c39704837
 SHA512 (xf86-video-nv-2.1.20.tar.bz2) = f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373
 Size (xf86-video-nv-2.1.20.tar.bz2) = 396982 bytes
+SHA1 (patch-src_compat-api.h) = 5f5a99e24c9818b1de5039ad5b1cd10adb963aba
 SHA1 (patch-src_g80__driver.c) = 7a009a40cb21973180befe403e2e14979030986a
 SHA1 (patch-src_nv__driver.c) = 3fef5f0ed734115e801c5cf14fdecb4cea17675b
 SHA1 (patch-src_nv__include.h) = 94e101db1ba731d9187753f3b1c8285f5fdd0c90
diff --git a/x11/xf86-video-nv/patches/patch-src_compat-api.h b/x11/xf86-video-nv/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..3c077deeff3
--- /dev/null
+++ b/x11/xf86-video-nv/patches/patch-src_compat-api.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:03:40 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2012-07-17 06:47:03.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-r128/distinfo b/x11/xf86-video-r128/distinfo
index 122bf531b4a..5282ac4dcce 100644
--- a/x11/xf86-video-r128/distinfo
+++ b/x11/xf86-video-r128/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2016/01/22 12:11:57 wiz Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 22:01:36 wiz Exp $
 
 SHA1 (xf86-video-r128-6.10.1.tar.bz2) = 25559ee795b7f417770086a53d9acdfaad8423da
 RMD160 (xf86-video-r128-6.10.1.tar.bz2) = 46285f3e0e1c3f30ced5e516faf5a1396bcfa48c
 SHA512 (xf86-video-r128-6.10.1.tar.bz2) = c1c68e548357d9f9e357dcf6e2c1614a253cf0f19b23577720de51801ae2e6160306cdf8bdbf9976d0036910f46dc4fa0e562304d38c84560bb852d3e9dbdd0f
 Size (xf86-video-r128-6.10.1.tar.bz2) = 495306 bytes
+SHA1 (patch-src_compat-api.h) = 5744b3275f786bba80c05040dad06f9df5ca3db8
diff --git a/x11/xf86-video-r128/patches/patch-src_compat-api.h b/x11/xf86-video-r128/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..c225592fe73
--- /dev/null
+++ b/x11/xf86-video-r128/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:01:36 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2014-10-01 01:49:41.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-savage/distinfo b/x11/xf86-video-savage/distinfo
index f17b0cee3cb..7bef80a7bd5 100644
--- a/x11/xf86-video-savage/distinfo
+++ b/x11/xf86-video-savage/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:59:38 wiz Exp $
 
 SHA1 (xf86-video-savage-2.3.8.tar.bz2) = cc2150f4195ccf82c80e272f9924f41a56e5f4f6
 RMD160 (xf86-video-savage-2.3.8.tar.bz2) = 6f467dd1621c937be4ca5b4f2e05e2d83c303629
 SHA512 (xf86-video-savage-2.3.8.tar.bz2) = c0a8eb58bde2d3f28dbf4f1e2a6e6e8eb019d3e61cf40bab56a586d614cf3d2a09c0ac43962ae25becfa9489f0ba36a4dd1010b6f181ffe77d10fe0bb10f3127
 Size (xf86-video-savage-2.3.8.tar.bz2) = 418649 bytes
+SHA1 (patch-src_compat-api.h) = 9df8f857f2c9a2ef8c49d01dbb317eb896539c92
diff --git a/x11/xf86-video-savage/patches/patch-src_compat-api.h b/x11/xf86-video-savage/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..ea3c05d5702
--- /dev/null
+++ b/x11/xf86-video-savage/patches/patch-src_compat-api.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:59:38 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2014-01-07 14:53:28.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-siliconmotion/distinfo b/x11/xf86-video-siliconmotion/distinfo
index 91f3f9646c2..a43be76dc39 100644
--- a/x11/xf86-video-siliconmotion/distinfo
+++ b/x11/xf86-video-siliconmotion/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 21:56:46 wiz Exp $
 
 SHA1 (xf86-video-siliconmotion-1.7.8.tar.bz2) = d620309a9068437df2a9c83dc1384571ed7754f2
 RMD160 (xf86-video-siliconmotion-1.7.8.tar.bz2) = 749437c70b1d1e0d48ab13ee42147265fafe723d
 SHA512 (xf86-video-siliconmotion-1.7.8.tar.bz2) = 8343982399737bbc09802ba17805b4111468d0241d4b2326ec32b237ca84e31dd02e4788c4e7fe508b032af9533765fb60ac8093877dc83f97709dc094bfa48e
 Size (xf86-video-siliconmotion-1.7.8.tar.bz2) = 398928 bytes
+SHA1 (patch-src_compat-api.h) = 4277dacb89deb87f31b51f1612a5da7226e4a3c6
diff --git a/x11/xf86-video-siliconmotion/patches/patch-src_compat-api.h b/x11/xf86-video-siliconmotion/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..8354c7dd041
--- /dev/null
+++ b/x11/xf86-video-siliconmotion/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:56:46 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig	2015-05-08 11:08:17.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