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

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

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

Modified Files:
        pkgsrc/x11/xf86-video-ati: distinfo
Added Files:
        pkgsrc/x11/xf86-video-ati/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.26 -r1.27 pkgsrc/x11/xf86-video-ati/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-ati/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-ati/distinfo
diff -u pkgsrc/x11/xf86-video-ati/distinfo:1.26 pkgsrc/x11/xf86-video-ati/distinfo:1.27
--- pkgsrc/x11/xf86-video-ati/distinfo:1.26     Thu Sep 15 13:39:09 2016
+++ pkgsrc/x11/xf86-video-ati/distinfo  Wed Nov 16 22:16:51 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2016/09/15 13:39:09 wiz Exp $
+$NetBSD: distinfo,v 1.27 2016/11/16 22:16:51 wiz Exp $
 
 SHA1 (xf86-video-ati-7.7.1.tar.bz2) = 146be259bd725a0252e2909e1320e42e0a11d582
 RMD160 (xf86-video-ati-7.7.1.tar.bz2) = dd69a7a766d43eee21217d1d347f94cdd0df9545
 SHA512 (xf86-video-ati-7.7.1.tar.bz2) = d8d05b59165cf835231694f190d7fd35d30e28f155d54a537b6ef4c6e60b15099a10d9f2ba4bd13ad9773248a7c3e8099703750129d758cb9c4478ec52d5a1ad
 Size (xf86-video-ati-7.7.1.tar.bz2) = 837869 bytes
+SHA1 (patch-src_compat-api.h) = 03f1698e2af2e91484ec050fc430721fd0568ba9

Added files:

Index: pkgsrc/x11/xf86-video-ati/patches/patch-src_compat-api.h
diff -u /dev/null pkgsrc/x11/xf86-video-ati/patches/patch-src_compat-api.h:1.1
--- /dev/null   Wed Nov 16 22:16:52 2016
+++ pkgsrc/x11/xf86-video-ati/patches/patch-src_compat-api.h    Wed Nov 16 22:16:51 2016
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:16:51 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig      2016-09-15 08:52:47.000000000 +0000
++++ src/compat-api.h
+@@ -73,8 +73,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