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 3A2CC7A2EC for ; Wed, 16 Nov 2016 22:05:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DCA4E855D5; Wed, 16 Nov 2016 22:05:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6DDEB855D3 for ; Wed, 16 Nov 2016 22:05:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Fd1nb-x9SAAs for ; Wed, 16 Nov 2016 22:05:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F3CB98556D for ; Wed, 16 Nov 2016 22:05:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D6BD7FBA6; Wed, 16 Nov 2016 22:05:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1479333914141220" MIME-Version: 1.0 Date: Wed, 16 Nov 2016 22:05:14 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/xf86-video-i740 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161116220514.D6BD7FBA6@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. --_----------=_1479333914141220 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:05:14 UTC 2016 Modified Files: pkgsrc/x11/xf86-video-i740: distinfo Added Files: pkgsrc/x11/xf86-video-i740/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.8 -r1.9 pkgsrc/x11/xf86-video-i740/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xf86-video-i740/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. --_----------=_1479333914141220 Content-Disposition: inline Content-Length: 1886 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xf86-video-i740/distinfo diff -u pkgsrc/x11/xf86-video-i740/distinfo:1.8 pkgsrc/x11/xf86-video-i740/distinfo:1.9 --- pkgsrc/x11/xf86-video-i740/distinfo:1.8 Wed Nov 4 03:29:02 2015 +++ pkgsrc/x11/xf86-video-i740/distinfo Wed Nov 16 22:05:14 2016 @@ -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 Added files: Index: pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h diff -u /dev/null pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h:1.1 --- /dev/null Wed Nov 16 22:05:14 2016 +++ pkgsrc/x11/xf86-video-i740/patches/patch-src_compat-api.h Wed Nov 16 22:05:14 2016 @@ -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 --_----------=_1479333914141220--