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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 16 22:07:33 UTC 2016

Modified Files:
        pkgsrc/x11/xf86-video-mga: distinfo
Added Files:
        pkgsrc/x11/xf86-video-mga/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-mga/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-mga/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-mga/distinfo
diff -u pkgsrc/x11/xf86-video-mga/distinfo:1.10 pkgsrc/x11/xf86-video-mga/distinfo:1.11
--- pkgsrc/x11/xf86-video-mga/distinfo:1.10     Wed Nov  4 03:29:02 2015
+++ pkgsrc/x11/xf86-video-mga/distinfo  Wed Nov 16 22:07:33 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/11/16 22:07:33 wiz Exp $
 
 SHA1 (xf86-video-mga-1.6.4.tar.bz2) = 2f8cecdb6fe3f0addb47a3a50928ff0705a31352
 RMD160 (xf86-video-mga-1.6.4.tar.bz2) = b04508bf4731397fa2881c180fc3555d400a70e5
 SHA512 (xf86-video-mga-1.6.4.tar.bz2) = 714bc477f7c72d640b045a4033fc49a7045ee239395f9aa8c622e9d4f5ca9098ba4ec28eaec5b839666eed37acb60c198d6ff606222c145c007fb320b52fff55
 Size (xf86-video-mga-1.6.4.tar.bz2) = 475858 bytes
+SHA1 (patch-src_compat-api.h) = 418d9e37eb39f121437ea4d9bc44cad63a7b3236

Added files:

Index: pkgsrc/x11/xf86-video-mga/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-mga/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 22:07:33 2016
+++ pkgsrc/x11/xf86-video-mga/patches/patch-src_compat-api.h    Wed Nov 16 22:07:33 2016
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:07:33 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig      2015-02-19 19:51:35.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