svn merge ^/branches/released .

7 files changed, 265 insertions, 270 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index efe9c5c40..588ee62a8 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -601,6 +601,9 @@ AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with
                                    GLX_USE_TLS=yes

                                  fi])

 AC_SUBST(GLX_TLS, ${GLX_USE_TLS})

+AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Path to Khronos OpenGL registry database files (default: auto)]),

+				[KHRONOS_SPEC_DIR="${withval}"],

+				[KHRONOS_SPEC_DIR=auto])

 

 dnl Extensions.

 AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])

@@ -1011,12 +1014,14 @@ else
 fi

 AM_CONDITIONAL(GLX, test "x$GLX" = xyes)

 

-if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then

+if test "x$GLX" = xno; then

+        AIGLX=no

+fi

+

+if test "x$AIGLX" = xyes -a \( "x$DRI" = xyes -o "x$DRI2" = xyes \); then

 	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])

-else

-	AIGLX=no

 fi

-AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)

+AM_CONDITIONAL(AIGLX_DRI_LOADER, { test "x$DRI" = xyes || test "x$DRI2" = xyes; } && test "x$AIGLX" = xyes)

 

 if test "x$GLX_USE_TLS" = xyes ; then

 	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"

@@ -1855,12 +1860,22 @@ if test "x$XWIN" = xyes; then
 

 	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])

 	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])

+

+dnl XWin with AIGLX requires OpenGL spec files in order to generate wrapper code for native GL functions

+	if [test "x$XWIN" = xyes && test "x$AIGLX" = xyes] ; then

+           if test "x$KHRONOS_SPEC_DIR" = "xauto" ; then

+		PKG_CHECK_MODULES([KHRONOS_OPENGL_REGISTRY], [khronos-opengl-registry])

+		KHRONOS_SPEC_DIR=`pkg-config khronos-opengl-registry --variable=specdir`

+           fi

+           AC_SUBST(KHRONOS_SPEC_DIR)

+	fi

+

 fi

 AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])

 AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])

 AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])

 AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])

+AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$AIGLX" = xyes])

 AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])

 AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])

 AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])

diff --git a/xorg-server/glx/Makefile.am b/xorg-server/glx/Makefile.am
index f89cb7e35..869e5e667 100644
--- a/xorg-server/glx/Makefile.am
+++ b/xorg-server/glx/Makefile.am
@@ -1,4 +1,4 @@
-if AIGLX

+if AIGLX_DRI_LOADER

 GLXDRI_LIBRARY = libglxdri.la

 endif

 

diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.am b/xorg-server/hw/xfree86/dixmods/Makefile.am
index 365f00671..68111631c 100644
--- a/xorg-server/hw/xfree86/dixmods/Makefile.am
+++ b/xorg-server/hw/xfree86/dixmods/Makefile.am
@@ -1,68 +1,68 @@
-noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la
-
-SUBDIRS = extmod
-
-if GLX
-GLXMODS = libglx.la
-endif
-
-if DBE
-DBEMOD = libdbe.la
-endif
-
-if RECORD
-RECORDMOD = librecord.la
-endif
-
-module_LTLIBRARIES = libfb.la \
-                     libwfb.la \
-                     libshadow.la
-
-extsmoduledir = $(moduledir)/extensions
-extsmodule_LTLIBRARIES = $(RECORDMOD) \
-			 $(DBEMOD) \
-                         $(GLXMODS)
-
-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
-INCLUDES = @XORG_INCS@ \
-           -I$(top_srcdir)/dbe \
-           -I$(top_srcdir)/hw/xfree86/loader \
-           -I$(top_srcdir)/miext/shadow \
-           -I$(top_srcdir)/glx
-
-libdbe_la_LDFLAGS = -avoid-version
-libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
-libdbe_la_SOURCES = dbemodule.c
-
-libfb_la_LDFLAGS = -avoid-version
-libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
-libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
-libfb_la_CFLAGS = $(AM_CFLAGS)
-
-libwfb_la_LDFLAGS = -avoid-version
-libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
-libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
-libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
-
-libglx_la_LDFLAGS = -avoid-version
-if AIGLX
-GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
-endif
-libglx_la_LIBADD = \
-	$(top_builddir)/glx/libglx.la \
-	$(GLXDRI_LIBRARY)
-libglx_la_SOURCES = glxmodule.c
-
-librecord_la_LDFLAGS = -avoid-version
-librecord_la_LIBADD = $(top_builddir)/record/librecord.la
-librecord_la_SOURCES = recordmod.c
-
-libshadow_la_LDFLAGS = -avoid-version
-libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
-libshadow_la_SOURCES = shmodule.c
-
-libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
-libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
-
-libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
+noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la

