Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66]) by www.NetBSD.org (Postfix) with ESMTP id 79DB263B85F for ; Sun, 29 Jul 2012 12:53:02 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5053F14A1E8; Sun, 29 Jul 2012 12:53:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CAAD114A1E3 for ; Sun, 29 Jul 2012 12:52:56 +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 yYy-cVpGx3sW for ; Sun, 29 Jul 2012 12:52:56 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 34B4814A1D7 for ; Sun, 29 Jul 2012 12:52:56 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 2C5A0175DD; Sun, 29 Jul 2012 12:52:56 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Sun, 29 Jul 2012 12:52:56 +0000 From: "John Marino" Subject: CVS commit: pkgsrc/graphics/camlimages To: pkgsrc-changes@NetBSD.org Reply-To: marino@netbsd.org X-Mailer: log_accum Message-Id: <20120729125256.2C5A0175DD@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: marino Date: Sun Jul 29 12:52:56 UTC 2012 Modified Files: pkgsrc/graphics/camlimages: Makefile distinfo pkgsrc/graphics/camlimages/patches: patch-src_tiffread.c Added Files: pkgsrc/graphics/camlimages/patches: patch-src_tiffwrite.c Log Message: graphics/camlimages: Fix tiff-4.0 regression When tiff was upgraded to 4.0, camlimages stopped building. Both caml and tiff redefine several common typedefs such as uint32. Unlike the 3-series of tiff, tiff-4.0 also redefined int64 and uint64. The existing hack didn't foresee int64 and uint64 getting used, and so camlimages broke. One patch was created and another revised to override the caml typedef definitions with macros before tiff.h is included. The original tiffread.c patch was reworked to override uint16 and uint32 *again* after the tiff.h include and not before as it was originally. Very ugly all around, but I just extended what camlimages was already doing. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/camlimages/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/camlimages/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/camlimages/patches/patch-src_tiffread.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.