CVS commit: pkgsrc/graphics/camlimages

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Sep 18 05:46:31 UTC 2016

Modified Files:
        pkgsrc/graphics/camlimages: distinfo
        pkgsrc/graphics/camlimages/patches: patch-src_tiffwrite.c

Log Message:
Fix broken build.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/camlimages/distinfo
cvs rdiff -u -r1.1 -r1.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.

Modified files:

Index: pkgsrc/graphics/camlimages/distinfo
diff -u pkgsrc/graphics/camlimages/distinfo:1.13 pkgsrc/graphics/camlimages/distinfo:1.14
--- pkgsrc/graphics/camlimages/distinfo:1.13    Tue Nov  3 21:33:53 2015
+++ pkgsrc/graphics/camlimages/distinfo Sun Sep 18 05:46:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 21:33:53 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/09/18 05:46:31 dholland Exp $
 
 SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 4c1eee28f02749f53ed8345b448ce11375ce6dce
 RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b
@@ -11,4 +11,4 @@ SHA1 (patch-src_jpegread.c) = e6aa9279e6
 SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654
 SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755
 SHA1 (patch-src_tiffread.c) = 4dab0fe8da42fe7d0720d5edddf45743c7fa41fd
-SHA1 (patch-src_tiffwrite.c) = e1acae308004b22a7d46c694cd0a387bd8bf6546
+SHA1 (patch-src_tiffwrite.c) = 2bc3de2b56a8f8d46fac3ac8d7c1b9ae9c4bd52c

Index: pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c
diff -u pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.1 pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.2
--- pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c:1.1        Sun Jul 29 12:52:55 2012
+++ pkgsrc/graphics/camlimages/patches/patch-src_tiffwrite.c    Sun Sep 18 05:46:31 2016
@@ -1,10 +1,14 @@
-$NetBSD: patch-src_tiffwrite.c,v 1.1 2012/07/29 12:52:55 marino Exp $
+$NetBSD: patch-src_tiffwrite.c,v 1.2 2016/09/18 05:46:31 dholland Exp $
 
-Both ocaml/caml/config.h and tiff.h define int32, uint32, etc.
+ - Both ocaml/caml/config.h and tiff.h define int32, uint32, etc.
 The workaround of this name polution is to intentionally overwrite the
 first caml definition with a garbage macro before tiff.h is included and
 then unset it after the include.  After tiff version 4.0.1, the same hack
-has to be applied to 64-bit types
+has to be applied to 64-bit types.
+
+ - As of some newer ocaml there's no "uint32", only "uint32_t". The
+first two hunks of this patch are probably no longer necessary.
+
 
 --- src/tiffwrite.c.orig       2011-06-22 18:04:32.000000000 +0000
 +++ src/tiffwrite.c
@@ -26,3 +30,14 @@ has to be applied to 64-bit types
  
  extern value *imglib_error;
  
+@@ -56,8 +60,8 @@ value open_tiff_file_for_write( value fi
+     /* Resolution */
+     /* FillOrder */
+     
+-    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32) image_width);
+-    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32) image_height);
++    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32_t) image_width);
++    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32_t) image_height);
+     TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+     TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
+     TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);