[pkgsrc/trunk]: pkgsrc/graphics/ImageMagick Fix some ifdef'd png code, using ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77e5fe73681d
branches:  trunk
changeset: 512253:77e5fe73681d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 03 22:57:22 2006 +0000

description:
Fix some ifdef'd png code, using patch provided by Mathieu in PR 33325.
Build fix for some cases.

diffstat:

 graphics/ImageMagick/distinfo         |   3 ++-
 graphics/ImageMagick/patches/patch-ac |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r fc803beb1911 -r 77e5fe73681d graphics/ImageMagick/distinfo
--- a/graphics/ImageMagick/distinfo     Wed May 03 21:36:18 2006 +0000
+++ b/graphics/ImageMagick/distinfo     Wed May 03 22:57:22 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.64 2006/04/30 17:55:12 adam Exp $
+$NetBSD: distinfo,v 1.65 2006/05/03 22:57:22 wiz Exp $
 
 SHA1 (ImageMagick-6.2.7-1.tar.bz2) = ad9885040191452dcf42456debc044d2af01caae
 RMD160 (ImageMagick-6.2.7-1.tar.bz2) = 337a2aa548f050624cb0626860b0d1ae26acf348
 Size (ImageMagick-6.2.7-1.tar.bz2) = 5167016 bytes
 SHA1 (patch-aa) = d2342d754195b66368f56a3f2c27ccf1d7fdc00b
 SHA1 (patch-ab) = cfa9680cf461dc350f16b7f0b631773625c655f8
+SHA1 (patch-ac) = 3158b5791818f8d8c699964bb244c76b0c2d2e61
diff -r fc803beb1911 -r 77e5fe73681d graphics/ImageMagick/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ImageMagick/patches/patch-ac     Wed May 03 22:57:22 2006 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.14 2006/05/03 22:57:22 wiz Exp $
+
+--- coders/png.c.orig  2006-04-07 02:33:15.000000000 +0000
++++ coders/png.c
+@@ -1755,7 +1755,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;
+@@ -1764,8 +1764,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
+