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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 21:43:58 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-xgi: distinfo
Added Files:
        pkgsrc/x11/xf86-video-xgi/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.2 -r1.3 pkgsrc/x11/xf86-video-xgi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-xgi/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-xgi/distinfo
diff -u pkgsrc/x11/xf86-video-xgi/distinfo:1.2 pkgsrc/x11/xf86-video-xgi/distinfo:1.3
--- pkgsrc/x11/xf86-video-xgi/distinfo:1.2      Wed Nov  4 03:29:04 2015
+++ pkgsrc/x11/xf86-video-xgi/distinfo  Wed Nov 16 21:43:58 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/11/16 21:43:58 wiz Exp $
 
 SHA1 (xf86-video-xgi-1.6.1.tar.bz2) = 678a897b926c4dcd20f3ff33829f2341ab54f074
 RMD160 (xf86-video-xgi-1.6.1.tar.bz2) = 6be1a22dadb6a7dbc4a96788bc84fe1ada077cfb
 SHA512 (xf86-video-xgi-1.6.1.tar.bz2) = 0f57efe6e1f197b68cae7f68914e13c00001780224c1292e11826706a5f3ec59036ac5a42cd42aa832de0dd207369964beb44236dbc123b131cb00c695917afe
 Size (xf86-video-xgi-1.6.1.tar.bz2) = 558482 bytes
+SHA1 (patch-src_compat-api.h) = 8048054b208725dbccad2d64fce49b5e6d7e8444

Added files:

Index: pkgsrc/x11/xf86-video-xgi/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-xgi/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 21:43:58 2016
+++ pkgsrc/x11/xf86-video-xgi/patches/patch-src_compat-api.h    Wed Nov 16 21:43:58 2016
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:43:58 wiz Exp $
+
+commit 78d1138dd6e214a200ca66fa9e439ee3c9270ec8
+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      2015-08-17 22:53:52.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