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

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

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

Modified Files:
        pkgsrc/x11/xf86-video-amdgpu: distinfo
Added Files:
        pkgsrc/x11/xf86-video-amdgpu/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.5 -r1.6 pkgsrc/x11/xf86-video-amdgpu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-amdgpu/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-amdgpu/distinfo
diff -u pkgsrc/x11/xf86-video-amdgpu/distinfo:1.5 pkgsrc/x11/xf86-video-amdgpu/distinfo:1.6
--- pkgsrc/x11/xf86-video-amdgpu/distinfo:1.5   Fri Sep 16 10:35:38 2016
+++ pkgsrc/x11/xf86-video-amdgpu/distinfo       Wed Nov 16 22:19:16 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/09/16 10:35:38 wiz Exp $
+$NetBSD: distinfo,v 1.6 2016/11/16 22:19:16 wiz Exp $
 
 SHA1 (xf86-video-amdgpu-1.1.2.tar.bz2) = 6f16fc95bd3d4ddc72e8c4e006097c3a3d75cdfd
 RMD160 (xf86-video-amdgpu-1.1.2.tar.bz2) = 8e9d3fd5a41411a80dbc67934fa5ed5ae8225bcc
 SHA512 (xf86-video-amdgpu-1.1.2.tar.bz2) = c381120000ba7ec1651f01e77e4093ccb939eb0e8925ea76532d6204b1072f3240cef412136ac4cf2a67268dfa9fda9bb455fe29874a4fd4a3be07d9a04b17ba
 Size (xf86-video-amdgpu-1.1.2.tar.bz2) = 383690 bytes
+SHA1 (patch-src_compat-api.h) = 889f2b3fd51140f94ad63968bc11c1d3f9283d94

Added files:

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