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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 22:01:36 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-r128: distinfo
Added Files:
        pkgsrc/x11/xf86-video-r128/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-r128/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-r128/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-r128/distinfo
diff -u pkgsrc/x11/xf86-video-r128/distinfo:1.8 pkgsrc/x11/xf86-video-r128/distinfo:1.9
--- pkgsrc/x11/xf86-video-r128/distinfo:1.8     Fri Jan 22 12:11:57 2016
+++ pkgsrc/x11/xf86-video-r128/distinfo Wed Nov 16 22:01:36 2016
@@ -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

Added files:

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