+

+SUBDIRS = extmod

+

+if GLX

+GLXMODS = libglx.la

+endif

+

+if DBE

+DBEMOD = libdbe.la

+endif

+

+if RECORD

+RECORDMOD = librecord.la

+endif

+

+module_LTLIBRARIES = libfb.la \

+                     libwfb.la \

+                     libshadow.la

+

+extsmoduledir = $(moduledir)/extensions

+extsmodule_LTLIBRARIES = $(RECORDMOD) \

+			 $(DBEMOD) \

+                         $(GLXMODS)

+

+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@

+INCLUDES = @XORG_INCS@ \

+           -I$(top_srcdir)/dbe \

+           -I$(top_srcdir)/hw/xfree86/loader \

+           -I$(top_srcdir)/miext/shadow \

+           -I$(top_srcdir)/glx

+

+libdbe_la_LDFLAGS = -avoid-version

+libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la

+libdbe_la_SOURCES = dbemodule.c

+

+libfb_la_LDFLAGS = -avoid-version

+libfb_la_LIBADD = $(top_builddir)/fb/libfb.la

+libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c

+libfb_la_CFLAGS = $(AM_CFLAGS)

+

+libwfb_la_LDFLAGS = -avoid-version

+libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la

+libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c

+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER

+

+libglx_la_LDFLAGS = -avoid-version

+if AIGLX_DRI_LOADER

+GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la

+endif

+libglx_la_LIBADD = \

+	$(top_builddir)/glx/libglx.la \

+	$(GLXDRI_LIBRARY)

+libglx_la_SOURCES = glxmodule.c

+

+librecord_la_LDFLAGS = -avoid-version

+librecord_la_LIBADD = $(top_builddir)/record/librecord.la

+librecord_la_SOURCES = recordmod.c

+

+libshadow_la_LDFLAGS = -avoid-version

+libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la

+libshadow_la_SOURCES = shmodule.c

+

+libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c

+libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)

+

+libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c

+libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la

diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am
index 94ebbb828..61463f635 100644
--- a/xorg-server/hw/xwin/glx/Makefile.am
+++ b/xorg-server/hw/xwin/glx/Makefile.am
@@ -25,36 +25,16 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
             -I$(top_srcdir) \

             -I$(top_srcdir)/hw/xwin/

 

-glwrap.c: generated_gl_wrappers.c

-wgl_ext_api.c: generated_wgl_wrappers.c wglext.h

-wgl_ext_api.h: wglext.h

-indirect.c: wgl_ext_api.h

+if XWIN_GLX_WINDOWS

 

-SPEC_FILES = gl.spec gl.tm wglext.spec wgl.tm

+generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONOS_SPEC_DIR)/gl.tm

+	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/gl.spec --typemap=$(KHRONOS_SPEC_DIR)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

 

-gl.spec:

-	wget http://www.opengl.org/registry/api/gl.spec

-

-gl.tm:

-	wget http://www.opengl.org/registry/api/gl.tm

-

-wglext.spec:

-	wget http://www.opengl.org/registry/api/wglext.spec

-

-wgl.tm:

-	wget http://www.opengl.org/registry/api/wgl.tm

-

-generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=`test -e gl.spec || echo $(srcdir)/`gl.spec --typemap=`test -e gl.tm || echo $(srcdir)/`gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

-

-generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=`test -e wglext.spec || echo $(srcdir)/`wglext.spec --typemap=`test -e wgl.tm || echo $(srcdir)/`wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

-

-wglext.h:

-	wget http://www.opengl.org/registry/api/wglext.h

+generated_wgl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wglext.spec $(KHRONOS_SPEC_DIR)/wgl.tm

+	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/wglext.spec --typemap=$(KHRONOS_SPEC_DIR)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

+endif

 

 BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c

 CLEANFILES = $(BUILT_SOURCES)

-DISTCLEANFILES = $(SPEC_FILES) wglext.h

 

-EXTRA_DIST = gen_gl_wrappers.py $(SPEC_FILES) wglext.h

