Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

5 files changed, 19 insertions, 8 deletions

diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h
index 48343f65d..4e2932df7 100644
--- a/mesalib/include/GL/gl.h
+++ b/mesalib/include/GL/gl.h
@@ -694,7 +694,7 @@ typedef double		GLclampd;	/* double precision float in [0,1] */
 #define GL_LIST_BIT				0x00020000
 #define GL_TEXTURE_BIT				0x00040000
 #define GL_SCISSOR_BIT				0x00080000
-#define GL_ALL_ATTRIB_BITS			0x000FFFFF
+#define GL_ALL_ATTRIB_BITS			0xFFFFFFFF
 
 
 /* OpenGL 1.1 */
diff --git a/mesalib/include/GL/glxext.h b/mesalib/include/GL/glxext.h
index 713238519..8c642f354 100644
--- a/mesalib/include/GL/glxext.h
+++ b/mesalib/include/GL/glxext.h
@@ -33,10 +33,10 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 23422 $ on $Date: 2013-10-08 15:40:45 -0700 (Tue, 08 Oct 2013) $
+** Khronos $Revision: 24777 $ on $Date: 2014-01-14 14:02:32 -0800 (Tue, 14 Jan 2014) $
 */
 
-#define GLX_GLXEXT_VERSION 20131008
+#define GLX_GLXEXT_VERSION 20140114
 
 /* Generated C header for:
  * API: glx
@@ -49,6 +49,7 @@ extern "C" {
 
 #ifndef GLX_VERSION_1_3
 #define GLX_VERSION_1_3 1
+typedef XID GLXContextID;
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 typedef XID GLXWindow;
 typedef XID GLXPbuffer;
@@ -432,6 +433,14 @@ void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLe
 #endif
 #endif /* GLX_NV_copy_image */
 
+#ifndef GLX_NV_delay_before_swap
+#define GLX_NV_delay_before_swap 1
+typedef Bool ( *PFNGLXDELAYBEFORESWAPNVPROC) (Display *dpy, GLXDrawable drawable, GLfloat seconds);
+#ifdef GLX_GLXEXT_PROTOTYPES
+Bool glXDelayBeforeSwapNV (Display *dpy, GLXDrawable drawable, GLfloat seconds);
+#endif
+#endif /* GLX_NV_delay_before_swap */
+
 #ifndef GLX_NV_float_buffer
 #define GLX_NV_float_buffer 1
 #define GLX_FLOAT_COMPONENTS_NV           0x20B0
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index dc94cf255..6b9e5ecbc 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -1045,6 +1045,7 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FOURCC_XRGB8888	0x34325258
 #define __DRI_IMAGE_FOURCC_ABGR8888	0x34324241
 #define __DRI_IMAGE_FOURCC_XBGR8888	0x34324258
+#define __DRI_IMAGE_FOURCC_SARGB8888    0x83324258
 #define __DRI_IMAGE_FOURCC_YUV410	0x39565559
 #define __DRI_IMAGE_FOURCC_YUV411	0x31315559
 #define __DRI_IMAGE_FOURCC_YUV420	0x32315559
diff --git a/mesalib/include/HaikuGL/GLRenderer.h b/mesalib/include/HaikuGL/GLRenderer.h
index 7ffcc34bb..a93113b17 100644
--- a/mesalib/include/HaikuGL/GLRenderer.h
+++ b/mesalib/include/HaikuGL/GLRenderer.h
@@ -25,7 +25,7 @@ class BGLRenderer
 							// Private unimplemented copy constructors
 							BGLRenderer(const BGLRenderer &);
 							BGLRenderer & operator=(const BGLRenderer &);
-	
+
 public:
 							BGLRenderer(BGLView *view, ulong bgl_options,
 								BGLDispatcher *dispatcher);
@@ -36,14 +36,14 @@ public:
 
 	virtual void			LockGL();
 	virtual void 			UnlockGL();
-	
+
 	virtual	void 			SwapBuffers(bool VSync = false);
 	virtual	void			Draw(BRect updateRect);
 	virtual status_t		CopyPixelsOut(BPoint source, BBitmap *dest);
 	virtual status_t    	CopyPixelsIn(BBitmap *source, BPoint dest);
 
- 	virtual void			FrameResized(float width, float height);
-	
+	virtual void			FrameResized(float width, float height);
+
 	virtual void			DirectConnected(direct_buffer_info *info);
 	virtual void			EnableDirectMode(bool enabled);
 
@@ -61,7 +61,7 @@ private:
 	virtual status_t		_Reserved_Renderer_3(int32, void *);
 	virtual status_t		_Reserved_Renderer_4(int32, void *);
 
-	volatile int32			fRefCount;	// How much we're still usefull?
+	int32					fRefCount;	// How much we're still useful
 	BGLView*				fView;		// Never forget who is the boss!
 	ulong					fOptions;	// Keep that tune in memory
 	BGLDispatcher*			fDispatcher;// Our personal GL API call dispatcher
diff --git a/mesalib/include/c11/threads_win32.h b/mesalib/include/c11/threads_win32.h
index ee2946025..be1a38957 100644
--- a/mesalib/include/c11/threads_win32.h
+++ b/mesalib/include/c11/threads_win32.h
@@ -30,6 +30,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <process.h>  // MSVCRT
+#include <stdlib.h>
 
 /*
 Configuration macro: