diff options
| author | markd <markd@pkgsrc.org> | 2006-10-17 09:26:24 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2006-10-17 09:26:24 +0000 |
| commit | d510fe389ea85e0ccf4b06db0919e56311cb2ebe (patch) | |
| tree | d5317e5ceeaa4ba636ed19b674ce08173ec561ef /graphics | |
| parent | 429c044e71c53ad8beca64cec5428ab2328ada28 (diff) | |
| download | pkgsrc-d510fe389ea85e0ccf4b06db0919e56311cb2ebe.tar.gz | |
Fix build with recent png. From GraphicsMagick CVS.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/GraphicsMagick/distinfo | 3 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/patches/patch-aa | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo index 7fe4d8b8af9..8341899dc74 100644 --- a/graphics/GraphicsMagick/distinfo +++ b/graphics/GraphicsMagick/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/07/20 17:23:15 minskim Exp $ +$NetBSD: distinfo,v 1.2 2006/10/17 09:26:24 markd Exp $ SHA1 (GraphicsMagick-1.1.7.tar.bz2) = b2d3878be34e6d0a8a19e991b7f99da30b02df7e RMD160 (GraphicsMagick-1.1.7.tar.bz2) = 9193ab3b109df6ce4b80cb2c1602c86ca36e3043 Size (GraphicsMagick-1.1.7.tar.bz2) = 4957394 bytes +SHA1 (patch-aa) = fb3f541ef1cbbe3e70283b83986cfd720eb41b5d diff --git a/graphics/GraphicsMagick/patches/patch-aa b/graphics/GraphicsMagick/patches/patch-aa new file mode 100644 index 00000000000..c454b7a931b --- /dev/null +++ b/graphics/GraphicsMagick/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 2006/10/17 09:26:24 markd Exp $ + +--- coders/png.c.orig 2006-10-15 15:09:43.000000000 +1300 ++++ coders/png.c +@@ -1709,7 +1709,7 @@ static Image *ReadOnePNGImage(MngInfo *m + #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \ + && (PNG_LIBPNG_VER >= 10200) + /* Disable thread-unsafe features of pnggccrd */ +- if (png_access_version() >= 10200) ++ if (png_access_version_number() >= 10200) + { + png_uint_32 mmx_disable_mask=0; + png_uint_32 asm_flags; +@@ -1718,8 +1718,8 @@ static Image *ReadOnePNGImage(MngInfo *m + | PNG_ASM_FLAG_MMX_READ_FILTER_SUB \ + | PNG_ASM_FLAG_MMX_READ_FILTER_AVG \ + | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ); +- asm_flags=png_get_asm_flags(png_ptr); +- png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask); ++ asm_flags=png_get_asm_flags(ping); ++ png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask); + } + #endif + |