summaryrefslogtreecommitdiff
path: root/x11/xf86-video-ati
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-11-16 21:56:46 +0000
committerwiz <wiz@pkgsrc.org>2016-11-16 21:56:46 +0000
commit0f21ed2ee2c41cbb1513bf7c3d2a9172ccc2eca8 (patch)
tree9c26b91c766734e0c14a43a06b94a91813095d2f /x11/xf86-video-ati
parentcb12fae41c6af55d40337cd41cfce11db4dc5df3 (diff)
downloadpkgsrc-0f21ed2ee2c41cbb1513bf7c3d2a9172ccc2eca8.tar.gz
Fix build with xorg-server-1.19.
Diffstat (limited to 'x11/xf86-video-ati')
-rw-r--r--x11/xf86-video-ati/distinfo3
-rw-r--r--x11/xf86-video-ati/patches/patch-src_compat-api.h20
2 files changed, 22 insertions, 1 deletions
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index a5517cf899f..1bb50bcc1a5 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -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
diff --git a/x11/xf86-video-ati/patches/patch-src_compat-api.h b/x11/xf86-video-ati/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..8b21c890c53
--- /dev/null
+++ b/x11/xf86-video-ati/patches/patch-src_compat-api.h
@@ -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