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

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

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

Modified Files:
        pkgsrc/x11/xf86-video-chips: distinfo
Added Files:
        pkgsrc/x11/xf86-video-chips/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.9 -r1.10 pkgsrc/x11/xf86-video-chips/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-chips/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-chips/distinfo
diff -u pkgsrc/x11/xf86-video-chips/distinfo:1.9 pkgsrc/x11/xf86-video-chips/distinfo:1.10
--- pkgsrc/x11/xf86-video-chips/distinfo:1.9    Wed Nov  4 03:29:01 2015
+++ pkgsrc/x11/xf86-video-chips/distinfo        Wed Nov 16 22:14:53 2016
@@ -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

Added files:

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