Wed Nov 16 22:03:40 2016 UTC ()
Fix build with xorg-server-1.19.


(wiz)
diff -r1.18 -r1.19 pkgsrc/x11/xf86-video-nv/distinfo
diff -r0 -r1.1 pkgsrc/x11/xf86-video-nv/patches/patch-src_compat-api.h
cvs diff -r1.18 -r1.19 pkgsrc/x11/xf86-video-nv/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-nv/distinfo 2015/11/04 03:29:02 1.18
+++ pkgsrc/x11/xf86-video-nv/distinfo 2016/11/16 22:03:40 1.19
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.18 2015/11/04 03:29:02 agc Exp $ 1$NetBSD: distinfo,v 1.19 2016/11/16 22:03:40 wiz Exp $
2 2
3SHA1 (xf86-video-nv-2.1.20.tar.bz2) = 42b129be471d16444c5a7b443491e8d9e3e5df1a 3SHA1 (xf86-video-nv-2.1.20.tar.bz2) = 42b129be471d16444c5a7b443491e8d9e3e5df1a
4RMD160 (xf86-video-nv-2.1.20.tar.bz2) = 1245e6fb40728ec5b874d1a7cbc6836c39704837 4RMD160 (xf86-video-nv-2.1.20.tar.bz2) = 1245e6fb40728ec5b874d1a7cbc6836c39704837
5SHA512 (xf86-video-nv-2.1.20.tar.bz2) = f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373 5SHA512 (xf86-video-nv-2.1.20.tar.bz2) = f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373
6Size (xf86-video-nv-2.1.20.tar.bz2) = 396982 bytes 6Size (xf86-video-nv-2.1.20.tar.bz2) = 396982 bytes
 7SHA1 (patch-src_compat-api.h) = 5f5a99e24c9818b1de5039ad5b1cd10adb963aba
7SHA1 (patch-src_g80__driver.c) = 7a009a40cb21973180befe403e2e14979030986a 8SHA1 (patch-src_g80__driver.c) = 7a009a40cb21973180befe403e2e14979030986a
8SHA1 (patch-src_nv__driver.c) = 3fef5f0ed734115e801c5cf14fdecb4cea17675b 9SHA1 (patch-src_nv__driver.c) = 3fef5f0ed734115e801c5cf14fdecb4cea17675b
9SHA1 (patch-src_nv__include.h) = 94e101db1ba731d9187753f3b1c8285f5fdd0c90 10SHA1 (patch-src_nv__include.h) = 94e101db1ba731d9187753f3b1c8285f5fdd0c90
10SHA1 (patch-src_riva_driver.c) = 2820b601f3244cce48b6cd93c51e03bc0bff507f 11SHA1 (patch-src_riva_driver.c) = 2820b601f3244cce48b6cd93c51e03bc0bff507f
11SHA1 (patch-src_riva_include.h) = 84859b666ad1e4a26e09876a63e5131adb35b513 12SHA1 (patch-src_riva_include.h) = 84859b666ad1e4a26e09876a63e5131adb35b513
File Added: pkgsrc/x11/xf86-video-nv/patches/Attic/patch-src_compat-api.h
$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:03:40 wiz Exp $

Adapt Block/WakeupHandler signature for ABI 23.

--- src/compat-api.h.orig	2012-07-17 06:47:03.000000000 +0000
+++ src/compat-api.h
@@ -78,11 +78,19 @@
 
 #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
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
 
 #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
 #define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
 
 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
 #define CLOSE_SCREEN_ARGS pScreen