+EXTRA_DIST = gen_gl_wrappers.py

diff --git a/xorg-server/hw/xwin/glx/wgl_ext_api.c b/xorg-server/hw/xwin/glx/wgl_ext_api.c
index 984ce64a2..1d6abcc63 100644
--- a/xorg-server/hw/xwin/glx/wgl_ext_api.c
+++ b/xorg-server/hw/xwin/glx/wgl_ext_api.c
@@ -1,80 +1,80 @@
-/*
- * File: wgl_ext_api.c
- * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
- *
- * Authors: Jon TURNEY
- *
- * Copyright (c) Jon TURNEY 2009
- *
- *
- * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-
-#include <X11/Xwindows.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include <glx/glxserver.h>
-#include <glx/glxext.h>
-#include "wglext.h"
-#include <wgl_ext_api.h>
-#include "glwindows.h"
-
-#define RESOLVE_DECL(type) \
-    static type type##proc = NULL;
-
-#ifdef _DEBUG
-#define PRERESOLVE(type, symbol) \
-    type##proc = (type)wglGetProcAddress(symbol); \
-    if (type##proc == NULL) \
-        ErrorF("wglwrap: Can't resolve \"%s\"\n", symbol); \
-    else \
-        ErrorF("wglwrap: Resolved \"%s\"\n", symbol);
-#else
-#define PRERESOLVE(type, symbol) \
-    type##proc = (type)wglGetProcAddress(symbol);
-#endif
-
-#define RESOLVE_RET(type, symbol, retval) \
-  if (type##proc == NULL) { \
-  __glXErrorCallBack(0); \
-  return retval; \
-      }
-
-#define RESOLVE(procname, symbol) RESOLVE_RET(procname, symbol,)
-
-#define RESOLVED_PROC(type) type##proc
-
-/*
- * Include generated cdecl wrappers for stdcall WGL functions
- *
- * There are extensions to the wgl*() API as well; again we call
- * these functions by using wglGetProcAddress() to get a pointer
- * to the function, and wrapping it for cdecl/stdcall conversion
- *
- * We arrange to resolve the functions up front, as they need a
- * context to work, as we like to use them to be able to select
- * a context.  Again, this assumption fails badly on multimontor
- * systems...
- */
-
-#include "generated_wgl_wrappers.c"
+/*

+ * File: wgl_ext_api.c

+ * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions

+ *

+ * Authors: Jon TURNEY

+ *

+ * Copyright (c) Jon TURNEY 2009

+ *

+ *

+ * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+

+#include <X11/Xwindows.h>

+#include <GL/gl.h>

+#include <GL/glext.h>

+#include <glx/glxserver.h>

+#include <glx/glxext.h>

+#include "wglext.h"

+#include <wgl_ext_api.h>

+#include "glwindows.h"

+

+#define RESOLVE_DECL(type) \

+    static type type##proc = NULL;

+

+#ifdef _DEBUG

+#define PRERESOLVE(type, symbol) \

+    type##proc = (type)wglGetProcAddress(symbol); \

+    if (type##proc == NULL) \

+        ErrorF("wglwrap: Can't resolve \"%s\"\n", symbol); \

+    else \

+        ErrorF("wglwrap: Resolved \"%s\"\n", symbol);

+#else

+#define PRERESOLVE(type, symbol) \

+    type##proc = (type)wglGetProcAddress(symbol);

+#endif

+

+#define RESOLVE_RET(type, symbol, retval) \

+  if (type##proc == NULL) { \

+  __glXErrorCallBack(0); \

+  return retval; \

+      }

+

+#define RESOLVE(procname, symbol) RESOLVE_RET(procname, symbol,)

+

+#define RESOLVED_PROC(type) type##proc

+

+/*

+ * Include generated cdecl wrappers for stdcall WGL functions

+ *

+ * There are extensions to the wgl*() API as well; again we call

+ * these functions by using wglGetProcAddress() to get a pointer

+ * to the function, and wrapping it for cdecl/stdcall conversion

+ *

+ * We arrange to resolve the functions up front, as they need a

+ * context to work, as we like to use them to be able to select

+ * a context.  Again, this assumption fails badly on multimontor

+ * systems...

+ */

+

+#include "generated_wgl_wrappers.c"

