diff options
| author | dholland <dholland@pkgsrc.org> | 2016-09-18 05:46:31 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2016-09-18 05:46:31 +0000 |
| commit | 1ca662d11d08e157984605dcbacf131fd1b8b4eb (patch) | |
| tree | 8c8b68f828006dd53dd754c446da114b2c8654ae | |
| parent | 12ae69abe4da38609e9757f8d4a70ec3a9e01ba5 (diff) | |
| download | pkgsrc-1ca662d11d08e157984605dcbacf131fd1b8b4eb.tar.gz | |
Fix broken build.
| -rw-r--r-- | graphics/camlimages/distinfo | 4 | ||||
| -rw-r--r-- | graphics/camlimages/patches/patch-src_tiffwrite.c | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo index c4209abd635..58bea5a1e0d 100644 --- a/graphics/camlimages/distinfo +++ b/graphics/camlimages/distinfo @@ -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) = e6aa9279e6efc0c8345b74344d56377ddfe77b74 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 diff --git a/graphics/camlimages/patches/patch-src_tiffwrite.c b/graphics/camlimages/patches/patch-src_tiffwrite.c index 896e3075395..5a0625ae59d 100644 --- a/graphics/camlimages/patches/patch-src_tiffwrite.c +++ b/graphics/camlimages/patches/patch-src_tiffwrite.c @@ -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); |