summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/png/Makefile2
-rw-r--r--graphics/png/files/patch-pnggccrd.c26
2 files changed, 25 insertions, 3 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index d9a1c89c6b32..3b581df3602f 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -7,7 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://www.libpng.org/pub/png/src/ \
ftp://swrinde.nde.swri.edu/pub/png/src/ \
diff --git a/graphics/png/files/patch-pnggccrd.c b/graphics/png/files/patch-pnggccrd.c
index 4a6e690ace8f..c08c0a60deae 100644
--- a/graphics/png/files/patch-pnggccrd.c
+++ b/graphics/png/files/patch-pnggccrd.c
@@ -1,5 +1,5 @@
---- pnggccrd.c.orig Thu Dec 4 15:52:22 2003
-+++ pnggccrd.c Thu Dec 4 16:00:18 2003
+--- pnggccrd.c.old Thu Oct 3 15:32:28 2002
++++ pnggccrd.c Sat Jul 24 14:07:13 2004
@@ -1767,7 +1767,8 @@
: "1" (sptr), // esi // input regs
@@ -31,3 +31,25 @@
#if 0 /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */
: "%mm0", "%mm1" // clobber list
+@@ -4529,8 +4533,7 @@
+ : "0" (bpp), // eax // input regs
+ "1" (row) // edi
+
+- : "%ebx", "%ecx", "%edx" // clobber list
+- , "%esi"
++ : "%esi", "%ecx", "%edx" // clobber list
+
+ #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+ , "%mm0", "%mm1", "%mm2", "%mm3"
+@@ -5034,7 +5037,10 @@
+ "1" (prev_row), // esi
+ "2" (row) // edi
+
+- : "%eax", "%ebx", "%ecx" // clobber list (no input regs!)
++ : "%eax", "%ecx" // clobber list (no input regs!)
++#ifndef __PIC__
++ , "%ebx"
++#endif
+
+ #if 0 /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+ , "%mm0", "%mm1", "%mm2", "%mm3"