CVS commit: [pkgsrc-2012Q2] pkgsrc/graphics/camlimages

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Tue Jul 31 15:12:03 UTC 2012

Modified Files:
        pkgsrc/graphics/camlimages [pkgsrc-2012Q2]: Makefile distinfo
        pkgsrc/graphics/camlimages/patches [pkgsrc-2012Q2]:
            patch-src_tiffread.c
Added Files:
        pkgsrc/graphics/camlimages/patches [pkgsrc-2012Q2]:
            patch-src_tiffwrite.c

Log Message:
Pullup ticket #3882 - requested by dholland
graphics/camlimages: build fix

Revisions pulled up:
- graphics/camlimages/Makefile                                  1.44 via patch
- graphics/camlimages/distinfo                                  1.9
- graphics/camlimages/patches/patch-src_tiffread.c              1.2
- graphics/camlimages/patches/patch-src_tiffwrite.c             1.1

---
   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.42 -r1.42.2.1 pkgsrc/graphics/camlimages/Makefile
cvs rdiff -u -r1.8 -r1.8.8.1 pkgsrc/graphics/camlimages/distinfo
cvs rdiff -u -r1.1 -r1.1.8.1 \
    pkgsrc/graphics/camlimages/patches/patch-src_tiffread.c
cvs rdiff -u -r0 -r1.1.2.2 \
    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.