Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 365227A2EC for ; Wed, 16 Nov 2016 22:03:42 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DD005855D5; Wed, 16 Nov 2016 22:03:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6DA4F855D3 for ; Wed, 16 Nov 2016 22:03:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WwNWHmRDUjjX for ; Wed, 16 Nov 2016 22:03:41 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id ED3368556D for ; Wed, 16 Nov 2016 22:03:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E3CCCFBA6; Wed, 16 Nov 2016 22:03:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1479333820268680" MIME-Version: 1.0 Date: Wed, 16 Nov 2016 22:03:40 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/xf86-video-nv To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161116220340.E3CCCFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1479333820268680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 16 22:03:40 UTC 2016 Modified Files: pkgsrc/x11/xf86-video-nv: distinfo Added Files: pkgsrc/x11/xf86-video-nv/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.18 -r1.19 pkgsrc/x11/xf86-video-nv/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xf86-video-nv/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. --_----------=_1479333820268680 Content-Disposition: inline Content-Length: 2355 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xf86-video-nv/distinfo diff -u pkgsrc/x11/xf86-video-nv/distinfo:1.18 pkgsrc/x11/xf86-video-nv/distinfo:1.19 --- pkgsrc/x11/xf86-video-nv/distinfo:1.18 Wed Nov 4 03:29:02 2015 +++ pkgsrc/x11/xf86-video-nv/distinfo Wed Nov 16 22:03:40 2016 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.18 2015/11/04 03:29:02 agc Exp $ +$NetBSD: distinfo,v 1.19 2016/11/16 22:03:40 wiz Exp $ SHA1 (xf86-video-nv-2.1.20.tar.bz2) = 42b129be471d16444c5a7b443491e8d9e3e5df1a RMD160 (xf86-video-nv-2.1.20.tar.bz2) = 1245e6fb40728ec5b874d1a7cbc6836c39704837 SHA512 (xf86-video-nv-2.1.20.tar.bz2) = f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373 Size (xf86-video-nv-2.1.20.tar.bz2) = 396982 bytes +SHA1 (patch-src_compat-api.h) = 5f5a99e24c9818b1de5039ad5b1cd10adb963aba SHA1 (patch-src_g80__driver.c) = 7a009a40cb21973180befe403e2e14979030986a SHA1 (patch-src_nv__driver.c) = 3fef5f0ed734115e801c5cf14fdecb4cea17675b SHA1 (patch-src_nv__include.h) = 94e101db1ba731d9187753f3b1c8285f5fdd0c90 Added files: Index: pkgsrc/x11/xf86-video-nv/patches/patch-src_compat-api.h diff -u /dev/null pkgsrc/x11/xf86-video-nv/patches/patch-src_compat-api.h:1.1 --- /dev/null Wed Nov 16 22:03:40 2016 +++ pkgsrc/x11/xf86-video-nv/patches/patch-src_compat-api.h Wed Nov 16 22:03:40 2016 @@ -0,0 +1,26 @@ +$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 --_----------=_1479333820268680--