packages: Mesa/Mesa.spec, Mesa/Mesa-tgsi_dump.patch (NEW) - added tgsi_dump...

[qboosh]

Author: qboosh                       Date: Sun Jan 10 10:55:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added tgsi_dump patch (fixes conflict with fortify printf redirect in glibc)

---- Files affected:
packages/Mesa:
   Mesa.spec (1.232 -> 1.233) , Mesa-tgsi_dump.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.232 packages/Mesa/Mesa.spec:1.233
--- packages/Mesa/Mesa.spec:1.232	Tue Dec 22 20:44:07 2009
+++ packages/Mesa/Mesa.spec	Sun Jan 10 11:55:43 2010
@@ -36,6 +36,7 @@
 Source2:	http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
 # Source2-md5:	6ae05158e678f4594343f32c2ca50515
 Patch0:		%{name}-realclean.patch
+Patch1:		%{name}-tgsi_dump.patch
 URL:		http://www.mesa3d.org/
 %{?with_demos:BuildRequires:	OpenGL-glut-devel >= 3.8}
 BuildRequires:	autoconf
@@ -621,6 +622,7 @@
 %prep
 %setup -q -b1 -a2
 %patch0 -p0
+%patch1 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
@@ -971,6 +973,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.233  2010/01/10 10:55:43  qboosh
+- added tgsi_dump patch (fixes conflict with fortify printf redirect in glibc)
+
 Revision 1.232  2009/12/22 19:44:07  arekm
 - up to final 7.7
 

================================================================
Index: packages/Mesa/Mesa-tgsi_dump.patch
diff -u /dev/null packages/Mesa/Mesa-tgsi_dump.patch:1.1
--- /dev/null	Sun Jan 10 11:55:48 2010
+++ packages/Mesa/Mesa-tgsi_dump.patch	Sun Jan 10 11:55:43 2010
@@ -0,0 +1,86 @@
+--- Mesa-7.7/src/gallium/auxiliary/tgsi/tgsi_dump.c.orig	2009-12-22 03:26:02.000000000 +0100
++++ Mesa-7.7/src/gallium/auxiliary/tgsi/tgsi_dump.c	2010-01-10 09:40:23.298610151 +0100
+@@ -47,7 +47,7 @@
+    
+    uint indentation;
+ 
+-   void (*printf)(struct dump_ctx *ctx, const char *format, ...);
++   void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...);
+ };
+ 
+ static void 
+@@ -68,19 +68,19 @@
+    uint enum_count )
+ {
+    if (e >= enum_count)
+-      ctx->printf( ctx, "%u", e );
++      ctx->dump_printf( ctx, "%u", e );
+    else
+-      ctx->printf( ctx, "%s", enums[e] );
++      ctx->dump_printf( ctx, "%s", enums[e] );
+ }
+ 
+-#define EOL()           ctx->printf( ctx, "\n" )
+-#define TXT(S)          ctx->printf( ctx, "%s", S )
+-#define CHR(C)          ctx->printf( ctx, "%c", C )
+-#define UIX(I)          ctx->printf( ctx, "0x%x", I )
+-#define UID(I)          ctx->printf( ctx, "%u", I )
+-#define INSTID(I)          ctx->printf( ctx, "% 3u", I )
+-#define SID(I)          ctx->printf( ctx, "%d", I )
+-#define FLT(F)          ctx->printf( ctx, "%10.4f", F )
++#define EOL()           ctx->dump_printf( ctx, "\n" )
++#define TXT(S)          ctx->dump_printf( ctx, "%s", S )
++#define CHR(C)          ctx->dump_printf( ctx, "%c", C )
++#define UIX(I)          ctx->dump_printf( ctx, "0x%x", I )
++#define UID(I)          ctx->dump_printf( ctx, "%u", I )
++#define INSTID(I)          ctx->dump_printf( ctx, "% 3u", I )
++#define SID(I)          ctx->dump_printf( ctx, "%d", I )
++#define FLT(F)          ctx->dump_printf( ctx, "%10.4f", F )
+ #define ENM(E,ENUMS)    dump_enum( ctx, E, ENUMS, sizeof( ENUMS ) / sizeof( *ENUMS ) )
+ 
+ static const char *processor_type_names[] =
+@@ -278,7 +278,7 @@
+ {
+    struct dump_ctx ctx;
+ 
+-   ctx.printf = dump_ctx_printf;
++   ctx.dump_printf = dump_ctx_printf;
+ 
+    iter_declaration( &ctx.iter, (struct tgsi_full_declaration *)decl );
+ }
+@@ -323,7 +323,7 @@
+ {
+    struct dump_ctx ctx;
+ 
+-   ctx.printf = dump_ctx_printf;
++   ctx.dump_printf = dump_ctx_printf;
+ 
+    iter_immediate( &ctx.iter, (struct tgsi_full_immediate *)imm );
+ }
+@@ -491,7 +491,7 @@
+ 
+    ctx.instno = instno;
+    ctx.indent = 0;
+-   ctx.printf = dump_ctx_printf;
++   ctx.dump_printf = dump_ctx_printf;
+    ctx.indentation = 0;
+ 
+    iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst );
+@@ -525,7 +525,7 @@
+ 
+    ctx.instno = 0;
+    ctx.indent = 0;
+-   ctx.printf = dump_ctx_printf;
++   ctx.dump_printf = dump_ctx_printf;
+    ctx.indentation = 0;
+ 
+    tgsi_iterate_shader( tokens, &ctx.iter );
+@@ -579,7 +579,7 @@
+ 
+    ctx.base.instno = 0;
+    ctx.base.indent = 0;
+-   ctx.base.printf = &str_dump_ctx_printf;
++   ctx.base.dump_printf = &str_dump_ctx_printf;
+    ctx.base.indentation = 0;
+ 
+    ctx.str = str;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.232&r2=1.233&f=u