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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 21:59:39 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-savage: distinfo
Added Files:
        pkgsrc/x11/xf86-video-savage/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.10 -r1.11 pkgsrc/x11/xf86-video-savage/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-savage/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-savage/distinfo
diff -u pkgsrc/x11/xf86-video-savage/distinfo:1.10 pkgsrc/x11/xf86-video-savage/distinfo:1.11
--- pkgsrc/x11/xf86-video-savage/distinfo:1.10  Wed Nov  4 03:29:03 2015
+++ pkgsrc/x11/xf86-video-savage/distinfo       Wed Nov 16 21:59:38 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/11/16 21:59:38 wiz Exp $
 
 SHA1 (xf86-video-savage-2.3.8.tar.bz2) = cc2150f4195ccf82c80e272f9924f41a56e5f4f6
 RMD160 (xf86-video-savage-2.3.8.tar.bz2) = 6f467dd1621c937be4ca5b4f2e05e2d83c303629
 SHA512 (xf86-video-savage-2.3.8.tar.bz2) = c0a8eb58bde2d3f28dbf4f1e2a6e6e8eb019d3e61cf40bab56a586d614cf3d2a09c0ac43962ae25becfa9489f0ba36a4dd1010b6f181ffe77d10fe0bb10f3127
 Size (xf86-video-savage-2.3.8.tar.bz2) = 418649 bytes
+SHA1 (patch-src_compat-api.h) = 9df8f857f2c9a2ef8c49d01dbb317eb896539c92

Added files:

Index: pkgsrc/x11/xf86-video-savage/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-savage/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 21:59:39 2016
+++ pkgsrc/x11/xf86-video-savage/patches/patch-src_compat-api.h Wed Nov 16 21:59:38 2016
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:59:38 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig      2014-01-07 14:53:28.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