ports/107121: GraphicsMagick 1.1.7 does not build

[Mark Jacobs]

The following reply was made to PR ports/107121; it has been noted by GNATS.

From: Mark Jacobs <jacobsm at gate.net>
To: Micah <micahjon at ywave.com>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/107121: GraphicsMagick 1.1.7 does not build
Date: Sat, 23 Dec 2006 10:46:43 -0500

 On Fri, 2006-12-22 at 23:46 -0800, Micah wrote:
 > I'm showing it too. It appears to be a bug that was fixed long ago in 
 > ImageMagick. Drop the attached
 > patch file into graphics/GraphicsMagick/files/ and it should build.
 > 
 > - Micah
 > 
 
 That patch worked. Thanks.
 
 Mark Jacobs
 
 > plain text document attachment (patch-coders::png.c)
 > --- coders/png.c.orig	Fri Dec 22 23:34:20 2006
 > +++ coders/png.c	Fri Dec 22 23:30:51 2006
 > @@ -1709,7 +1709,7 @@
 >  #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 @@
 >                          | 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
 >  
 >