[pkgsrc/trunk]: pkgsrc/graphics/png Add a workaround for libpng bug #1777158....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e2e7669e516
branches:  trunk
changeset: 532816:1e2e7669e516
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Aug 31 15:35:08 2007 +0000

description:
Add a workaround for libpng bug #1777158.  This makes the package build
on Darwin/i386.

diffstat:

 graphics/png/distinfo         |   3 ++-
 graphics/png/hacks.mk         |  12 ++++++++++++
 graphics/png/patches/patch-ab |  15 +++++++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 41fc46a5a070 -r 1e2e7669e516 graphics/png/distinfo
--- a/graphics/png/distinfo     Fri Aug 31 13:04:15 2007 +0000
+++ b/graphics/png/distinfo     Fri Aug 31 15:35:08 2007 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.39 2007/08/29 20:58:26 wiz Exp $
+$NetBSD: distinfo,v 1.40 2007/08/31 15:35:08 minskim Exp $
 
 SHA1 (libpng-1.2.19.tar.bz2) = 681e94e43d2799715b7888fb495200f9b204849a
 RMD160 (libpng-1.2.19.tar.bz2) = f0e4facbc037f9259dedfe6eafc1f58f8cedc6a5
 Size (libpng-1.2.19.tar.bz2) = 650966 bytes
 SHA1 (patch-aa) = 27df7893fc54f7e87790850eb9f047155c73f7d3
+SHA1 (patch-ab) = 957e022f4d7864d8097df539e7ee8d2dfc6959aa
 SHA1 (patch-ac) = 87850d6ac555f1d8863a96d287a1ccccfa89230b
 SHA1 (patch-ae) = b9bf9de3caa32ac78a17685cdd5df5b80d1ccbbf
diff -r 41fc46a5a070 -r 1e2e7669e516 graphics/png/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/png/hacks.mk     Fri Aug 31 15:35:08 2007 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: hacks.mk,v 1.1 2007/08/31 15:35:08 minskim Exp $
+
+.if !defined(PNG_HACKS_MK)
+PNG_HACKS_MK=  defined
+
+# A workaround for libpng bug #1777158.
+.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
+PKG_HACKS+=    darwin-read_only_relocs
+LDFLAGS+=      -Wl,-read_only_relocs -Wl,suppress
+.endif
+
+.endif         # PNG_HACKS_MK
diff -r 41fc46a5a070 -r 1e2e7669e516 graphics/png/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/png/patches/patch-ab     Fri Aug 31 15:35:08 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.12 2007/08/31 15:35:08 minskim Exp $
+
+http://sourceforge.net/tracker/index.php?func=detail&aid=1777158&group_id=5624&atid=105624
+
+--- pnggccrd.c.orig    2007-08-18 03:33:42.000000000 -0700
++++ pnggccrd.c
+@@ -465,7 +465,7 @@ static PNG_CONST int FARDATA png_pass_wi
+ /* djgpp, Win32, Cygwin, and OS2 add their own underscores to global variables,
+  * so define them without: */
+ #if defined(__DJGPP__) || defined(WIN32) || defined(__CYGWIN__) || \
+-    defined(__OS2__)
++    defined(__OS2__) || defined(__APPLE__)
+ #  define _mmx_supported  mmx_supported
+ #  define _mask8_0        mask8_0
+ #  define _mask16_1       mask16_1