Wed Nov 16 22:05:14 2016 UTC ()
Fix build with xorg-server-1.19.
(wiz)
diff -r1.8 -r1.9 pkgsrc/x11/xf86-video-i740/distinfo
diff -r0 -r1.1 pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h
--- pkgsrc/x11/xf86-video-i740/distinfo 2015/11/04 03:29:02 1.8
+++ pkgsrc/x11/xf86-video-i740/distinfo 2016/11/16 22:05:14 1.9
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.8 2015/11/04 03:29:02 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.9 2016/11/16 22:05:14 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (xf86-video-i740-1.3.5.tar.bz2) = ceefa37c2605d633480735f3e9ce547d482ce8e5 | | 3 | SHA1 (xf86-video-i740-1.3.5.tar.bz2) = ceefa37c2605d633480735f3e9ce547d482ce8e5 |
| 4 | RMD160 (xf86-video-i740-1.3.5.tar.bz2) = 1f4b33691d1cd653f7a39009a37025e322fb17df | | 4 | RMD160 (xf86-video-i740-1.3.5.tar.bz2) = 1f4b33691d1cd653f7a39009a37025e322fb17df |
| 5 | SHA512 (xf86-video-i740-1.3.5.tar.bz2) = 7f477d7646e3b25a06eaa8a9e226a8955d6783152fe944bd12cd301b7e942b7e0dbfe49946c3d3dea9d2660ea91055909f5df68499434fda6c78b21bf4b9d827 | | 5 | SHA512 (xf86-video-i740-1.3.5.tar.bz2) = 7f477d7646e3b25a06eaa8a9e226a8955d6783152fe944bd12cd301b7e942b7e0dbfe49946c3d3dea9d2660ea91055909f5df68499434fda6c78b21bf4b9d827 |
| 6 | Size (xf86-video-i740-1.3.5.tar.bz2) = 321050 bytes | | 6 | Size (xf86-video-i740-1.3.5.tar.bz2) = 321050 bytes |
| | | 7 | SHA1 (patch-src_compat-api.h) = c6aa19bd94dac100d2a08ab0657d9b7b9bf8770d |
$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