summaryrefslogtreecommitdiff
path: root/x11/xf86-video-i740
diff options
context:
space:
mode:
authorwiz <wiz>2016-11-16 21:56:46 +0000
committerwiz <wiz>2016-11-16 21:56:46 +0000
commit1bc87357bafaabe07ad9d28206431421c19cc979 (patch)
tree49b4931a0a12b1e747523675a932a904cbca74ac /x11/xf86-video-i740
parentd3b318894fd19e57dc13c718e9c82f96acbbee00 (diff)
downloadpkgsrc-1bc87357bafaabe07ad9d28206431421c19cc979.tar.gz
Fix build with xorg-server-1.19.
Diffstat (limited to 'x11/xf86-video-i740')
-rw-r--r--x11/xf86-video-i740/distinfo3
-rw-r--r--x11/xf86-video-i740/patches/patch-src_compat-api.h20
2 files changed, 22 insertions, 1 deletions
diff --git a/x11/xf86-video-i740/distinfo b/x11/xf86-video-i740/distinfo
index 0976087fc11..e4096383cf9 100644
--- a/x11/xf86-video-i740/distinfo
+++ b/x11/xf86-video-i740/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:02 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/11/16 22:05:14 wiz Exp $
SHA1 (xf86-video-i740-1.3.5.tar.bz2) = ceefa37c2605d633480735f3e9ce547d482ce8e5
RMD160 (xf86-video-i740-1.3.5.tar.bz2) = 1f4b33691d1cd653f7a39009a37025e322fb17df
SHA512 (xf86-video-i740-1.3.5.tar.bz2) = 7f477d7646e3b25a06eaa8a9e226a8955d6783152fe944bd12cd301b7e942b7e0dbfe49946c3d3dea9d2660ea91055909f5df68499434fda6c78b21bf4b9d827
Size (xf86-video-i740-1.3.5.tar.bz2) = 321050 bytes
+SHA1 (patch-src_compat-api.h) = c6aa19bd94dac100d2a08ab0657d9b7b9bf8770d
diff --git a/x11/xf86-video-i740/patches/patch-src_compat-api.h b/x11/xf86-video-i740/patches/patch-src_compat-api.h
new file mode 100644
index 00000000000..db4e29e06d3
--- /dev/null
+++ b/x11/xf86-video-i740/patches/patch-src_compat-api.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:05:14 wiz Exp $
+
+Adapt Block/WakeupHandler signature for ABI 23.
+
+--- src/compat-api.h.orig 2013-02-07 07:55:46.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