[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Added patch-ak, which fixes the bulk ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69b1b102cca6
branches:  trunk
changeset: 507099:69b1b102cca6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Jan 26 15:16:16 2006 +0000

description:
Added patch-ak, which fixes the bulk build for NetBSD 1.6.2/i386.

diffstat:

 graphics/MesaLib/distinfo         |   3 ++-
 graphics/MesaLib/patches/patch-ak |  25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r a31a960843b5 -r 69b1b102cca6 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu Jan 26 14:32:33 2006 +0000
+++ b/graphics/MesaLib/distinfo Thu Jan 26 15:16:16 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2006/01/19 12:53:17 adam Exp $
+$NetBSD: distinfo,v 1.34 2006/01/26 15:16:16 rillig Exp $
 
 SHA1 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25
 RMD160 (Mesa-6.4.1/MesaLib-6.4.1.tar.bz2) = e3a54d6442fa5d6e446bb0b6704bd22c31fb4927
@@ -19,3 +19,4 @@
 SHA1 (patch-ah) = b9ee33c497b8abe2af004a4f13219a19f413f30e
 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a
+SHA1 (patch-ak) = 6c0d2d3b9a6b0c237b541c9c352584be5a7c66d1
diff -r a31a960843b5 -r 69b1b102cca6 graphics/MesaLib/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-ak Thu Jan 26 15:16:16 2006 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ak,v 1.1 2006/01/26 15:16:16 rillig Exp $
+
+Declarations inside of macros are evil. Even more if they are not preceded
+by an additional opening brace.
+
+--- src/mesa/swrast/s_triangle.c.orig  2006-01-23 21:27:28.000000000 +0100
++++ src/mesa/swrast/s_triangle.c       2006-01-23 21:27:06.000000000 +0100
+@@ -163,6 +163,7 @@ _swrast_culltriangle( GLcontext *ctx,
+    }
+ 
+ #define RENDER_SPAN( span  )                                          \
++{                                                                     \
+    GLuint i;                                                          \
+    span.intTex[0] -= FIXED_HALF; /* off-by-one error? */              \
+    span.intTex[1] -= FIXED_HALF;                                      \
+@@ -177,7 +178,8 @@ _swrast_culltriangle( GLcontext *ctx,
+       span.intTex[0] += span.intTexStep[0];                           \
+       span.intTex[1] += span.intTexStep[1];                           \
+    }                                                                  \
+-   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL);
++   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); \
++}
+ 
+ #include "s_tritemp.h"
+