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 85B007A2EC for ; Wed, 16 Nov 2016 21:46:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id EEFF9855DA; Wed, 16 Nov 2016 21:46:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7DC9E855D3 for ; Wed, 16 Nov 2016 21:46:34 +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 K5_dHtFnyRdY for ; Wed, 16 Nov 2016 21:46:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0E77F84CFD for ; Wed, 16 Nov 2016 21:46:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7065EFBA6; Wed, 16 Nov 2016 21:46:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147933278730010" MIME-Version: 1.0 Date: Wed, 16 Nov 2016 21:46:27 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/xf86-video-trident To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161116214627.7065EFBA6@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. --_----------=_147933278730010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 16 21:46:27 UTC 2016 Modified Files: pkgsrc/x11/xf86-video-trident: distinfo Added Files: pkgsrc/x11/xf86-video-trident/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.7 -r1.8 pkgsrc/x11/xf86-video-trident/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xf86-video-trident/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. --_----------=_147933278730010 Content-Disposition: inline Content-Length: 1922 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xf86-video-trident/distinfo diff -u pkgsrc/x11/xf86-video-trident/distinfo:1.7 pkgsrc/x11/xf86-video-trident/distinfo:1.8 --- pkgsrc/x11/xf86-video-trident/distinfo:1.7 Wed Nov 4 03:29:04 2015 +++ pkgsrc/x11/xf86-video-trident/distinfo Wed Nov 16 21:46:27 2016 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 03:29:04 agc Exp $ +$NetBSD: distinfo,v 1.8 2016/11/16 21:46:27 wiz Exp $ SHA1 (xf86-video-trident-1.3.7.tar.bz2) = b8cce16caa30e6725bdea078e05ab74b4b8020e7 RMD160 (xf86-video-trident-1.3.7.tar.bz2) = c9279cdd9708fcfd251e2928277dbe82612dafbe SHA512 (xf86-video-trident-1.3.7.tar.bz2) = 39c3dac36095fa5103b9e3af8a6ffce9a42bb79d5d1c7e0c990badc2e469b9af96ca009a041fa892af972bc38ec19e8d014fb90da392bbd0ae8892b9c1fe0064 Size (xf86-video-trident-1.3.7.tar.bz2) = 376898 bytes +SHA1 (patch-src_compat-api.h) = 18d1012841abee48bff317830bc638c4a41d6591 Added files: Index: pkgsrc/x11/xf86-video-trident/patches/patch-src_compat-api.h diff -u /dev/null pkgsrc/x11/xf86-video-trident/patches/patch-src_compat-api.h:1.1 --- /dev/null Wed Nov 16 21:46:27 2016 +++ pkgsrc/x11/xf86-video-trident/patches/patch-src_compat-api.h Wed Nov 16 21:46:27 2016 @@ -0,0 +1,20 @@ +$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:46:27 wiz Exp $ + +Adapt Block/WakeupHandler signature for ABI 23. + +--- src/compat-api.h.orig 2015-03-30 17:12:58.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 --_----------=_147933278730010--