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 E614D7A2EF for ; Wed, 16 Nov 2016 22:12:21 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8F855855D3; Wed, 16 Nov 2016 22:12:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1F85A85576 for ; Wed, 16 Nov 2016 22:12:21 +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 RRFj7jgg4sP3 for ; Wed, 16 Nov 2016 22:12:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 90F658556D for ; Wed, 16 Nov 2016 22:12:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C1AB7FBA6; Wed, 16 Nov 2016 22:12:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1479334332206000" MIME-Version: 1.0 Date: Wed, 16 Nov 2016 22:12:12 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/xf86-video-glint To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161116221212.C1AB7FBA6@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. --_----------=_1479334332206000 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:12:12 UTC 2016 Modified Files: pkgsrc/x11/xf86-video-glint: distinfo pkgsrc/x11/xf86-video-glint/patches: patch-src_glint__driver.c Added Files: pkgsrc/x11/xf86-video-glint/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-glint/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/xf86-video-glint/patches/patch-src_compat-api.h cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1479334332206000 Content-Disposition: inline Content-Length: 3183 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xf86-video-glint/distinfo diff -u pkgsrc/x11/xf86-video-glint/distinfo:1.8 pkgsrc/x11/xf86-video-glint/distinfo:1.9 --- pkgsrc/x11/xf86-video-glint/distinfo:1.8 Wed Nov 4 03:29:02 2015 +++ pkgsrc/x11/xf86-video-glint/distinfo Wed Nov 16 22:12:12 2016 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 03:29:02 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/11/16 22:12:12 wiz Exp $ SHA1 (xf86-video-glint-1.2.8.tar.bz2) = 40f817c3aaac1b04bff28f4552bc4b4fe522013b RMD160 (xf86-video-glint-1.2.8.tar.bz2) = f1692d995cec5cb2f2a57471a5e2256f82d3467d SHA512 (xf86-video-glint-1.2.8.tar.bz2) = ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468 Size (xf86-video-glint-1.2.8.tar.bz2) = 395371 bytes -SHA1 (patch-src_glint__driver.c) = e757df21be4a5308d69366125b8d1c33ea626066 +SHA1 (patch-src_compat-api.h) = 41208bc3e931da61a966b48aa6c54ac24c3a8737 +SHA1 (patch-src_glint__driver.c) = 831fdbaabaaf91e83669c4a9a1b0d6242efe20c6 Index: pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c diff -u pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c:1.1 pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c:1.2 --- pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c:1.1 Thu Apr 2 22:16:46 2015 +++ pkgsrc/x11/xf86-video-glint/patches/patch-src_glint__driver.c Wed Nov 16 22:12:12 2016 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_glint__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $ +$NetBSD: patch-src_glint__driver.c,v 1.2 2016/11/16 22:12:12 wiz Exp $ From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 From: Adam Jackson @@ -9,7 +9,7 @@ Signed-off-by: Adam Jackson = 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 --_----------=_1479334332206000--