CVS commit: pkgsrc/x11/xf86-video-i740

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 22:05:14 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-i740: distinfo
Added Files:
        pkgsrc/x11/xf86-video-i740/patches: patch-src_compat-api.h

Log Message:
Fix build with xorg-server-1.19.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-i740/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-i740/distinfo
diff -u pkgsrc/x11/xf86-video-i740/distinfo:1.8 pkgsrc/x11/xf86-video-i740/distinfo:1.9
--- pkgsrc/x11/xf86-video-i740/distinfo:1.8     Wed Nov  4 03:29:02 2015
+++ pkgsrc/x11/xf86-video-i740/distinfo Wed Nov 16 22:05:14 2016
@@ -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

Added files:

Index: pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 22:05:14 2016
+++ pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h   Wed Nov 16 22:05:14 2016
@@ -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