Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

Conflicts:
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.c
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdri.c
	xorg-server/glx/glxext.c
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.c
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_texture_compression.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c

1 files changed, 50 insertions, 0 deletions

diff --git a/xorg-server/glx/glxstubs.c b/xorg-server/glx/glxstubs.c
new file mode 100644
index 000000000..69bc00480
--- /dev/null
+++ b/xorg-server/glx/glxstubs.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *	Adam Jackson <ajax@redhat.com>
+ */
+
+/*
+ * Redirection stubs for things that we call by name but that aren't exported
+ * from libGL by name.  Strictly speaking this list should be a lot longer,
+ * but this is enough to get us linking against contemporary Mesa.
+ */
+
+#include <inttypes.h>
+#include "glxserver.h"
+
+#define thunk(name, type, call_args, ...) \
+    _X_HIDDEN void name(__VA_ARGS__) { \
+	static type proc; \
+	if (!proc) proc = __glGetProcAddress(#name); \
+	proc call_args; \
+    }
+
+thunk(glSampleMaskSGIS, PFNGLSAMPLEMASKSGISPROC,
+      (value, invert), GLclampf value, GLboolean invert)
+
+thunk(glSamplePatternSGIS, PFNGLSAMPLEPATTERNSGISPROC,
+      (pattern), GLenum pattern)
+
+thunk(glActiveStencilFaceEXT, PFNGLACTIVESTENCILFACEEXTPROC,
+      (face), GLenum face)