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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 21:51:13 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-tdfx: distinfo
Added Files:
        pkgsrc/x11/xf86-video-tdfx/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-tdfx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-tdfx/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-tdfx/distinfo
diff -u pkgsrc/x11/xf86-video-tdfx/distinfo:1.8 pkgsrc/x11/xf86-video-tdfx/distinfo:1.9
--- pkgsrc/x11/xf86-video-tdfx/distinfo:1.8     Wed Nov  4 03:29:04 2015
+++ pkgsrc/x11/xf86-video-tdfx/distinfo Wed Nov 16 21:51:13 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 21:51:13 wiz Exp $
 
 SHA1 (xf86-video-tdfx-1.4.6.tar.bz2) = a6c5abc7a957c7396b57d36a09f4f5e0143e4d15
 RMD160 (xf86-video-tdfx-1.4.6.tar.bz2) = f0c4441215f249691b04f4e4f214210d011db808
 SHA512 (xf86-video-tdfx-1.4.6.tar.bz2) = d47421000f7aaeabcd13700c39a0a869c2967e6e1d02526cc348155415ac62064f61bbc5416c75b7e44a55fa9124a9feabbe6008d43c41a2305c1a0c842f384c
 Size (xf86-video-tdfx-1.4.6.tar.bz2) = 368300 bytes
+SHA1 (patch-src_compat-api.h) = 5c78972b5783c93713be51f9118d52a48f91e959

Added files:

Index: pkgsrc/x11/xf86-video-tdfx/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-tdfx/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 21:51:13 2016
+++ pkgsrc/x11/xf86-video-tdfx/patches/patch-src_compat-api.h   Wed Nov 16 21:51:13 2016
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:51:13 wiz Exp $
+
+commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date:   Tue Jul 19 10:03:56 2016 -0400
+
+    Adapt Block/WakeupHandler signature for ABI 23
+    
+    Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
+
+--- src/compat-api.h.orig      2013-02-07 07:56:21.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