summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2007-08-31 15:35:08 +0000
committerminskim <minskim@pkgsrc.org>2007-08-31 15:35:08 +0000
commit9d378f69384c1596f568cd9ef7a222ab586d84f2 (patch)
tree3c6e8858ab88611417dc26ebb2c3693d2af3e971 /graphics
parent722df5a2a3eac130257b64dd9727d743e17aee53 (diff)
downloadpkgsrc-9d378f69384c1596f568cd9ef7a222ab586d84f2.tar.gz
Add a workaround for libpng bug #1777158. This makes the package build
on Darwin/i386.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/png/distinfo3
-rw-r--r--graphics/png/hacks.mk12
-rw-r--r--graphics/png/patches/patch-ab15
3 files changed, 29 insertions, 1 deletions
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index a0c77ff2193..d4e7ba2cb38 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -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 --git a/graphics/png/hacks.mk b/graphics/png/hacks.mk
new file mode 100644
index 00000000000..6040628f2d0
--- /dev/null
+++ b/graphics/png/hacks.mk
@@ -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 --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab
new file mode 100644
index 00000000000..4a0c259089e
--- /dev/null
+++ b/graphics/png/patches/patch-ab
@@ -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