xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3

1 files changed, 69 insertions, 69 deletions

diff --git a/xorg-server/glamor/glamor_gl_dispatch.c b/xorg-server/glamor/glamor_gl_dispatch.c
index da99e2627..0bdda9c34 100644
--- a/xorg-server/glamor/glamor_gl_dispatch.c
+++ b/xorg-server/glamor/glamor_gl_dispatch.c
@@ -41,78 +41,78 @@
 
 _X_EXPORT Bool
 glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
-			     int gl_version,
-			     void *(*get_proc_address) (const char *))
+                             int gl_version,
+                             void *(*get_proc_address) (const char *))
 {
 #ifndef GLAMOR_GLES2
-	INIT_FUNC(dispatch, glMatrixMode, get_proc_address);
-	INIT_FUNC(dispatch, glLoadIdentity, get_proc_address);
-	INIT_FUNC(dispatch, glRasterPos2i, get_proc_address);
-	INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
-	INIT_FUNC(dispatch, glLogicOp, get_proc_address);
-	INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
-	INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
-	INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
-	INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
-	INIT_FUNC(dispatch, glDrawRangeElements, get_proc_address);
+    INIT_FUNC(dispatch, glMatrixMode, get_proc_address);
+    INIT_FUNC(dispatch, glLoadIdentity, get_proc_address);
+    INIT_FUNC(dispatch, glRasterPos2i, get_proc_address);
+    INIT_FUNC(dispatch, glDrawPixels, get_proc_address);
+    INIT_FUNC(dispatch, glLogicOp, get_proc_address);
+    INIT_FUNC(dispatch, glMapBuffer, get_proc_address);
+    INIT_FUNC(dispatch, glMapBufferRange, get_proc_address);
+    INIT_FUNC(dispatch, glUnmapBuffer, get_proc_address);
+    INIT_FUNC(dispatch, glBlitFramebuffer, get_proc_address);
+    INIT_FUNC(dispatch, glDrawRangeElements, get_proc_address);
 #endif
-	INIT_FUNC(dispatch, glViewport, get_proc_address);
-	INIT_FUNC(dispatch, glDrawArrays, get_proc_address);
-	INIT_FUNC(dispatch, glDrawElements, get_proc_address);
-	INIT_FUNC(dispatch, glReadPixels, get_proc_address);
-	INIT_FUNC(dispatch, glPixelStorei, get_proc_address);
-	INIT_FUNC(dispatch, glTexParameteri, get_proc_address);
-	INIT_FUNC(dispatch, glTexImage2D, get_proc_address);
-	INIT_FUNC(dispatch, glGenTextures, get_proc_address);
-	INIT_FUNC(dispatch, glDeleteTextures, get_proc_address);
-	INIT_FUNC(dispatch, glBindTexture, get_proc_address);
-	INIT_FUNC(dispatch, glTexSubImage2D, get_proc_address);
-	INIT_FUNC(dispatch, glFlush, get_proc_address);
-	INIT_FUNC(dispatch, glFinish, get_proc_address);
-	INIT_FUNC(dispatch, glGetIntegerv, get_proc_address);
-	INIT_FUNC(dispatch, glGetString, get_proc_address);
-	INIT_FUNC(dispatch, glScissor, get_proc_address);
-	INIT_FUNC(dispatch, glEnable, get_proc_address);
-	INIT_FUNC(dispatch, glDisable, get_proc_address);
-	INIT_FUNC(dispatch, glBlendFunc, get_proc_address);
-	INIT_FUNC(dispatch, glActiveTexture, get_proc_address);
-	INIT_FUNC(dispatch, glGenBuffers, get_proc_address);
-	INIT_FUNC(dispatch, glBufferData, get_proc_address);
-	INIT_FUNC(dispatch, glBindBuffer, get_proc_address);
-	INIT_FUNC(dispatch, glDeleteBuffers, get_proc_address);
-	INIT_FUNC(dispatch, glFramebufferTexture2D, get_proc_address);
-	INIT_FUNC(dispatch, glBindFramebuffer, get_proc_address);
-	INIT_FUNC(dispatch, glDeleteFramebuffers, get_proc_address);
-	INIT_FUNC(dispatch, glGenFramebuffers, get_proc_address);
-	INIT_FUNC(dispatch, glCheckFramebufferStatus, get_proc_address);
-	INIT_FUNC(dispatch, glVertexAttribPointer, get_proc_address);
-	INIT_FUNC(dispatch, glDisableVertexAttribArray, get_proc_address);
-	INIT_FUNC(dispatch, glEnableVertexAttribArray, get_proc_address);
-	INIT_FUNC(dispatch, glBindAttribLocation, get_proc_address);
-	INIT_FUNC(dispatch, glLinkProgram, get_proc_address);
-	INIT_FUNC(dispatch, glShaderSource, get_proc_address);
+    INIT_FUNC(dispatch, glViewport, get_proc_address);
+    INIT_FUNC(dispatch, glDrawArrays, get_proc_address);
+    INIT_FUNC(dispatch, glDrawElements, get_proc_address);
+    INIT_FUNC(dispatch, glReadPixels, get_proc_address);
+    INIT_FUNC(dispatch, glPixelStorei, get_proc_address);
+    INIT_FUNC(dispatch, glTexParameteri, get_proc_address);
+    INIT_FUNC(dispatch, glTexImage2D, get_proc_address);
+    INIT_FUNC(dispatch, glGenTextures, get_proc_address);
+    INIT_FUNC(dispatch, glDeleteTextures, get_proc_address);
+    INIT_FUNC(dispatch, glBindTexture, get_proc_address);
+    INIT_FUNC(dispatch, glTexSubImage2D, get_proc_address);
+    INIT_FUNC(dispatch, glFlush, get_proc_address);
+    INIT_FUNC(dispatch, glFinish, get_proc_address);
+    INIT_FUNC(dispatch, glGetIntegerv, get_proc_address);
+    INIT_FUNC(dispatch, glGetString, get_proc_address);
+    INIT_FUNC(dispatch, glScissor, get_proc_address);
+    INIT_FUNC(dispatch, glEnable, get_proc_address);
+    INIT_FUNC(dispatch, glDisable, get_proc_address);
+    INIT_FUNC(dispatch, glBlendFunc, get_proc_address);
+    INIT_FUNC(dispatch, glActiveTexture, get_proc_address);
+    INIT_FUNC(dispatch, glGenBuffers, get_proc_address);
+    INIT_FUNC(dispatch, glBufferData, get_proc_address);
+    INIT_FUNC(dispatch, glBindBuffer, get_proc_address);
+    INIT_FUNC(dispatch, glDeleteBuffers, get_proc_address);
+    INIT_FUNC(dispatch, glFramebufferTexture2D, get_proc_address);
+    INIT_FUNC(dispatch, glBindFramebuffer, get_proc_address);
+    INIT_FUNC(dispatch, glDeleteFramebuffers, get_proc_address);
+    INIT_FUNC(dispatch, glGenFramebuffers, get_proc_address);
+    INIT_FUNC(dispatch, glCheckFramebufferStatus, get_proc_address);
+    INIT_FUNC(dispatch, glVertexAttribPointer, get_proc_address);
+    INIT_FUNC(dispatch, glDisableVertexAttribArray, get_proc_address);
+    INIT_FUNC(dispatch, glEnableVertexAttribArray, get_proc_address);
+    INIT_FUNC(dispatch, glBindAttribLocation, get_proc_address);
+    INIT_FUNC(dispatch, glLinkProgram, get_proc_address);
+    INIT_FUNC(dispatch, glShaderSource, get_proc_address);
 
-	INIT_FUNC(dispatch, glUseProgram, get_proc_address);
-	INIT_FUNC(dispatch, glUniform1i, get_proc_address);
-	INIT_FUNC(dispatch, glUniform1f, get_proc_address);
-	INIT_FUNC(dispatch, glUniform4f, get_proc_address);
-	INIT_FUNC(dispatch, glUniform4fv, get_proc_address);
-	INIT_FUNC(dispatch, glUniform1fv, get_proc_address);
-	INIT_FUNC(dispatch, glUniform2fv, get_proc_address);
-	INIT_FUNC(dispatch, glUniformMatrix3fv, get_proc_address);
-	INIT_FUNC(dispatch, glCreateProgram, get_proc_address);
-	INIT_FUNC(dispatch, glDeleteProgram, get_proc_address);
-	INIT_FUNC(dispatch, glCreateShader, get_proc_address);
-	INIT_FUNC(dispatch, glCompileShader, get_proc_address);
-	INIT_FUNC(dispatch, glAttachShader, get_proc_address);
-	INIT_FUNC(dispatch, glDeleteShader, get_proc_address);
-	INIT_FUNC(dispatch, glGetShaderiv, get_proc_address);
-	INIT_FUNC(dispatch, glGetShaderInfoLog, get_proc_address);
-	INIT_FUNC(dispatch, glGetProgramiv, get_proc_address);
-	INIT_FUNC(dispatch, glGetProgramInfoLog, get_proc_address);
-	INIT_FUNC(dispatch, glGetUniformLocation, get_proc_address);
+    INIT_FUNC(dispatch, glUseProgram, get_proc_address);
+    INIT_FUNC(dispatch, glUniform1i, get_proc_address);
+    INIT_FUNC(dispatch, glUniform1f, get_proc_address);
+    INIT_FUNC(dispatch, glUniform4f, get_proc_address);
+    INIT_FUNC(dispatch, glUniform4fv, get_proc_address);
+    INIT_FUNC(dispatch, glUniform1fv, get_proc_address);
+    INIT_FUNC(dispatch, glUniform2fv, get_proc_address);
+    INIT_FUNC(dispatch, glUniformMatrix3fv, get_proc_address);
+    INIT_FUNC(dispatch, glCreateProgram, get_proc_address);
+    INIT_FUNC(dispatch, glDeleteProgram, get_proc_address);
+    INIT_FUNC(dispatch, glCreateShader, get_proc_address);
+    INIT_FUNC(dispatch, glCompileShader, get_proc_address);
+    INIT_FUNC(dispatch, glAttachShader, get_proc_address);
+    INIT_FUNC(dispatch, glDeleteShader, get_proc_address);
+    INIT_FUNC(dispatch, glGetShaderiv, get_proc_address);
+    INIT_FUNC(dispatch, glGetShaderInfoLog, get_proc_address);
+    INIT_FUNC(dispatch, glGetProgramiv, get_proc_address);
+    INIT_FUNC(dispatch, glGetProgramInfoLog, get_proc_address);
+    INIT_FUNC(dispatch, glGetUniformLocation, get_proc_address);
 
-	return TRUE;
-      fail:
-	return FALSE;
+    return TRUE;
+ fail:
+    return FALSE;
 }