rpms/mesa/devel mesa-6.5.1-selinux-awareness.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32208

Modified Files:
	mesa-6.5.1-selinux-awareness.patch 
Log Message:
Add missing chunk to selinux patch.

mesa-6.5.1-selinux-awareness.patch:
 configs/linux-dri                            |    3 ++-
 src/mesa/drivers/dri/r200/r200_context.c     |   15 +++++++++++----
 src/mesa/drivers/dri/r200/r200_context.h     |    1 +
 src/mesa/drivers/dri/radeon/radeon_context.c |   16 ++++++++++++----
 src/mesa/drivers/dri/radeon/radeon_context.h |    1 +
 src/mesa/main/execmem.c                      |   20 ++++++++++++++++----
 src/mesa/shader/slang/slang_execute_x86.c    |    3 ++-
 src/mesa/tnl/t_vb_arbprogram_sse.c           |    3 ++-
 src/mesa/tnl/t_vertex_sse.c                  |    8 ++++++--
 src/mesa/x86/rtasm/x86sse.c                  |    8 +++++---
 src/mesa/x86/rtasm/x86sse.h                  |    4 ++--
 11 files changed, 60 insertions(+), 22 deletions(-)

Index: mesa-6.5.1-selinux-awareness.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5.1-selinux-awareness.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-6.5.1-selinux-awareness.patch	23 Aug 2006 01:13:00 -0000	1.2
+++ mesa-6.5.1-selinux-awareness.patch	23 Aug 2006 14:28:14 -0000	1.3
@@ -1,5 +1,5 @@
 --- ./src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/x86/rtasm/x86sse.h	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.h	2006-08-22 21:14:45.000000000 -0400
 @@ -80,8 +80,8 @@
   */
  
@@ -12,7 +12,7 @@
  void (*x86_get_func( struct x86_function *p ))( void );
  
 --- ./src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/x86/rtasm/x86sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/x86/rtasm/x86sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -1063,15 +1063,17 @@
  }
  
@@ -35,7 +35,7 @@
  
  void x86_release_func( struct x86_function *p )
 --- ./src/mesa/main/execmem.c.selinux-awareness	2006-05-10 05:00:16.000000000 -0400
-+++ ./src/mesa/main/execmem.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/main/execmem.c	2006-08-22 21:14:45.000000000 -0400
 @@ -36,7 +36,7 @@
  
  
@@ -101,7 +101,7 @@
     
     return addr;
 --- ./src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-06-01 18:56:40.000000000 -0400
-+++ ./src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/tnl/t_vb_arbprogram_sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -1298,7 +1298,8 @@
        p->compiled_func = NULL;
     }
@@ -113,7 +113,7 @@
     cp.fpucntl = RESTORE_FPU;
  
 --- ./src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
-+++ ./src/mesa/tnl/t_vertex_sse.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/tnl/t_vertex_sse.c	2006-08-22 21:14:45.000000000 -0400
 @@ -348,7 +348,8 @@
     struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
     GLubyte *fixup, *label;
@@ -136,8 +136,18 @@
  
     if (build_vertex_emit(&p)) {
        _tnl_register_fastpath( vtx, GL_TRUE );
+--- ./src/mesa/drivers/dri/radeon/radeon_context.h.selinux-awareness	2006-04-11 07:41:11.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_context.h	2006-08-23 10:23:20.000000000 -0400
+@@ -778,6 +778,7 @@
+    GLuint TexMatColSwap;
+    GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
+    GLuint last_ReallyEnabled;
++   GLint tcl_mode;
+ 
+    /* VBI
+     */
 --- ./src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-04-09 13:48:28.000000000 -0400
-+++ ./src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/drivers/dri/radeon/radeon_context.c	2006-08-22 21:14:45.000000000 -0400
 @@ -471,11 +471,20 @@
     }
  
@@ -172,7 +182,7 @@
        }
  
 --- ./src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-06-09 20:51:54.000000000 -0400
-+++ ./src/mesa/drivers/dri/r200/r200_context.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.c	2006-08-22 21:14:45.000000000 -0400
 @@ -546,11 +546,19 @@
     }
  
@@ -205,8 +215,8 @@
  	    r200VtxfmtDestroy( rmesa->glCtx );
        }
  
---- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness	2006-08-22 21:06:15.000000000 -0400
-+++ ./src/mesa/drivers/dri/r200/r200_context.h	2006-08-22 21:06:44.000000000 -0400
+--- ./src/mesa/drivers/dri/r200/r200_context.h.selinux-awareness	2006-07-20 12:49:57.000000000 -0400
++++ ./src/mesa/drivers/dri/r200/r200_context.h	2006-08-22 21:14:45.000000000 -0400
 @@ -990,6 +990,7 @@
     GLuint TexGenEnabled;
     GLuint TexGenCompSel;
@@ -216,7 +226,7 @@
     /* VBI / buffer swap
      */
 --- ./src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-08-09 16:05:26.000000000 -0400
-+++ ./src/mesa/shader/slang/slang_execute_x86.c	2006-08-22 20:51:02.000000000 -0400
++++ ./src/mesa/shader/slang/slang_execute_x86.c	2006-08-22 21:14:45.000000000 -0400
 @@ -666,7 +666,8 @@
  	 * The built-in library occupies 450K, so we can be safe for now.
  	 * It is going to change in the future, when we get assembly analysis running.
@@ -227,8 +237,8 @@
  	G.r_eax = x86_make_reg (file_REG32, reg_AX);
  	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
  	G.r_edx = x86_make_reg (file_REG32, reg_DX);
---- ./configs/linux-dri.selinux-awareness	2006-08-22 20:51:02.000000000 -0400
-+++ ./configs/linux-dri	2006-08-22 20:51:02.000000000 -0400
+--- ./configs/linux-dri.selinux-awareness	2006-08-22 21:14:45.000000000 -0400
++++ ./configs/linux-dri	2006-08-22 21:14:45.000000000 -0400
 @@ -38,7 +38,8 @@
  
  LIBDRM_CFLAGS = `pkg-config --cflags libdrm`