diff options
| author | jaapb <jaapb@pkgsrc.org> | 2012-12-26 10:24:16 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2012-12-26 10:24:16 +0000 |
| commit | 2254cba795683a112b4dde692a8e8aad9f9d68a7 (patch) | |
| tree | 584adac3ccd4b04fe64998d4d7878c5ef7db4880 /graphics | |
| parent | 9f201b5cb1892424e80fe68b0d66677c3eabe63a (diff) | |
| download | pkgsrc-2254cba795683a112b4dde692a8e8aad9f9d68a7.tar.gz | |
Corrected build failure with clang, and added comments to patches.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/camlimages/distinfo | 5 | ||||
| -rw-r--r-- | graphics/camlimages/patches/patch-OMakefile | 3 | ||||
| -rw-r--r-- | graphics/camlimages/patches/patch-src_jpegread.c | 14 |
3 files changed, 19 insertions, 3 deletions
diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo index 65e6cd41f47..209566aa28b 100644 --- a/graphics/camlimages/distinfo +++ b/graphics/camlimages/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.9 2012/07/29 12:52:55 marino Exp $ +$NetBSD: distinfo,v 1.10 2012/12/26 10:24:16 jaapb Exp $ SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 4c1eee28f02749f53ed8345b448ce11375ce6dce RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b Size (camlimages-4.0.1/v4.0.1.tar.gz) = 2190252 bytes -SHA1 (patch-OMakefile) = de4f35f576b4a5a6de477b0f50cc6e5d4cfbe24c +SHA1 (patch-OMakefile) = 3d6343128c8c6d450463e2cf6a2e1f5b75d4285a +SHA1 (patch-src_jpegread.c) = e6aa9279e6efc0c8345b74344d56377ddfe77b74 SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654 SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755 SHA1 (patch-src_tiffread.c) = 4dab0fe8da42fe7d0720d5edddf45743c7fa41fd diff --git a/graphics/camlimages/patches/patch-OMakefile b/graphics/camlimages/patches/patch-OMakefile index 5654a1c247e..4ae14fdb15d 100644 --- a/graphics/camlimages/patches/patch-OMakefile +++ b/graphics/camlimages/patches/patch-OMakefile @@ -1,5 +1,6 @@ -$NetBSD: patch-OMakefile,v 1.1 2011/08/07 20:36:20 wiz Exp $ +$NetBSD: patch-OMakefile,v 1.2 2012/12/26 10:24:17 jaapb Exp $ +Use pkgsrc build variables, correct detection of libpng --- OMakefile.orig 2011-06-22 18:04:32.000000000 +0000 +++ OMakefile 2011-08-06 17:23:47.000000000 +0000 @@ -25,8 +25,10 @@ diff --git a/graphics/camlimages/patches/patch-src_jpegread.c b/graphics/camlimages/patches/patch-src_jpegread.c new file mode 100644 index 00000000000..f8e3be90e9f --- /dev/null +++ b/graphics/camlimages/patches/patch-src_jpegread.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_jpegread.c,v 1.1 2012/12/26 10:24:17 jaapb Exp $ + +Make clang happy with proper return value +--- src/jpegread.c.orig 2011-06-22 18:04:32.000000000 +0000 ++++ src/jpegread.c +@@ -417,7 +417,7 @@ value read_jpeg_scanlines( value jpegh, + jpeg_read_scanlines( cinfop, row, 1 ); + row[0] += scanline_bytes; + } +- CAMLreturn0; ++ CAMLreturn(Val_unit); + } + + value close_jpeg_file_for_read( jpegh ) |