Fix build with gcc4, mirroring changes in gimp-2.3.9.

This commit is contained in:
wiz 2006-06-26 21:12:53 +00:00
parent a6ee7206f2
commit 1ba16fdf98
5 changed files with 92 additions and 1 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.28 2006/04/18 20:24:48 tron Exp $
$NetBSD: distinfo,v 1.29 2006/06/26 21:12:53 wiz Exp $
SHA1 (gimp-2.2.11.tar.bz2) = 11d22fb8448a87968e03cacf7f30cd7f6725d7c3
RMD160 (gimp-2.2.11.tar.bz2) = 0304a859d53e4e6b7520b5e8634e64e07911eeba
@ -7,3 +7,7 @@ SHA1 (patch-aa) = 269ef6f5a7744b8e5ee546140ca0076456df3b97
SHA1 (patch-ab) = 3709d31062dec70daa09399f05fa61f91ed843b8
SHA1 (patch-ac) = 796018e782611b71d68c365bf9dc2ab56126c2fa
SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
SHA1 (patch-ae) = 680bc442dbcc8ebe7059dcf2e24e3dde2922c3d2
SHA1 (patch-af) = 8122d4e5669c99c319e7a37dbad11c636967c77e
SHA1 (patch-ag) = db5a55f6f37820bc2771851d73d36535a508b12c
SHA1 (patch-ah) = 034eeae7ba6fa199db40dedd70ecc17a30a1ed95

View file

@ -0,0 +1,41 @@
$NetBSD: patch-ae,v 1.5 2006/06/26 21:12:53 wiz Exp $
--- app/composite/gimp-composite-mmx.c.orig 2006-04-13 11:20:13.000000000 +0000
+++ app/composite/gimp-composite-mmx.c
@@ -135,6 +135,7 @@ gimp_composite_addition_rgba8_rgba8_rgba
asm("emms");
}
+#if 0
void
gimp_composite_burn_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op)
{
@@ -250,7 +251,7 @@ gimp_composite_burn_rgba8_rgba8_rgba8_mm
asm("emms");
}
-
+#endif
void
gimp_composite_darken_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op)
@@ -1267,8 +1268,8 @@ gimp_composite_swap_rgba8_rgba8_rgba8_mm
"\tmovq %%mm3,%0\n"
"\tmovq %%mm2,%1\n"
: "+m" (*a), "+m" (*b)
- :
- : "%mm1", "%mm2", "%mm3", "%mm4");
+ :
+ : "%mm2", "%mm3");
a++;
b++;
}
@@ -1281,7 +1282,7 @@ gimp_composite_swap_rgba8_rgba8_rgba8_mm
"\tmovd %%mm2,%1\n"
: "+m" (*a), "+m" (*b)
:
- : "%mm1", "%mm2", "%mm3", "%mm4");
+ : "%mm2", "%mm3");
}
asm("emms");

View file

@ -0,0 +1,22 @@
$NetBSD: patch-af,v 1.3 2006/06/26 21:12:53 wiz Exp $
--- app/composite/gimp-composite-sse.c.orig 2005-08-15 10:07:03.000000000 +0000
+++ app/composite/gimp-composite-sse.c
@@ -113,7 +113,7 @@ gimp_composite_addition_rgba8_rgba8_rgba
asm("emms");
}
-
+#if 0
void
gimp_composite_burn_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op)
{
@@ -229,7 +229,7 @@ gimp_composite_burn_rgba8_rgba8_rgba8_ss
asm("emms");
}
-
+#endif
void
gimp_composite_darken_rgba8_rgba8_rgba8_sse (GimpCompositeContext *_op)

View file

@ -0,0 +1,12 @@
$NetBSD: patch-ag,v 1.3 2006/06/26 21:12:53 wiz Exp $
--- app/composite/gimp-composite-mmx-installer.c.orig 2006-04-13 11:20:13.000000000 +0000
+++ app/composite/gimp-composite-mmx-installer.c
@@ -25,7 +25,6 @@ static struct install_table {
{ GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_mmx },
{ GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_mmx },
{ GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_mmx },
- { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_mmx },
{ GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_mmx },
{ GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_mmx },
{ GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_mmx },

View file

@ -0,0 +1,12 @@
$NetBSD: patch-ah,v 1.3 2006/06/26 21:12:53 wiz Exp $
--- app/composite/gimp-composite-sse-installer.c.orig 2005-08-15 10:07:03.000000000 +0000
+++ app/composite/gimp-composite-sse-installer.c
@@ -25,7 +25,6 @@ static struct install_table {
{ GIMP_COMPOSITE_SUBTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_subtract_rgba8_rgba8_rgba8_sse },
{ GIMP_COMPOSITE_DARKEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_darken_rgba8_rgba8_rgba8_sse },
{ GIMP_COMPOSITE_LIGHTEN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_lighten_rgba8_rgba8_rgba8_sse },
- { GIMP_COMPOSITE_BURN, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_burn_rgba8_rgba8_rgba8_sse },
{ GIMP_COMPOSITE_GRAIN_EXTRACT, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_extract_rgba8_rgba8_rgba8_sse },
{ GIMP_COMPOSITE_GRAIN_MERGE, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_grain_merge_rgba8_rgba8_rgba8_sse },
{ GIMP_COMPOSITE_SWAP, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, GIMP_PIXELFORMAT_RGBA8, gimp_composite_swap_rgba8_rgba8_rgba8_sse },