diff --git a/xorg-server/hw/xwin/glx/wgl_ext_api.h b/xorg-server/hw/xwin/glx/wgl_ext_api.h
index 3c46d1d30..0edc6e6ed 100644
--- a/xorg-server/hw/xwin/glx/wgl_ext_api.h
+++ b/xorg-server/hw/xwin/glx/wgl_ext_api.h
@@ -1,87 +1,87 @@
-/*
- * File: wgl_ext_api.h
- * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
- *
- * Authors: Jon TURNEY
- *
- * Copyright (c) Jon TURNEY 2009
- *
- *
- * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
- */
-
-#ifndef wgl_ext_api_h
-#define wgl_ext_api_h
-
-#include "wglext.h"
-
-void wglResolveExtensionProcs(void);
-
-/*
-  Prototypes for wrapper functions we actually use
-  XXX: should be automatically generated as well
-*/
-
-const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc);
-BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID);
-
-BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc,
-                                          int iPixelFormat,
-                                          int iLayerPlane,
-                                          UINT nAttributes,
-                                          const int *piAttributes,
-                                          int *piValues);
-
-BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
-                                          int iPixelFormat,
-                                          int iLayerPlane,
-                                          UINT nAttributes,
-                                          const int *piAttributes,
-                                          FLOAT *pfValues);
-
-BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc,
-                                     const int *piAttribIList,
-                                     const FLOAT *pfAttribFList,
-                                     UINT nMaxFormats,
-                                     int *piFormats,
-                                     UINT *nNumFormats);
-
-HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC,
-                                       int iPixelFormat,
-                                       int iWidth,
-                                       int iHeight,
-                                       const int *piAttribList);
-
-HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
-
-int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer,
-                                  HDC hDC);
-
-BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
-
-BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
-                                int iAttribute,
-                                int *piValue);
-
-BOOL __stdcall wglSwapIntervalEXTWrapper(int interval);
-
-int __stdcall wglGetSwapIntervalEXTWrapper(void);
-
-#endif /* wgl_ext_api_h */
+/*

+ * File: wgl_ext_api.h

+ * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions

+ *

+ * Authors: Jon TURNEY

+ *

+ * Copyright (c) Jon TURNEY 2009

+ *

+ *

+ * 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 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.

+ */

+

+#ifndef wgl_ext_api_h

+#define wgl_ext_api_h

+

+#include "wglext.h"

+

+void wglResolveExtensionProcs(void);

+

+/*

+  Prototypes for wrapper functions we actually use

+  XXX: should be automatically generated as well

+*/

+

+const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc);

+BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);

+HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID);

+

+BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc,

+                                          int iPixelFormat,

+                                          int iLayerPlane,

+                                          UINT nAttributes,

+                                          const int *piAttributes,

+                                          int *piValues);

+

+BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc,

+                                          int iPixelFormat,

+                                          int iLayerPlane,

+                                          UINT nAttributes,

+                                          const int *piAttributes,

+                                          FLOAT *pfValues);

+

+BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc,

+                                     const int *piAttribIList,

+                                     const FLOAT *pfAttribFList,

+                                     UINT nMaxFormats,

+                                     int *piFormats,

+                                     UINT *nNumFormats);

+

+HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC,

+                                       int iPixelFormat,

+                                       int iWidth,

+                                       int iHeight,

+                                       const int *piAttribList);

+

+HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);

+

+int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer,

+                                  HDC hDC);

+

+BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);

+

+BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,

+                                int iAttribute,

+                                int *piValue);

+

+BOOL __stdcall wglSwapIntervalEXTWrapper(int interval);

+

+int __stdcall wglGetSwapIntervalEXTWrapper(void);

+

+#endif /* wgl_ext_api_h */

diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt
index 7ba257b43..709d08a08 100644
--- a/xorg-server/xkeyboard-config/symbols/lt
+++ b/xorg-server/xkeyboard-config/symbols/lt
@@ -162,9 +162,9 @@ xkb_symbols "ibm" {
 };

 

 // LEKP and LEKPa layouts 1.0

-// Copyright (C) 2007 Tautrimas Pajarskas

 // For more info visit http://lekp.info

-// Made by Ernestas Lukoševičius

+// Created by Tautrimas Pajarskas, 2007

+// Made by Ernestas Lukoševičius, 2007

 // Minor cleanup by Rimas Kudelis, 2010

 

 partial alphanumeric_keys modifier_keys