7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 09 May 2011 14:58:28 -0700
changeset 1124 7bc7e624f965
parent 1123 4678f8c1d429
child 1125 0776474068be
7042476 Xorg 1.10 & associated module updates [PSARC/2011/214] PSARC/2011/213 X Synchronization Extension version 3.1 PSARC/2011/214 Xorg server 1.10
buildit
exception_lists/packaging
open-src/app/editres/Makefile
open-src/app/viewres/Makefile
open-src/app/xcmsdb/Makefile
open-src/app/xconsole/Makefile
open-src/app/xhost/Makefile
open-src/app/xlswins/Makefile
open-src/common/Makefile.inc
open-src/driver/efb/Makefile
open-src/driver/efb/no-modes.patch
open-src/driver/efb/sparc-efb.patch
open-src/driver/xf86-input-acecad/Makefile
open-src/driver/xf86-input-hotkey/sun-src/hotkey.c
open-src/driver/xf86-input-keyboard/7005752.patch
open-src/driver/xf86-input-keyboard/Makefile
open-src/driver/xf86-input-mouse/6892799.patch
open-src/driver/xf86-input-mouse/Fix-OSMouse.patch
open-src/driver/xf86-input-mouse/Makefile
open-src/driver/xf86-input-synaptics/COPYING
open-src/driver/xf86-input-synaptics/Makefile
open-src/driver/xf86-input-vmmouse/Makefile
open-src/driver/xf86-input-void/Makefile
open-src/driver/xf86-video-intel/Makefile
open-src/driver/xf86-video-intel/build-with-Xorg1.10.patch
open-src/driver/xf86-video-mach64/6205248.patch
open-src/driver/xf86-video-mach64/Makefile
open-src/lib/libXaw4/Makefile
open-src/lib/libXaw5/Makefile
open-src/lib/libXext/Makefile
open-src/lib/libXext/install-xml-specs.patch
open-src/lib/libdrm/Makefile
open-src/lib/libdrm/atomic.patch
open-src/lib/libdrm/solaris-drm-port.patch
open-src/lib/libpciaccess/Makefile
open-src/lib/libpthread-stubs/Makefile
open-src/lib/mesa/Makefile
open-src/lib/mesa/glsl.patch
open-src/lib/mesa/install-pc-dir.patch
open-src/lib/mesa/solaris-port.patch
open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs
open-src/lib/pixman/COPYING
open-src/lib/pixman/Makefile
open-src/proto/xextproto/Makefile
open-src/xserver/Makefile.inc
open-src/xserver/xorg/6535006.patch
open-src/xserver/xorg/6721634.patch
open-src/xserver/xorg/6906694.patch
open-src/xserver/xorg/6912996.patch
open-src/xserver/xorg/COPYING
open-src/xserver/xorg/IA.patch
open-src/xserver/xorg/Makefile
open-src/xserver/xorg/amd64-loader-path.patch
open-src/xserver/xorg/autoconfig.patch
open-src/xserver/xorg/autoconfig2.patch
open-src/xserver/xorg/autodetect-kernel-dev-fb.patch
open-src/xserver/xorg/cli-nobanner.patch
open-src/xserver/xorg/cli-nolock.patch
open-src/xserver/xorg/dixmods-deps.patch
open-src/xserver/xorg/dtlogin-userinfo.patch
open-src/xserver/xorg/fontmod.patch
open-src/xserver/xorg/glx-impure.patch
open-src/xserver/xorg/headers_64bit.patch
open-src/xserver/xorg/hotkey.patch
open-src/xserver/xorg/make_xkm_output_dir.patch
open-src/xserver/xorg/nvidia-autoconfig.patch
open-src/xserver/xorg/patch-list
open-src/xserver/xorg/record-regset.patch
open-src/xserver/xorg/signal-handler.patch
open-src/xserver/xorg/sparc-initvisuals.patch
open-src/xserver/xorg/sparc-nopciprobe.patch
open-src/xserver/xorg/sparc-probe.patch
open-src/xserver/xorg/sun-extramodes.patch
open-src/xserver/xorg/sun-manpage.patch
open-src/xserver/xorg/sun-paths.patch
open-src/xserver/xorg/upstream-in-1.9-branch.patch
open-src/xserver/xorg/vt.patch
open-src/xserver/xorg/xtsol.patch
open-src/xserver/xvnc/Makefile
open-src/xserver/xvnc/applet-build.patch
open-src/xserver/xvnc/applet-html.patch
open-src/xserver/xvnc/icon.patch
open-src/xserver/xvnc/miext-sync.patch
open-src/xserver/xvnc/no-nasm.patch
open-src/xserver/xvnc/port-to-1.9.patch
open-src/xserver/xvnc/solaris-libraries.patch
open-src/xserver/xvnc/solaris-port.patch
open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile
open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/vncviewer/tigervnc_16.gif
open-src/xserver/xvnc/tigervnc-xserver18.patch
open-src/xserver/xvnc/tigervnc_16.gif
open-src/xserver/xvnc/upstream-input-refactor.patch
open-src/xserver/xvnc/upstream-modkeystick.patch
open-src/xserver/xvnc/upstream-port-to-1.7.patch
open-src/xserver/xvnc/upstream-port-to-1.8.patch
open-src/xserver/xvnc/upstream-xkbconvertcase.patch
open-src/xserver/xvnc/upstream-xorg-1.8-closeinput.patch
open-src/xserver/xvnc/upstream-xorg-version.patch
open-src/xserver/xvnc/vnc-nohttpd.patch
pkg/manifests/developer-opensolaris-X.p5m
pkg/manifests/x11-header-x11-protocols.p5m
pkg/manifests/x11-library-libxext.p5m
pkg/manifests/x11-library-mesa.p5m
pkg/manifests/x11-server-xorg-driver-xorg-video.p5m
pkg/manifests/x11-server-xorg.p5m
--- a/buildit	Mon May 09 10:12:33 2011 -0700
+++ b/buildit	Mon May 09 14:58:28 2011 -0700
@@ -5,7 +5,7 @@
 #
 ###########################################################################
 #
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,9 +31,10 @@
 #
 
 # Add /usr/bin to front of path in case user has /usr/gnu/bin default
+# Add /usr/gnu/bin to path for gnu sed/awk/etc. that configure scripts prefer
 # Add /usr/sbin to path for dtrace (to build probes in X servers)
 
-PATH=/usr/bin:${PATH}:/usr/sbin
+PATH=/usr/bin:${PATH}:/usr/gnu/bin:/usr/sbin
 export PATH
 
 progname="$0"
--- a/exception_lists/packaging	Mon May 09 10:12:33 2011 -0700
+++ b/exception_lists/packaging	Mon May 09 14:58:28 2011 -0700
@@ -30,6 +30,12 @@
 # but not included in any packages - this is intentional.
 #
 
+# These should be empty directories left from the libdrm workaround for
+# pkgconfig installation
+usr/lib/xorg/pkgconfig
+usr/lib/xorg/amd64/pkgconfig		i386
+usr/lib/xorg/sparcv9/pkgconfig		sparc
+
 # /var/run is a symlink to a tmpfs filesystem created at system boot
 var/run
 
@@ -44,9 +50,6 @@
 usr/share/doc/X11/MAINTAINERS
 usr/share/doc/libXi/doc
 
-# Extra unused copy currently delivered by xorg-server, should go away in 1.10
-usr/share/doc/X11/xorg.css
-
 # Obsolete man pages
 usr/share/man/man5/Consortium.5
 usr/share/man/man5/XProjectTeam.5
--- a/open-src/app/editres/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/editres/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -46,6 +46,10 @@
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = editres
 
--- a/open-src/app/viewres/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/viewres/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -46,6 +46,10 @@
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = viewres
 
--- a/open-src/app/xcmsdb/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/xcmsdb/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -46,6 +46,10 @@
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = xcmsdb
 
--- a/open-src/app/xconsole/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/xconsole/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -50,6 +50,10 @@
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = xconsole
 
--- a/open-src/app/xhost/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/xhost/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -45,7 +45,6 @@
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=*.man
 MODULE_STABILITY=Committed
-MODULE_SUNTOUCH_MAN_FLAGS=-r '{__distroname__, $(DISTRO_NAME)}'
 
 # ARC cases that covered this module
 # PSARC/2001/108 X11 Over IPv6
--- a/open-src/app/xlswins/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/app/xlswins/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# xlswins 1.x Makefile
+# xlswins Makefile
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -45,6 +45,10 @@
 SUNTOUCHED_MANPAGES= # None
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # No configure script, so pass usual environment to build/install instead
 CONFIGURE_TARGETS=
 CONFIGURE_TARGETS_SET=yes
--- a/open-src/common/Makefile.inc	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/common/Makefile.inc	Mon May 09 14:58:28 2011 -0700
@@ -340,7 +340,7 @@
 			SOURCE_DIR="$(GIT_CLONE_DIR)" patched_source ; \
 		printf '%s\n\n' "$${p%.patch}" > git.comments ; \
 	    	gawk '/^--- /		{exit} \
-		      /^diff -u/	{exit} \
+		      /^diff -/		{exit} \
 		      {print}' $$p >> git.comments ; \
 		(cd $(GIT_CLONE_DIR) ; $(START_CMD_ECHO) ; \
 		 git commit -a --file=$(PWD)/git.comments ) ; \
@@ -426,9 +426,9 @@
 FIXED_MAN_TARGET=$(SUNTOUCHED_MANPAGES:%=$(SOURCE_DIR)/%.$(FIXED_MAN_SUFFIX))
 fixed_man: $(FIXED_MAN_TARGET)
 
-COMMON_SUNTOUCH_MAN_FLAGS = \
-	-a '{Availability, $(MODULE_PKGNAME)}' \
-	-a '{Interface Stability, $(MODULE_STABILITY)}'
+COMMON_SUNTOUCH_MAN_FLAGS  = -a '{Availability, $(MODULE_PKGNAME)}'
+COMMON_SUNTOUCH_MAN_FLAGS += -a '{Interface Stability, $(MODULE_STABILITY)}' 
+COMMON_SUNTOUCH_MAN_FLAGS += -r '{__distroname__, $(DISTRO_NAME)}'
 
 DEFAULT_SUNTOUCH_MAN_FLAGS = \
 	$(COMMON_SUNTOUCH_MAN_FLAGS) \
@@ -561,19 +561,14 @@
 # Dependencies for make build step
 BUILD_DEPS = $(SOURCE_TARGETS) $(CONFIGURE_TARGETS) $(MODTYPE_BUILD_DEPS) $(MODULE_BUILD_DEPS) $(MODULE_MAKE)
 
-default_build: $(BUILD_DEPS)
-	(cd $(SOURCE_DIR) ; \
-	 $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
+DEFAULT_BUILD_COMMAND = cd @DIR@ ; \
+	$(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS)
 
-print_default_build_flags:
-	@print "BUILD_ENV='$(BUILD_ENV)'" ; \
-	print "MAKE='$(MODULE_MAKE)'" ; \
-	print "MAKEFLAGS='$(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS)'"
+default_build: $(BUILD_DEPS)
+	$(DEFAULT_BUILD_COMMAND:@DIR@=$(SOURCE_DIR))
 
 build-in-subdir:
-	(cd $(subdir) ; \
-	 $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS) \
-	 $(subdir_cmd) )
+	$(DEFAULT_BUILD_COMMAND:@DIR@=$(subdir)) $(subdir_cmd)
 
 DEFAULT_INSTALL_MAKEFLAGS= -e DESTDIR=$(PROTODIR) \
 	pkgconfigdir=$(MODULE_PKGCONFIG_DIR) \
@@ -583,20 +578,15 @@
 # Dependencies for make install step
 INSTALL_DEPS = $(BUILD_TARGETS) $(MODTYPE_INSTALL_DEPS) $(MODULE_INSTALL_DEPS)
 
-default_install: $(INSTALL_DEPS)
-	(cd $(SOURCE_DIR) ; \
-	 $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
-	 install)
+DEFAULT_INSTALL_COMMAND = cd @DIR@ ; \
+	$(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS)
 
-print_default_install_flags:
-	@print "BUILD_ENV='$(BUILD_ENV)'" ; \
-	print "MAKE='$(MODULE_MAKE)'" ; \
-	print "MAKE_FLAGS='$(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS)'"
+default_install: $(INSTALL_DEPS)
+	$(DEFAULT_INSTALL_COMMAND:@DIR@=$(SOURCE_DIR)) install
 
 install-in-subdir:
-	(cd $(subdir) ; \
-	 $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
-	 $(subdir_cmd) $(install_subdir_cmd))
+	$(DEFAULT_INSTALL_COMMAND:@DIR@=$(subdir)) $(subdir_cmd) \
+		$(install_subdir_cmd)
 
 # Adjust paths in pkg-config files for -uninstalled variants used during build
 UNINSTALLED_PC_OPS= \
@@ -736,15 +726,16 @@
 	    rm -rf prev ; \
 	    mv tmp-regen prev ; \
 	    $(MAKE) SOURCE_PATCHES="$${CUR_LIST} $$f" BUILD_DIR=tmp-regen patched_source ; \
+	    find tmp-regen -name '*.orig' -exec rm {} \+ ; \
 	    gawk '/^--- /	{exit} \
-		  /^diff -u/	{exit} \
+		  /^diff -/	{exit} \
 			 	{print}' $$p > new/$$p ; \
-	    LC_COLLATE=C gdiff -Nurp -x '*~' -x '*.orig' ./prev ./tmp-regen \
-		| sed -e 's% \./prev/$(SOURCE_DIRNAME)/% %' -e 's% \./tmp-regen/$(SOURCE_DIRNAME)/% %' \
+	    LC_COLLATE=C git diff --no-color ./prev ./tmp-regen \
+		| sed -e 's% a/\./prev/$(SOURCE_DIRNAME)/% a/%' -e 's% b/\./tmp-regen/$(SOURCE_DIRNAME)/% b/%' \
 		| grep -v '^Common subdirectories:' \
 		| grep -v '^Only in ' \
 		>> new/$$p ; \
-	    CUR_LIST="$${CUR_LIST} new/$$p" ; \
+	    CUR_LIST="$${CUR_LIST} new/$$p,-p1" ; \
 	done
 	rm -rf tmp-regen
 
--- a/open-src/driver/efb/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/efb/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -38,6 +38,7 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
 	RAC-API-removal.patch,-p1 \
+	no-modes.patch,-p1 \
 	sparc-efb.patch,-p1
 
 # Need to regenerate configure after patching Makefile.am in sparc-efb.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/efb/no-modes.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,199 @@
+[Backport to xf86-video-ati 6.8]
+
+From f9d6c0de231357f96e2e0de71e6c9221bcb36bd4 Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <[email protected]>
+Date: Fri, 23 Jul 2010 13:28:42 -0400
+Subject: [PATCH] The local copy of the modes code is no longer required.
+
+The server 1.2 as shipped in the tarball on the web does not contain the
+modes code. It was added just after and found in git branch server-1.2-branch.
+
+The modes code was initially included in version ati 6.8.0 and fails to compile
+with server 1.2 as it requires randr 1.2. The modes code is included in server
+versions 1.3 and later, so there is no need to provide an unknown version of
+the modes code in the ati driver tarball. It will never be used.
+
+This patch makes the ati driver requiring server 1.3 or later.
+Version 6.8.0 configures and builds ok on server 1.3
+Master branch post 6.13.1  configures and builds ok on server 1.3
+
+Signed-off-by: Gaetan Nadon <[email protected]>
+---
+ configure.ac           |   54 +-----------------------------------------------
+ src/Makefile.am        |   24 ---------------------
+ src/local_xf86Rename.h |   23 --------------------
+ 3 files changed, 1 insertions(+), 100 deletions(-)
+ delete mode 100644 src/local_xf86Rename.h
+
+diff --git a/configure.ac b/configure.ac
+index fe4c057..a5140fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,11 +62,6 @@ AC_ARG_ENABLE(exa,
+               [EXA="$enableval"],
+               [EXA=yes])
+ 
+-AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
+-                                          [Path to X server source tree]),
+-                           [ XSERVER_SOURCE="$withval" ],
+-                           [ XSERVER_SOURCE="" ])
+-
+ # Checks for extensions
+ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+@@ -76,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+ # Checks for libraries.
+@@ -117,11 +112,6 @@ if test "$DRI" = yes; then
+ 	fi
+ fi
+ 
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$XORG_CFLAGS"
+-AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
+-CFLAGS="$save_CFLAGS"
+-
+ # Note that this is sort of inverted from drivers/ati/Imakefile in
+ # the monolith.  We test for foo, not for !foo (i.e. ATMISC_CPIO, not
+ # ATIMISC_AVOID_CPIO), but the defines are negative.  So beware.  Oh yeah,
+@@ -232,48 +222,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ 	      [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ 	      [#include "xorg-server.h"])
+ 
+-AM_CONDITIONAL(XMODES, test "x$XMODES" = xno)
+-
+-if test "x$XSERVER_SOURCE" = x; then
+-        if test -d ../../xserver; then
+-                XSERVER_SOURCE="`cd ../../xserver && pwd`"
+-        fi
+-fi
+-
+-if test -d "$XSERVER_SOURCE"; then
+-        case "$XSERVER_SOURCE" in
+-        /*)
+-                ;;
+-        *)
+-                XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
+-        esac
+-        if test -f src/modes/xf86Modes.h; then
+-                :
+-        else
+-                ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes
+-        fi
+-
+-        if test -f src/parser/xf86Parser.h; then
+-                :
+-        else
+-                ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser
+-        fi
+-fi
+-if test "x$XMODES" = xyes; then
+-        AC_MSG_NOTICE([X server has new mode code])
+-        AC_DEFINE(XMODES, 1,[X server has built-in mode code])
+-        XMODES_CFLAGS=
+-else
+-        if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then
+-                AC_MSG_NOTICE([X server is missing new mode code, using local copy])
+-        else
+-                AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source])
+-        fi
+-        XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser'
+-fi
+-
+-AC_SUBST([XMODES_CFLAGS])
+-
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a146df3..052bca6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,23 +47,6 @@ RADEON_ATOMBIOS_SOURCES = \
+         AtomBios/includes/ObjectID.h \
+         AtomBios/includes/regsdef.h
+ 
+-XMODE_SRCS=\
+-        local_xf86Rename.h \
+-	parser/xf86Parser.h \
+-        parser/xf86Optrec.h \
+-        modes/xf86Modes.h \
+-        modes/xf86Modes.c \
+-        modes/xf86cvt.c \
+-        modes/xf86Crtc.h \
+-        modes/xf86Crtc.c \
+-        modes/xf86Cursors.c \
+-        modes/xf86EdidModes.c \
+-        modes/xf86RandR12.c \
+-        modes/xf86RandR12.h \
+-        modes/xf86Rename.h \
+-        modes/xf86Rotate.c \
+-        modes/xf86DiDGA.c
+-
+ if ATIMISC_CPIO
+ ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c
+ endif
+@@ -77,7 +60,7 @@ ATIMISC_EXA_SOURCES = atimach64exa.c
+ RADEON_EXA_SOURCES = radeon_exa.c
+ endif
+ 
+-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
+ INCLUDES = -I$(srcdir)/AtomBios/includes
+ 
+ ati_drv_la_LTLIBRARIES = ati_drv.la
+@@ -118,11 +101,6 @@ radeon_drv_la_SOURCES = \
+ 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
+ 	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
+ 
+-if XMODES
+-radeon_drv_la_SOURCES += \
+-	$(XMODE_SRCS)
+-endif
+-
+ theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la
+ theatre_detect_drv_la_LDFLAGS = -module -avoid-version
+ theatre_detect_drv_ladir = @moduledir@/multimedia
+@@ -145,7 +123,6 @@ theatre200_drv_la_SOURCES = \
+ 	theatre200.c theatre200_module.c
+ 
+ EXTRA_DIST = \
+-	$(XMODE_SRCS) \
+ 	atimach64render.c \
+ 	radeon_render.c \
+ 	radeon_accelfuncs.c \
+diff --git a/src/local_xf86Rename.h b/./prev/xf86-video-ati-6.8.0/src/local_xf86Rename.h
+deleted file mode 100644
+index 5102170..0000000
+--- a/src/local_xf86Rename.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Copyright © 2006 Keith Packard
+- *
+- * Permission to use, copy, modify, distribute, and sell this software and its
+- * documentation for any purpose is hereby granted without fee, provided that
+- * the above copyright notice appear in all copies and that both that copyright
+- * notice and this permission notice appear in supporting documentation, and
+- * that the name of the copyright holders not be used in advertising or
+- * publicity pertaining to distribution of the software without specific,
+- * written prior permission.  The copyright holders make no representations
+- * about the suitability of this software for any purpose.  It is provided "as
+- * is" without express or implied warranty.
+- *
+- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+- * OF THIS SOFTWARE.
+- */
+-
+-#define XF86NAME(x) radeon_##x
--- a/open-src/driver/efb/sparc-efb.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/efb/sparc-efb.patch	Mon May 09 14:58:28 2011 -0700
@@ -236,7 +236,7 @@
  #define AllocateWorkSpace(x,y)      AllocateMemory(pDeviceData,y)
  #define FreeWorkSpace(x,y)          ReleaseMemory(x,y)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index a146df3..7411677 100644
+index 052bca6..2f147d0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -27,8 +27,6 @@
@@ -248,9 +248,9 @@
  RADEON_DRI_SRCS = radeon_dri.c
  endif
  
-@@ -64,52 +62,17 @@ XMODE_SRCS=\
-         modes/xf86Rotate.c \
-         modes/xf86DiDGA.c
+@@ -47,52 +45,17 @@ RADEON_ATOMBIOS_SOURCES = \
+         AtomBios/includes/ObjectID.h \
+         AtomBios/includes/regsdef.h
  
 -if ATIMISC_CPIO
 -ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c
@@ -265,8 +265,8 @@
  RADEON_EXA_SOURCES = radeon_exa.c
  endif
  
--AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
-+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
+-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER
++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
  INCLUDES = -I$(srcdir)/AtomBios/includes
  
 -ati_drv_la_LTLIBRARIES = ati_drv.la
@@ -306,15 +306,10 @@
  	radeon_accel.c radeon_cursor.c radeon_dga.c \
  	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
  	radeon_vip.c radeon_misc.c radeon_probe.c \
-@@ -119,31 +82,10 @@ radeon_drv_la_SOURCES = \
+@@ -101,27 +64,6 @@ radeon_drv_la_SOURCES = \
+ 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
  	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
  
- if XMODES
--radeon_drv_la_SOURCES += \
-+efb_drv_la_SOURCES += \
- 	$(XMODE_SRCS)
- endif
- 
 -theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la
 -theatre_detect_drv_la_LDFLAGS = -module -avoid-version
 -theatre_detect_drv_ladir = @moduledir@/multimedia
@@ -337,8 +332,8 @@
 -	theatre200.c theatre200_module.c
 -
  EXTRA_DIST = \
- 	$(XMODE_SRCS) \
  	atimach64render.c \
+ 	radeon_render.c \
 diff --git a/src/ati.c b/src/ati.c
 index b3f07ca..084b27f 100644
 --- a/src/ati.c
--- a/open-src/driver/xf86-input-acecad/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-acecad/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-acecad 1.x Makefile
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,11 @@
 MODULE_NAME=xf86-input-acecad
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.0
+MODULE_VERSION=1.5.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 51247dc0d73185e35bec326283bc49a5
-TARBALL_SHA1 = 4182aa30d4209ec60fd423a3e24e4951e16c0a4b
+TARBALL_MD5  = a03721cae66c475e5f6513fa51142869
+TARBALL_SHA1 = 410cee68e4435dc95774fb389fcefae1b2ffe3d1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
--- a/open-src/driver/xf86-input-hotkey/sun-src/hotkey.c	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-hotkey/sun-src/hotkey.c	Mon May 09 14:58:28 2011 -0700
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,8 @@
 
 
 #include "config.h"
+#include <xorg-server.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Xinput.h"
@@ -34,7 +36,7 @@
 #include <libsysevent.h>
 #include <xkbsrv.h>
 
-static InputInfoPtr HkeyPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
+static int HkeyPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
 static void HkeyUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
 
 _X_EXPORT InputDriverRec HKEY = {
@@ -289,25 +291,17 @@
     return (Success);
 }
 
-static InputInfoPtr
-HkeyPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
+static int
+HkeyPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
 {
-    InputInfoPtr 	pInfo;
-
-    if (!(pInfo = xf86AllocateInput(drv, 0)))
-	return NULL;
-
     /* Initialize the InputInfoRec. */
-    pInfo->name = xstrdup (dev->identifier);
     pInfo->type_name = XI_KEYBOARD;
     pInfo->device_control = HkeyProc;
     pInfo->read_input = hotkey_read_input;
     pInfo->fd = -1;
-    pInfo->conf_idev = dev;
-    pInfo->flags = XI86_OPEN_ON_INIT | XI86_ALWAYS_CORE;
-    pInfo->flags |= XI86_CONFIGURED;
+    pInfo->flags = XI86_ALWAYS_CORE;
 
-    return pInfo;
+    return Success;
 }
 
 static void
--- a/open-src/driver/xf86-input-keyboard/7005752.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# 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.
-
-diff -urp -x '*~' -x '*.orig' src/sun_kbdMap.c src/sun_kbdMap.c
---- src/sun_kbdMap.c	2010-08-14 00:59:20.000000000 -0700
-+++ src/sun_kbdMap.c	2010-12-14 18:27:31.709516099 -0800
-@@ -37,10 +37,6 @@
- 
- /* Map the Solaris keycodes to the "XFree86" keycodes. */
- 
--/* Additional Sun Japanese Keyboard Keys not defined in atKeynames.h */
--#define KEY_Kanji	0x82
--#define KEY_Execute	0x83
--
- /*
-  * Additional Korean 106 Keyboard Keys not defined in atKeynames.h
-  * These are exactly same USB usage id with Kana(0x90) and Eisu(0x91) keys
-@@ -479,10 +475,10 @@ static unsigned char usbmap[256] = {
- 	/* 133 */ KEY_NOTUSED,
- 	/* 134 */ KEY_NOTUSED,
- 	/* 135 */ KEY_BSlash2,	/* Sun Japanese Kbd: Backslash / Underscore */
--	/* 136 */ KEY_XFER,	/* Sun Japanese Kbd: Henkan Mode */
-+	/* 136 */ KEY_HKTG,	/* Sun Japanese type7 Kbd: Hirugana/Katakana */
- 	/* 137 */ KEY_Yen,	/* Sun Japanese Kbd: Yen / Brokenbar */
--	/* 138 */ KEY_Kanji,	/* Sun Japanese Kbd: Kanji */
--	/* 139 */ KEY_Execute,	/* Sun Japanese Kbd: Execute */
-+	/* 138 */ KEY_XFER,	/* Sun Japanese Kbd: Kanji Transfer */
-+	/* 139 */ KEY_NFER,	/* Sun Japanese Kbd: No Kanji Transfer */
- 	/* 140 */ KEY_NOTUSED,
- 	/* 141 */ KEY_NOTUSED,
- 	/* 142 */ KEY_NOTUSED,
-@@ -604,8 +600,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
-      * Add Sun keyboard keysyms to default map
-      */
- #define map_for_key(k,c) 	map[(k * GLYPHS_PER_KEY) + c]   
--    map_for_key(KEY_Kanji,	0) = XK_Kanji;
--    map_for_key(KEY_Execute,	0) = XK_Execute;
-     map_for_key(KEY_Power,	0) = SunXK_PowerSwitch;
-     map_for_key(KEY_Power,	1) = SunXK_PowerSwitchShift;
-     map_for_key(KEY_Mute,	0) = SunXK_AudioMute;
--- a/open-src/driver/xf86-input-keyboard/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-keyboard/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -29,15 +29,14 @@
 MODULE_NAME=xf86-input-keyboard
 
 # Version number (used in path names)
-MODULE_VERSION=1.5.0
+MODULE_VERSION=1.6.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = b74d7162db5ce7899c17927c6cfa9522
-TARBALL_SHA1 = 206e0c8b9ac68d6aa44521f8437b6626a75fe963
+TARBALL_MD5  = e2abe9f13e526a73cb68a7d257546eba
+TARBALL_SHA1 = 8e845086749f8c4b64fdfa852b4b26cf7bb62dc9
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = \
-	7005752.patch
+SOURCE_PATCHES = 
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-mouse/6892799.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-mouse/6892799.patch	Mon May 09 14:58:28 2011 -0700
@@ -19,10 +19,11 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-diff -Nurp -x '*~' -x '*.orig' src/mouse.c src/mouse.c
---- src/mouse.c	2010-08-14 01:04:54.000000000 -0700
-+++ src/mouse.c	2010-09-09 11:31:51.072960718 -0700
-@@ -1637,13 +1637,14 @@ MouseProc(DeviceIntPtr device, int what)
+diff --git a/src/mouse.c b/src/mouse.c
+index c3498ea..ba9bfef 100644
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -1612,13 +1612,14 @@ MouseProc(DeviceIntPtr device, int what)
  	ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
  		pInfo->name);
  #endif
@@ -41,7 +42,7 @@
  	    if (pMse->xisbscale)
  		pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
  	    else
-@@ -1699,8 +1700,6 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1674,8 +1675,6 @@ MouseProc(DeviceIntPtr device, int what)
  		XisbFree(pMse->buffer);
  		pMse->buffer = NULL;
  	    }
@@ -50,7 +51,7 @@
  	    if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
  	    {
  		RemoveBlockAndWakeupHandlers (MouseBlockHandler,
-@@ -1711,6 +1710,10 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1686,6 +1685,10 @@ MouseProc(DeviceIntPtr device, int what)
  	device->public.on = FALSE;
  	break;
      case DEVICE_CLOSE:
@@ -58,6 +59,6 @@
 +	    xf86CloseSerial(pInfo->fd);
 +	    pInfo->fd = -1;
 +	}
- 	xfree(pMse->mousePriv);
+ 	free(pMse->mousePriv);
  	pMse->mousePriv = NULL;
  	break;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-input-mouse/Fix-OSMouse.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,30 @@
+From d6e9623875de5714e85f7da5782ea665116f86dc Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <[email protected]>
+Date: Wed, 30 Mar 2011 01:00:47 +0200
+Subject: [PATCH:xf86-input-mouse] Fix OSMouse OS-defined protocol support
+
+Fix regression introduced by 0a088df6: in the case of an OS-specific
+protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core
+mouse drive just needs to let the OS driver handle it.
+
+Signed-off-by: Samuel Thibault <[email protected]>
+---
+ src/mouse.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/mouse.c b/src/mouse.c
+index edb998f..c3498ea 100644
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+         MouseFindDevice(pInfo, protocol);
+ 
+     xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
++    if (protocolID == PROT_UNKNOWN)
++        goto out;
+     if (!(pProto = GetProtocol(protocolID)))
+     {
+ 	rc = BadValue;
+-- 
+1.7.3.2
+
--- a/open-src/driver/xf86-input-mouse/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-mouse/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-mouse 1.x Makefile
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,15 +29,16 @@
 MODULE_NAME=xf86-input-mouse
 
 # Version number (used in path names)
-MODULE_VERSION=1.6.0
+MODULE_VERSION=1.7.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = cef849b1a2743d2e84de98422f372974
-TARBALL_SHA1 = df3f2fe711db195fc58dbffef5f2cd8964d9b9df
+TARBALL_MD5  = 7f31472689c15b6de62eff04d0fb57d7
+TARBALL_SHA1 = 8b99054e5e4feafd7e08c87b936e64386b74ae8f
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	6892799.patch
+	Fix-OSMouse.patch,-p1 \
+	6892799.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-input-synaptics/COPYING	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,324 @@
+src/psmcomm.c:
+
+ Copyright © 1997 C. Scott Ananian
+ Copyright © 1998-2000 Bruce Kalk
+ Copyright © 2001 Stefan Gmeiner
+ Copyright © 2002 Linuxcare Inc. David Kennedy
+ Copyright © 2003 Fred Hucht
+ Copyright © 2004 Arne Schwabe
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Stefan Gmeiner ([email protected])
+      C. Scott Ananian ([email protected])
+      Bruce Kalk ([email protected])
+      Linuxcare Inc. David Kennedy ([email protected])
+      Fred Hucht ([email protected])
+      Arne Schwabe <[email protected]>
+
+--------------------------------------------------------------------
+
+tools/synclient.c:
+
+ Copyright © 2002-2005,2007 Peter Osterlund
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Peter Osterlund ([email protected])
+
+--------------------------------------------------------------------
+
+src/alpscomm.c:
+
+ Copyright © 2001 Stefan Gmeiner
+ Copyright © 2003 Neil Brown
+ Copyright © 2003-2005,2007 Peter Osterlund
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Stefan Gmeiner ([email protected])
+      Neil Brown ([email protected])
+      Peter Osterlund ([email protected])
+
+--------------------------------------------------------------------
+
+src/ps2comm.c:
+
+ Copyright © 1997 C. Scott Ananian
+ Copyright © 1998-2000 Bruce Kalk
+ Copyright © 2001 Stefan Gmeiner
+ Copyright © 2002 Linuxcare Inc. David Kennedy
+ Copyright © 2003 Fred Hucht <[email protected]>
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Stefan Gmeiner ([email protected])
+      C. Scott Ananian ([email protected])
+      Bruce Kalk ([email protected])
+      Linuxcare Inc. David Kennedy ([email protected])
+      Fred Hucht ([email protected])
+
+--------------------------------------------------------------------
+
+include/synaptics-properties.h, src/properties.c:
+
+ Copyright © 2008 Red Hat, Inc.
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors: Peter Hutterer
+
+--------------------------------------------------------------------
+
+src/eventcomm.c:
+
+ Copyright © 2004-2007 Peter Osterlund
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Peter Osterlund ([email protected])
+
+--------------------------------------------------------------------
+
+src/alpscomm.h, src/eventcomm.h, src/synproto.h:
+
+ Copyright © 2004 Peter Osterlund
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Peter Osterlund ([email protected])
+
+--------------------------------------------------------------------
+
+include/synaptics.h, src/ps2comm.h, src/synapticsstr.h:
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+tools/syndaemon.c:
+
+ Copyright © 2003-2004 Peter Osterlund
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Peter Osterlund ([email protected])
+
+--------------------------------------------------------------------
+
+src/synaptics.c:
+
+ Copyright © 1999 Henry Davies
+ Copyright © 2001 Stefan Gmeiner
+ Copyright © 2002 S. Lehner
+ Copyright © 2002 Peter Osterlund
+ Copyright © 2002 Linuxcare Inc. David Kennedy
+ Copyright © 2003 Hartwig Felger
+ Copyright © 2003 Jörg Bösner
+ Copyright © 2003 Fred Hucht
+ Copyright © 2004 Alexei Gilchrist
+ Copyright © 2004 Matthias Ihmig
+ Copyright © 2006 Stefan Bethge
+ Copyright © 2006 Christian Thaeter
+ Copyright © 2007 Joseph P. Skudlarek
+ Copyright © 2008 Fedor P. Goncharov
+ Copyright © 2008-2009 Red Hat, Inc.
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Red Hat
+ not be used in advertising or publicity pertaining to distribution
+ of the software without specific, written prior permission.  Red
+ Hat makes no representations about the suitability of this software
+ for any purpose.  It is provided "as is" without express or implied
+ warranty.
+
+ THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Authors:
+      Joseph P. Skudlarek <[email protected]>
+      Christian Thaeter <[email protected]>
+      Stefan Bethge <[email protected]>
+      Matthias Ihmig <[email protected]>
+      Alexei Gilchrist <[email protected]>
+      Jörg Bösner <[email protected]>
+      Hartwig Felger <[email protected]>
+      Peter Osterlund <[email protected]>
+      S. Lehner <[email protected]>
+      Stefan Gmeiner <[email protected]>
+      Henry Davies <[email protected]> for the
+      Linuxcare Inc. David Kennedy <[email protected]>
+      Fred Hucht <[email protected]>
+      Fedor P. Goncharov <[email protected]>
+      Simon Thum <[email protected]>
+
+ Trademarks are the property of their respective owners.
+
--- a/open-src/driver/xf86-input-synaptics/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-synaptics/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -29,11 +29,11 @@
 MODULE_NAME=xf86-input-synaptics
 
 # Version number (used in path names)
-MODULE_VERSION=1.3.0
+MODULE_VERSION=1.4.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = b4e58eba1bdca13f0929a4b03b262135
-TARBALL_SHA1 = 132fff19a3a1768e7ab403f44ebc28e0480a4120
+TARBALL_MD5  = cbe487f9d22237d1e39c7d0b5812ab7e
+TARBALL_SHA1 = 96541b063482568e177f883a9fcfbe9a22c25569
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-vmmouse/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -29,11 +29,11 @@
 MODULE_NAME=xf86-input-vmmouse
 
 # Version number (used in path names)
-MODULE_VERSION=12.6.10
+MODULE_VERSION=12.7.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 49c6e77851e9f7bc5cb7d85f061992f8
-TARBALL_SHA1 = 4c510d3f3ceaeb3bf826d440a406fe53fd85902c
+TARBALL_MD5  = dc77181330f983c7d0ec1ea1592c2ca7
+TARBALL_SHA1 = 6618f84a037c8f4817e1a2822d6a5a795814e544
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
--- a/open-src/driver/xf86-input-void/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-input-void/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-void 1.x Makefile
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,11 @@
 MODULE_NAME=xf86-input-void
 
 # Version number (used in path names)
-MODULE_VERSION=1.3.1
+MODULE_VERSION=1.4.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 3056bc7c57db8c5d56039648c0530c45
-TARBALL_SHA1 = f0009bd77d205c5e5a9791d8f498780b44e931ae
+TARBALL_MD5  = 93821f21e807260b05431c62437a8b32
+TARBALL_SHA1 = 49b462d3acb16337eaf78202d4074f19d5e20b29
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
--- a/open-src/driver/xf86-video-intel/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -41,7 +41,8 @@
 	xserver-1.9-abi.patch \
 	build-dri.patch \
 	libraries.patch \
-	pad.patch sandybridge.patch
+	pad.patch sandybridge.patch \
+	build-with-Xorg1.10.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/build-with-Xorg1.10.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,10 @@
+--- src/i830_driver.c	Tue May  3 12:06:28 2011
++++ src/i830_driver.c	Tue May  3 12:06:38 2011
+@@ -465,7 +465,6 @@
+ 		/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
+ 		 * so update the value it uses
+ 		 */
+-		scrn->pixmapPrivate.ptr = NULL;
+ 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+ 			   "New front buffer at 0x%lx\n",
+ 			   intel->front_buffer->offset);
--- a/open-src/driver/xf86-video-mach64/6205248.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-video-mach64/6205248.patch	Mon May 09 14:58:28 2011 -0700
@@ -23,10 +23,11 @@
 Change needed to resume from S3 suspend on Rage XL chipset in Ultra 20.
 https://bugs.freedesktop.org/show_bug.cgi?id=6829
 
-diff -urp -x '*~' -x '*.orig' src/aticonsole.c src/aticonsole.c
---- src/aticonsole.c	2008-03-25 23:09:43.000000000 -0700
-+++ src/aticonsole.c	2009-01-12 18:24:36.680149000 -0800
-@@ -514,6 +514,16 @@ ATIEnterGraphics
+diff --git a/src/aticonsole.c b/src/aticonsole.c
+index 50cc6e1..947a122 100644
+--- a/src/aticonsole.c
++++ b/src/aticonsole.c
+@@ -515,6 +515,16 @@ ATIEnterGraphics
      ATIPtr      pATI
  )
  {
--- a/open-src/driver/xf86-video-mach64/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/driver/xf86-video-mach64/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -29,14 +29,14 @@
 MODULE_NAME=xf86-video-mach64
 
 # Version number (used in path names)
-MODULE_VERSION=6.8.2
+MODULE_VERSION=6.9.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 6c0522b2b72a0a47c48d718443616651
-TARBALL_SHA1 = b7303689a6a971b956061fd81399dc81adb865af
+TARBALL_MD5  = ae62936e11af4fc0fac9f2db601a844f
+TARBALL_SHA1 = 95a7ec9761fe11dadbcd9078c55148198a91b2f1
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6205248.patch  
+SOURCE_PATCHES = 6205248.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 #SUNTOUCHED_MANPAGES=man/*.man
@@ -61,4 +61,4 @@
 
 install_docs: $(INSTALL_DEPS)
 	mkdir -p $(PROTODIR)$(X11_DOC_DIR)
-	cp -p $(SOURCE_DIR)/README.ati $(PROTODIR)$(X11_DOC_DIR)/
+	cp -pf $(SOURCE_DIR)/README $(PROTODIR)$(X11_DOC_DIR)/README.ati
--- a/open-src/lib/libXaw4/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libXaw4/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -50,6 +50,10 @@
 SUNTOUCHED_MANPAGES= # None
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # No configure script to run
 CONFIGURE_TARGETS=
 CONFIGURE_TARGETS_SET=yes
--- a/open-src/lib/libXaw5/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libXaw5/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -2,7 +2,7 @@
 #
 # Xaw5 Makefile
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -44,6 +44,10 @@
 SUNTOUCHED_MANPAGES= # None
 MODULE_STABILITY=Committed
 
+# ARC cases that covered this module
+# PSARC/1992/173 - Update MIT-based Clients to X11R5 Level
+MODULE_ARC_CASES = PSARC/1992/173
+
 # No configure script to run
 CONFIGURE_TARGETS=
 CONFIGURE_TARGETS_SET=yes
--- a/open-src/lib/libXext/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libXext/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -29,14 +29,15 @@
 MODULE_NAME=libXext
 
 # Version number (used in path names)
-MODULE_VERSION=1.2.0
+MODULE_VERSION=1.3.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 9bb236ff0193e9fc1c1fb504dd840331
-TARBALL_SHA1 = 090d7109c5fffde8a0063e10f22f3e2ec48cf19e
+TARBALL_MD5  = 161d200b690ace818db1cc7537e70ba9
+TARBALL_SHA1 = 0bf3708177b9320091ebc069e905c042c31d859d
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
+	install-xml-specs.patch,-p1 \
 	shm.patch \
 	sun-exts.patch
 
@@ -54,6 +55,8 @@
 MODULE_ARC_CASES += PSARC/2008/194
 # PSARC/2009/293 X Generic Event Extension (XGE), Version 1.0
 MODULE_ARC_CASES += PSARC/2009/293
+# PSARC/2011/213 X Synchronization Extension version 3.1
+MODULE_ARC_CASES += PSARC/2011/213
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXext/install-xml-specs.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,53 @@
+From 8451664d228852f7b57eb11a35be3328b6fff13a Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 6 May 2011 18:45:55 -0700
+Subject: [PATCH:libXext] Install xml versions of specs even if HAVE_XMLTO is false
+
+Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour
+from before docbook.am changes.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ docbook.am        |    2 ++
+ specs/Makefile.am |    2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docbook.am b/docbook.am
+index 3cf21e8..6937083 100644
+--- a/docbook.am
++++ b/docbook.am
+@@ -20,6 +20,7 @@ shelf_DATA =
+ # DocBook/XML file with chapters, appendix and images it includes
+ dist_shelf_DATA = $(docbook) $(chapters)
+ 
++if HAVE_XMLTO
+ #
+ # Generate DocBook/XML output formats with or without stylesheets
+ #
+@@ -91,5 +92,6 @@ XSLTPROC_FLAGS =					\
+ 
+ endif HAVE_XSLTPROC
+ endif HAVE_STYLESHEETS
++endif HAVE_XMLTO
+ 
+ CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+diff --git a/specs/Makefile.am b/specs/Makefile.am
+index 659b5d2..80fb18f 100644
+--- a/specs/Makefile.am
++++ b/specs/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml
+@@ -11,5 +10,4 @@ shelfdir = $(docdir)
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+-- 
+1.7.3.2
+
--- a/open-src/lib/libdrm/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libdrm/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -31,11 +31,11 @@
 UPSTREAM_SET	= yes
 
 # Version number (used in path names)
-MODULE_VERSION=2.4.21
+MODULE_VERSION=2.4.25
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 273ed9dad986e3a931649f3d8762ff74
-TARBALL_SHA1 = be7754008424a12e01ab0f0da3deb8de13ad2f0c
+TARBALL_MD5  = f53dc4c72109b17908e4113c3b8addfe
+TARBALL_SHA1 = b950f29cd1c4bb9f1c98a926486a47256b0a4194
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=drm
@@ -50,8 +50,11 @@
 SOURCE_PATCHES = \
 	solaris-drm-port.patch atomic.patch
 
-# Need to regenerate files after patching Makefile.am in solaris-drm-port.patch
-AUTORECONF=yes
+# Need to use GNU Make to build
+MODULE_MAKE=$(GNUMAKE)
+MODULE_MAKE_SET=yes
+
+MODULE_BUILD_MAKEFLAGS = libkms_la_LIBADD=../libdrm.so.2
 
 # Command line options to GNU autoconf configure script
 MODULE_CONFIG_OPTS = --disable-radeon --enable-libkms
@@ -65,7 +68,9 @@
 FIX_PC_FILES=libdrm.pc.in intel/libdrm_intel.pc.in libkms/libkms.pc.in
 
 # Where to install files
-MODULE_ADD_LIB_SUBDIR=$(X11_SERVERLIBS_SUBDIR)
+MODULE_ADD_LIB_SUBDIR = $(X11_SERVERLIBS_SUBDIR)
+MODULE_PKGCONFIG_DIR = $(PKGCONFIG_DIR)
+MODULE_PKGCONFIG_DIR_SET = yes
 
 include ../Makefile.inc
 
@@ -74,3 +79,17 @@
 $(PROTODIR)/usr/include/drm:
 	@rm -f $@
 	ln -s libdrm $@
+
+# Upstream seems to install in $(X11_SERVERLIBS_SUBDIR)/pkgconfig no matter
+# what, so just move them afterwards
+PC_FILES = libdrm.pc libdrm_intel.pc libkms.pc
+MOVED_PC_FILES = $(PC_FILES:%=$(PROTODIR)/$(PKGCONFIG_DIR)/%)
+XSERVER_PC_DIR = $(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)/pkgconfig
+
+install-gen: $(MOVED_PC_FILES)
+
+$(PROTODIR)/$(PKGCONFIG_DIR)/%.pc: $(PROTODIR)/$(XSERVER_PC_DIR)/%.pc
+	-rm -f $@
+	mv $< $@
+
+$(PC_FILES:%=$(PROTODIR)/$(XSERVER_PC_DIR)/%): default_install
--- a/open-src/lib/libdrm/atomic.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libdrm/atomic.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,6 @@
---- intel/intel_bufmgr_gem.c	Tue Sep 21 11:59:31 2010
-+++ intel/intel_bufmgr_gem.c	Tue Sep 21 12:03:02 2010
-@@ -112,7 +112,7 @@
+--- intel/intel_bufmgr_gem.c	Wed Feb  9 09:36:09 2011
++++ intel/intel_bufmgr_gem.c	Wed Feb  9 09:38:11 2011
+@@ -116,7 +116,7 @@
  struct _drm_intel_bo_gem {
  	drm_intel_bo bo;
  
@@ -9,18 +9,16 @@
  	uint32_t gem_handle;
  	const char *name;
  
-@@ -333,8 +333,8 @@
+@@ -351,7 +351,7 @@
  {
  	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
  
--	assert(atomic_read(&bo_gem->refcount) > 0);
 -	atomic_inc(&bo_gem->refcount);
-+	assert(bo_gem->refcount > 0);
-+	bo_gem->refcount++;
++        bo_gem->refcount++;
  }
  
  /**
-@@ -645,7 +645,7 @@
+@@ -693,7 +693,7 @@
  	}
  
  	bo_gem->name = name;
@@ -29,7 +27,7 @@
  	bo_gem->validate_index = -1;
  	bo_gem->reloc_tree_fences = 0;
  	bo_gem->used_as_reloc_target = 0;
-@@ -776,7 +776,7 @@
+@@ -813,7 +813,7 @@
  	bo_gem->bo.virtual = NULL;
  	bo_gem->bo.bufmgr = bufmgr;
  	bo_gem->name = name;
@@ -38,7 +36,7 @@
  	bo_gem->validate_index = -1;
  	bo_gem->gem_handle = open_arg.handle;
  	bo_gem->global_name = handle;
-@@ -906,8 +906,8 @@
+@@ -945,8 +945,8 @@
  {
  	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
  
@@ -49,7 +47,7 @@
  		drm_intel_gem_bo_unreference_final(bo, time);
  }
  
-@@ -915,8 +915,8 @@
+@@ -954,8 +954,8 @@
  {
  	drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
  
--- a/open-src/lib/libdrm/solaris-drm-port.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libdrm/solaris-drm-port.patch	Mon May 09 14:58:28 2011 -0700
@@ -196,15 +196,6 @@
  
  #include "internal.h"
  
-diff -urp -x '*~' -x '*.orig' tests/Makefile.am tests/Makefile.am
---- tests/Makefile.am	2010-06-06 18:11:45.000000000 -0700
-+++ tests/Makefile.am	2011-01-24 19:15:45.549320900 -0800
-@@ -1,5 +1,3 @@
--NULL:=#
--
- AM_CPPFLAGS = \
- 	-I $(top_srcdir)/include/drm \
- 	-I $(top_srcdir)
 diff -urp -x '*~' -x '*.orig' xf86drm.c xf86drm.c
 --- xf86drm.c	2010-06-06 18:11:46.000000000 -0700
 +++ xf86drm.c	2011-01-24 19:15:45.547448918 -0800
@@ -251,4 +242,4 @@
 +	return 0;
  
  }
- 
+
--- a/open-src/lib/libpciaccess/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libpciaccess/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -65,10 +65,8 @@
 LIB_MAN_SUFFIX=3pciaccess
 
 # Update scanpci.man with program man page flags instead of library ones
-SUNTOUCH_MAN_FLAGS = \
-	$(COMMON_SUNTOUCH_MAN_FLAGS) \
-	-p $(MODULE_PREFIX)/bin/ \
-	-r '{__distroname__, $(DISTRO_NAME)}'
+SUNTOUCH_MAN_FLAGS  = $(COMMON_SUNTOUCH_MAN_FLAGS)
+SUNTOUCH_MAN_FLAGS +=-p $(MODULE_PREFIX)/bin/
 SUNTOUCH_MAN_FLAGS_SET=yes
 
 # pkg-config files that need to have -R added
--- a/open-src/lib/libpthread-stubs/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/libpthread-stubs/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -28,9 +28,8 @@
 MODULE_NAME=libpthread-stubs
 
 # Package metadata
-UPSTREAM	= XCB project
-UPSTREAM_URL	= http://xcb.freedesktop.org/
-UPSTREAM_SET	= yes
+UPSTREAM_PROJECT = xcb
+UPSTREAM_PROJECT_SET = yes
 
 # Version number (used in path names)
 MODULE_VERSION=0.3
@@ -39,10 +38,6 @@
 TARBALL_MD5  = e8fa31b42e13f87e8f5a7a2b731db7ee
 TARBALL_SHA1 = 7fc486ad0ec54938f8b781cc374218f50eac8b99
 
-# Download site for source
-SOURCE_URL=http://xcb.freedesktop.org/dist/$(SOURCE_TARBALL_NAME)
-SOURCE_URL_SET=yes
-
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
--- a/open-src/lib/mesa/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/mesa/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -40,11 +40,11 @@
 MODULE_ARC_CASES = LSARC/2005/109
 
 # Version number (used in path names)
-MODULE_VERSION=7.8.2
+MODULE_VERSION=7.10.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 6be2d343a0089bfd395ce02aaf8adb57
-TARBALL_SHA1 = 21de672a1cbe307135d7f172dc6952041a38e1c7
+TARBALL_MD5  = f5de82852f1243f42cc004039e10b771
+TARBALL_SHA1 = 71bbb2686230f6334aa625a951b58b4b2d5d6aa0
 
 # Source tarball
 SOURCE_TARBALL_NAME=MesaLib-$(MODULE_VERSION).tar.bz2
@@ -132,7 +132,7 @@
 HEADERS_TO_MOVE = GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h \
 	gl.h gl_mangle.h glext.h glfbdev.h \
 	glu.h glu_mangle.h glx.h glx_mangle.h glxext.h \
-	mesa_wgl.h mglmesa.h osmesa.h vms_x_fix.h wglext.h wmesa.h
+	mesa_wgl.h osmesa.h vms_x_fix.h wglext.h wmesa.h
 HEADERS_TO_DIRECT_LINK = GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h \
 	glu.h osmesa.h
 HEADERS_TO_RUNTIME_LINK = gl.h glext.h glx.h glxext.h
--- a/open-src/lib/mesa/glsl.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/mesa/glsl.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,24 +1,20 @@
---- src/mesa/drivers/dri/Makefile.template	Wed Apr 21 16:11:04 2010
-+++ src/mesa/drivers/dri/Makefile.template	Wed Apr 21 16:11:52 2010
-@@ -7,6 +7,8 @@
+--- src/mesa/drivers/dri/Makefile.template	Tue Apr 19 07:55:49 2011
++++ src/mesa/drivers/dri/Makefile.template	Tue Apr 19 07:50:29 2011
+@@ -6,6 +6,8 @@
  
  MESA_MODULES = $(TOP)/src/mesa/libmesa.a
  
-+LIBGLSL_MOBULES = $(TOP)/src/glsl/pp/libglslpp.a $(TOP)/src/glsl/cl/libglslcl.a
++LIBGLSL_MOBULES = $(TOP)/src/glsl/libglsl.a
 +
  COMMON_GALLIUM_SOURCES = \
          ../common/utils.c \
          ../common/vblank.c \
-@@ -55,10 +57,10 @@
- lib: symlinks subdirs depend
- 	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
- 
--$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
-+$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(LIBGLSL_MOBULES) $(EXTRA_MODULES) Makefile \
- 		$(TOP)/src/mesa/drivers/dri/Makefile.template
- 	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+@@ -64,7 +66,7 @@
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
+ 		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
+ 	$(MKLIB) -o [email protected] -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
 -		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
 +		$(OBJECTS) $(MESA_MODULES) $(LIBGLSL_MOBULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
- 
- 
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
+ 	$(CXX) $(CFLAGS) -o [email protected] $(TOP)/src/mesa/drivers/dri/common/dri_test.o [email protected] $(DRI_LIB_DEPS)
+ 	@rm -f [email protected]
+ 	mv -f [email protected] $@
--- a/open-src/lib/mesa/install-pc-dir.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/mesa/install-pc-dir.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,12 +1,3 @@
---- configs/default	Fri Feb 12 15:56:33 2010
-+++ configs/default	Mon Mar  1 09:53:26 2010
-@@ -121,6 +121,7 @@
- INSTALL_DIR = /usr/local
- INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
- INSTALL_INC_DIR = $(INSTALL_DIR)/include
-+INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig
- DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
- 
  # Where libGL will look for DRI hardware drivers
 --- src/glu/Makefile	Mon Mar  1 09:54:01 2010
 +++ src/glu/Makefile	Mon Mar  1 09:56:50 2010
@@ -62,3 +53,13 @@
  install-dri: default
  	cd drivers/dri && $(MAKE) install
  
+--- configs/default	Wed Apr 20 08:55:46 2011
++++ configs/default	Wed Apr 20 08:56:29 2011
+@@ -137,6 +137,7 @@
+ INSTALL_DIR = /usr/local
+ INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
+ INSTALL_INC_DIR = $(INSTALL_DIR)/include
++INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig
+ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
+ 
+ # Where libGL will look for DRI hardware drivers
--- a/open-src/lib/mesa/solaris-port.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/mesa/solaris-port.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,6 @@
---- src/mesa/drivers/dri/intel/intel_context.h	Thu Apr  8 12:57:04 2010
-+++ src/mesa/drivers/dri/intel/intel_context.h	Thu Apr  8 13:02:36 2010
-@@ -254,9 +254,13 @@
+--- src/mesa/drivers/dri/intel/intel_context.h	Thu Feb 10 09:26:20 2011
++++ src/mesa/drivers/dri/intel/intel_context.h	Thu Feb 10 09:27:22 2011
+@@ -271,9 +271,13 @@
     driOptionCache optionCache;
  };
  
@@ -15,7 +15,7 @@
  #define SUBPIXEL_X 0.125
  #define SUBPIXEL_Y 0.125
  
-@@ -288,7 +292,7 @@
+@@ -307,7 +311,7 @@
   * than COPY_DWORDS would:
   * XXX Put this in src/mesa/main/imports.h ???
   */
@@ -24,9 +24,9 @@
  static INLINE void * __memcpy(void * to, const void * from, size_t n)
  {
     int d0, d1, d2;
---- src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Apr  8 13:04:23 2010
-+++ src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Apr  8 13:05:06 2010
-@@ -8,7 +8,8 @@
+--- src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Feb 10 09:28:18 2011
++++ src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Feb 10 13:28:05 2011
+@@ -8,9 +8,9 @@
  #include "intel_reg.h"
  
  #define BATCH_SZ 16384
@@ -34,61 +34,40 @@
 +#define BATCH_RESERVED16 16
 +#define BATCH_RESERVED4k 4096
  
- 
+-
  struct intel_batchbuffer
-@@ -92,7 +93,10 @@
+ {
+    struct intel_context *intel;
+@@ -92,8 +92,12 @@
  static INLINE GLint
  intel_batchbuffer_space(struct intel_batchbuffer *batch)
  {
--   return (batch->size - batch->reserved_space) - (batch->ptr - batch->map);
-+    if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
-+       return (batch->size - BATCH_RESERVED16) - (batch->ptr - batch->map);
-+    else
-+       return (batch->size - BATCH_RESERVED4k) - (batch->ptr - batch->map);
+-   return (batch->state_batch_offset - batch->reserved_space) -
+-      (batch->ptr - batch->map);
++   if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
++   	return (batch->state_batch_offset - BATCH_RESERVED16) -
++      		(batch->ptr - batch->map);
++   else 
++   	return (batch->state_batch_offset - BATCH_RESERVED4k) -
++      		(batch->ptr - batch->map);
  }
  
  
---- src/glx/glxcurrent.c	Thu Apr  8 13:08:15 2010
-+++ src/glx/glxcurrent.c	Thu Apr  8 13:08:49 2010
-@@ -397,7 +397,7 @@
- 
- #ifdef GLX_DIRECT_RENDERING
-    if ((dpy != oldGC->currentDpy || (gc && gc->driContext)) &&
--       !oldGC->isDirect && oldGC != &dummyContext) {
-+       !oldGC->isDirect && oldGC != &dummyContext && oldGC->xid != None) {
- #else
-    if ((dpy != oldGC->currentDpy) && oldGC != &dummyContext) {
- #endif
---- src/glx/Makefile	Thu Apr  8 13:17:33 2010
-+++ src/glx/Makefile	Thu Apr  8 13:18:05 2010
-@@ -65,6 +65,10 @@
+--- src/mesa/drivers/dri/Makefile.template	Thu Feb 10 13:58:58 2011
++++ src/mesa/drivers/dri/Makefile.template	Thu Feb 10 14:01:53 2011
+@@ -1,5 +1,9 @@
+ # -*-makefile-*-
  
- default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- 
-+# Needed to truly hide symbols gcc treats as HIDDEN/INTERNAL but doesn't mark
-+# as hidden in the ELF files properly.
-+GL_LIB_DEPS += -Wl,-M,mapfile.scope
-+
- # Make libGL
- $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
- 	$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/Makefile.template
---- src/mesa/drivers/dri/Makefile.template      2009-03-12 20:28:49.000000000 -0700
-+++ src/mesa/drivers/dri/Makefile.template      2009-03-31 09:12:45.628778000 -0700
-@@ -1,5 +1,10 @@
- # -*-makefile-*-
-
 +# Needed to specify symbols which are allowed to be undefined when
 +# linking DRI modules with -z defs
 +DRI_LIB_DEPS += -Wl,-M,$(TOP)/src/mesa/drivers/dri/mapfile.externs
 +
-+
  MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
- COMMON_SOURCES = \
---- src/mesa/drivers/dri/common/dri_util.h	Thu Apr  8 13:21:04 2010
-+++ src/mesa/drivers/dri/common/dri_util.h	Thu Apr  8 13:21:23 2010
-@@ -57,6 +57,10 @@
+ 
+ COMMON_GALLIUM_SOURCES = \
+--- src/mesa/drivers/dri/common/dri_util.h	Thu Feb 10 14:04:16 2011
++++ src/mesa/drivers/dri/common/dri_util.h	Thu Feb 10 14:04:54 2011
+@@ -58,6 +58,10 @@
  
  #define GLX_BAD_CONTEXT                    5
  
@@ -99,19 +78,18 @@
  typedef struct __DRIswapInfoRec        __DRIswapInfo;
  
  /**
-diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/mmio.h
---- src/mesa/drivers/dri/common/mmio.h  2009-01-22 09:38:33.000000000 -0800
-+++ src/mesa/drivers/dri/common/mmio.h  2009-03-31 09:12:45.639560000 -0700
+--- src/mesa/drivers/dri/common/mmio.h	Thu Feb 10 14:05:39 2011
++++ src/mesa/drivers/dri/common/mmio.h	Thu Feb 10 14:05:58 2011
 @@ -34,6 +34,7 @@
  #define MMIO_H
-
+ 
  #include "main/glheader.h"
 +#include "dri_util.h"
-
+ 
  #if defined( __powerpc__ )
-
---- src/mesa/drivers/dri/i915/intel_tris.c	Thu Apr  8 13:22:36 2010
-+++ src/mesa/drivers/dri/i915/intel_tris.c	Thu Apr  8 13:23:31 2010
+ 
+--- src/mesa/drivers/dri/i915/intel_tris.c	Thu Feb 10 14:07:48 2011
++++ src/mesa/drivers/dri/i915/intel_tris.c	Thu Feb 10 14:08:17 2011
 @@ -325,7 +325,7 @@
   *                    Emit primitives as inline vertices               *
   ***********************************************************************/
@@ -121,8 +99,8 @@
  #define COPY_DWORDS( j, vb, vertsize, v )			\
  do {								\
     int __tmp;							\
---- src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Apr  8 13:27:42 2010
-+++ src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Apr  8 13:29:09 2010
+--- src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Feb 10 14:09:00 2011
++++ src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Feb 10 14:09:49 2011
 @@ -159,7 +159,24 @@
     BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
  };
@@ -148,98 +126,70 @@
  /**
   * Given vertex array type/size/format/normalized info, return
   * the appopriate hardware surface type.
-diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/server/i830_dri.h src/mesa/drivers/dri/intel/server/i830_dri.h
---- src/mesa/drivers/dri/intel/server/i830_dri.h        2008-08-25 07:46:43.000000000 -0700
-+++ src/mesa/drivers/dri/intel/server/i830_dri.h        2009-03-31 09:12:45.654900000 -0700
-@@ -21,16 +21,20 @@ typedef struct _I830DRIRec {
-    drm_handle_t unused2; /* backbuffer */
-
-    drmSize unused3; /* depthbufferSize */
-+   drmSize pad0;
-    drm_handle_t unused4; /* depthbuffer */
-
-    drmSize unused5; /* rotatedSize */
-+   drmSize pad1;
-    drm_handle_t unused6; /* rotatedbuffer */
-
-    drm_handle_t unused7; /* textures */
-    int unused8; /* textureSize */
-+   drmSize pad2;
-
-    drm_handle_t unused9; /* agp_buffers */
-    drmSize unused10; /* agp_buf_size */
-+   drmSize pad3;
-
-    int deviceID;
-    int width;
-
-diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/radeon/server/radeon_dri.h src/mesa/drivers/dri/radeon/server/radeon_dri.h
---- src/mesa/drivers/dri/radeon/server/radeon_dri.h     2009-01-22 09:38:33.000000000 -0800
-+++ src/mesa/drivers/dri/radeon/server/radeon_dri.h     2009-03-31 09:12:45.642139000 -0700
-@@ -89,6 +89,7 @@ typedef struct {
-     /*@{*/
-     drm_handle_t     registerHandle; /**< \brief MMIO register map size */
-     drmSize       registerSize;   /**< \brief MMIO register map handle */
-+    int          padding0;
-     /*@}*/
-
-     /**
-@@ -97,6 +98,7 @@ typedef struct {
-     /*@{*/
-     drm_handle_t     statusHandle;   /**< \brief status map handle */
-     drmSize       statusSize;     /**< \brief status map size */
-+    int                  padding1;
-     /*@}*/
-
-     /**
-@@ -105,11 +107,13 @@ typedef struct {
-     /*@{*/
-     drm_handle_t     gartTexHandle;   /**< \brief AGP texture area map handle */
-     drmSize       gartTexMapSize;  /**< \brief AGP texture area map size */
-+    int          padding2;
-     int           log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */
-     int           gartTexOffset;   /**< \brief AGP texture area offset in AGP space */
-     /*@}*/
-
-     unsigned int  sarea_priv_offset; /**< \brief offset of the private SAREA data*/
-+    int                  padding3;
- } RADEONDRIRec, *RADEONDRIPtr;
-
- #endif
---- src/mesa/drivers/dri/intel/intel_batchbuffer.c      Tue Mar 30 15:21:12 2010
-+++ src/mesa/drivers/dri/intel/intel_batchbuffer.c      Tue Mar 30 15:22:42 2010
-@@ -244,7 +244,10 @@
-    if (intel->vtbl.finish_batch)
-       intel->vtbl.finish_batch(intel);
-
+--- src/mesa/drivers/dri/intel/intel_batchbuffer.c	Thu Feb 10 14:12:23 2011
++++ src/mesa/drivers/dri/intel/intel_batchbuffer.c	Thu Feb 10 14:13:06 2011
+@@ -49,7 +49,10 @@
+ 
+    batch->size = intel->maxBatchSize;
+    batch->ptr = batch->map;
 -   batch->reserved_space = BATCH_RESERVED;
 +   if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
-+       batch->reserved_space = BATCH_RESERVED16;
++	batch->reserved_space = BATCH_RESERVED16;
 +   else
-+       batch->reserved_space = BATCH_RESERVED4k;
-
-    /* TODO: Just pass the relocation list and dma buffer up to the
-     * kernel.
---- src/gallium/drivers/svga/Makefile	Thu Apr  8 14:31:43 2010
-+++ src/gallium/drivers/svga/Makefile	Thu Apr  8 14:31:51 2010
-@@ -54,7 +54,7 @@
- CFLAGS := $(filter-out -pedantic, $(filter-out -ansi, $(CFLAGS)))
++	batch->reserved_space = BATCH_RESERVED4k;
+    batch->dirty_state = ~0;
+    batch->state_batch_offset = batch->size;
+ }
+--- configure.ac	Thu Mar 24 13:20:29 2011
++++ configure.ac	Thu Mar 24 13:21:39 2011
+@@ -150,7 +150,7 @@
+     # Enable -fvisibility=hidden if using a gcc that supports it
+     save_CFLAGS="$CFLAGS"
+     AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+-    CFLAGS="$CFLAGS -fvisibility=hidden"
++    CFLAGS="$CFLAGS"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+ 		   [CFLAGS="$save_CFLAGS" ; AC_MSG_RESULT([no])]);
+ 
+@@ -163,7 +163,7 @@
+     # Enable -fvisibility=hidden if using a gcc that supports it
+     save_CXXFLAGS="$CXXFLAGS"
+     AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+-    CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++    CXXFLAGS="$CXXFLAGS "
+     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+ 		   [CXXFLAGS="$save_CXXFLAGS" ; AC_MSG_RESULT([no])]);
  
- LIBRARY_DEFINES = \
--	-std=gnu99 -fvisibility=hidden \
-+	-std=gnu99 \
- 	-DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
+--- configure	Thu Mar 24 13:20:33 2011
++++ configure	Thu Mar 24 13:22:08 2011
+@@ -4884,7 +4884,7 @@
+     save_CFLAGS="$CFLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
+ $as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
+-    CFLAGS="$CFLAGS -fvisibility=hidden"
++    CFLAGS="$CFLAGS "
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- include ../../Makefile.template
---- src/glx/single2.c	Tue Apr 20 11:00:09 2010
-+++ src/glx/single2.c	Tue Apr 20 11:02:19 2010
-@@ -44,6 +44,9 @@
- #include <X11/Xlib-xcb.h>
- #endif /* USE_XCB */
+@@ -4916,7 +4916,7 @@
+     save_CXXFLAGS="$CXXFLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
+ $as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
+-    CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++    CXXFLAGS="$CXXFLAGS "
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-+#if !defined(__GNUC__)
-+#  define __builtin_expect(x, y) x
-+#endif
+--- src/glx/Makefile	Tue Apr 19 10:57:29 2011
++++ src/glx/Makefile	Tue Apr 19 10:58:54 2011
+@@ -73,6 +73,10 @@
+ 
+ default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
  
- /* Used for GL_ARB_transpose_matrix */
- static void
++# Needed to truly hide symbols gcc treats as HIDDEN/INTERNAL but doesn't mark
++# as hidden in the ELF files properly.
++GL_LIB_DEPS += -Wl,-M,mapfile.scope
++
+ # Make libGL
+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
+ 	$(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
--- a/open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs	Mon May 09 14:58:28 2011 -0700
@@ -20,4 +20,6 @@
     sl_pp_context_destroy = FUNCTION extern;
     sl_pp_version = FUNCTION extern;
     sl_cl_compile = FUNCTION extern;
+    
+    radeon_gem_get_kernel_name = FUNCTION extern;
 };
--- a/open-src/lib/pixman/COPYING	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/pixman/COPYING	Mon May 09 14:58:28 2011 -0700
@@ -1,11 +1,9 @@
-
---------------------
-
-pixman/pixman-access.c:
+pixman/pixman-radial-gradient.c:
 
  Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ Copyright © 2000 SuSE, Inc.
              2005 Lars Knoll & Zack Rusin, Trolltech
-             2008 Aaron Plattner, NVIDIA Corporation
+ Copyright © 2007 Red Hat, Inc.
 
  Permission to use, copy, modify, distribute, and sell this software and its
  documentation for any purpose is hereby granted without fee, provided that
@@ -25,118 +23,8 @@
  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
- 
---------------------
 
-pixman/pixman-arm-common.h:
-
- Copyright © 2010 Nokia Corporation
-
- 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.
-
- Author:  Siarhei Siamashka ([email protected])
- 
---------------------
-
-pixman/pixman-arm-neon-asm.h:
-
- Copyright © 2009 Nokia Corporation
-
- 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.
-
- Author:  Siarhei Siamashka ([email protected])
- 
---------------------
-
-pixman/pixman-arm-neon.c:
-
- Copyright © 2009 ARM Ltd, Movial Creative Technologies Oy
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of ARM Ltd not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  ARM Ltd makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- Author:  Ian Rickards ([email protected])
- Author:  Jonathan Morton ([email protected])
- Author:  Markku Vire ([email protected])
-
---------------------
-
-pixman/pixman-arm-simd.c:
-
- Copyright © 2008 Mozilla Corporation
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Mozilla Corporation not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Mozilla Corporation makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- Author:  Jeff Muizelaar ([email protected])
-
---------------------
+--------------------------------------------------------------------
 
 pixman/pixman-bits-image.c:
 
@@ -166,37 +54,9 @@
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
 
---------------------
-
-pixman/pixman-conical-gradient.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007 Red Hat, Inc.
- Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-             2005 Lars Knoll & Zack Rusin, Trolltech
+--------------------------------------------------------------------
 
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
---------------------
-
-pixman/pixman-cpu.c:
+pixman/pixman-cpu.c, pixman/pixman-fast-path.c, pixman/pixman-fast-path.h, pixman/pixman-image.c, pixman/pixman.c:
 
  Copyright © 2000 SuSE, Inc.
  Copyright © 2007 Red Hat, Inc.
@@ -218,10 +78,207 @@
  OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
---------------------
+--------------------------------------------------------------------
+
+pixman/pixman-region.c:
+
+ Copyright 1987, 1988, 1989, 1998  The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ 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
+ OPEN GROUP 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.
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+ Copyright 1987, 1988, 1989 by
+ Digital Equipment Corporation, Maynard, Massachusetts.
+
+                    All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Digital not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+ Copyright © 1998 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-access.c:
+
+ Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+             2005 Lars Knoll & Zack Rusin, Trolltech
+             2008 Aaron Plattner, NVIDIA Corporation
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-mmx.c:
 
-pixman/pixman-edge-imp.h:
+ Copyright © 2004, 2005 Red Hat, Inc.
+ Copyright © 2004 Nicholas Miell
+ Copyright © 2005 Trolltech AS
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Red Hat not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  Red Hat makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-arm-simd.c:
+
+ Copyright © 2008 Mozilla Corporation
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Mozilla Corporation not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Mozilla Corporation makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-solid-fill.c:
 
+ Copyright © 2000 SuSE, Inc.
+ Copyright © 2007, 2009 Red Hat, Inc.
+ Copyright © 2009 Soren Sandmann
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of SuSE not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  SuSE makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+ SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-arm-common.h:
+
+ Copyright © 2010 Nokia Corporation
+
+ 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.
+
+--------------------------------------------------------------------
+
+pixman/pixman-trap.c:
+
+ Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  Copyright © 2004 Keith Packard
 
  Permission to use, copy, modify, distribute, and sell this software and its
@@ -242,83 +299,7 @@
  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
 
---------------------
-
-pixman/pixman-edge.c:
-
- Copyright © 2004 Keith Packard
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
- 
---------------------
-
-pixman/pixman-fast-path.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author:  Keith Packard, SuSE, Inc.
- 
---------------------
-
-pixman/pixman-fast-path.h:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author:  Keith Packard, SuSE, Inc.
- 
---------------------
+--------------------------------------------------------------------
 
 pixman/pixman-general.c:
 
@@ -348,7 +329,224 @@
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
 
---------------------
+--------------------------------------------------------------------
+
+pixman/pixman-edge-imp.h, pixman/pixman-edge.c:
+
+ Copyright © 2004 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-matrix.c:
+
+ Copyright © 2008 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting documentation, and
+ that the name of the copyright holders not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  The copyright holders make no representations
+ about the suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-utils.c:
+
+ Copyright © 2000 SuSE, Inc.
+ Copyright © 1999 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of SuSE not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  SuSE makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+ SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman.h:
+
+ Copyright 1987, 1998  The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ 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
+ OPEN GROUP 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.
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Digital not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+*****************************************************************
+
+ Copyright © 1998, 2004 Keith Packard
+ Copyright   2007 Red Hat, Inc.
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-region16.c, pixman/pixman-region32.c:
+
+ Copyright © 2008 Red Hat, Inc.
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of
+ Red Hat, Inc. not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission. Red Hat, Inc. makes no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+ RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-implementation.c:
+
+ Copyright © 2009 Red Hat, Inc.
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Red Hat not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  Red Hat makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
+
+pixman/pixman-sse2.c:
+
+ Copyright © 2008 Rodrigo Kumpera
+ Copyright © 2008 André Tupinambá
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Red Hat not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  Red Hat makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
 
 pixman/pixman-gradient-walker.c:
 
@@ -374,35 +572,11 @@
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
 
---------------------
-
-pixman/pixman-image.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007 Red Hat, Inc.
+--------------------------------------------------------------------
 
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
+pixman/pixman-timer.c:
 
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
---------------------
-
-pixman/pixman-implementation.c:
-
- Copyright © 2009 Red Hat, Inc.
+ Copyright © 2007 Red Hat, Inc.
 
  Permission to use, copy, modify, distribute, and sell this software and its
  documentation for any purpose is hereby granted without fee, provided that
@@ -414,18 +588,16 @@
  suitability of this software for any purpose.  It is provided "as is"
  without express or implied warranty.
 
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
- 
---------------------
+ RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-pixman/pixman-linear-gradient.c:
+--------------------------------------------------------------------
+
+pixman/pixman-conical-gradient.c, pixman/pixman-linear-gradient.c:
 
  Copyright © 2000 SuSE, Inc.
  Copyright © 2007 Red Hat, Inc.
@@ -450,347 +622,8 @@
  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
- 
---------------------
 
-pixman/pixman-matrix.c:
-
- Copyright © 2008 Keith Packard
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting documentation, and
- that the name of the copyright holders not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  The copyright holders make no representations
- about the suitability of this software for any purpose.  It is provided "as
- is" without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- OF THIS SOFTWARE.
-
---------------------
-
-pixman/pixman-mmx.c:
-
- Copyright © 2004, 2005 Red Hat, Inc.
- Copyright © 2004 Nicholas Miell
- Copyright © 2005 Trolltech AS
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Red Hat not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  Red Hat makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- Author:  Søren Sandmann ([email protected])
- Minor Improvements: Nicholas Miell ([email protected])
- MMX code paths for fbcompose.c by Lars Knoll ([email protected])
-
- Based on work by Owen Taylor
-
---------------------
-
-pixman/pixman-radial-gradient.c:
-
- Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
- Copyright © 2000 SuSE, Inc.
-             2005 Lars Knoll & Zack Rusin, Trolltech
- Copyright © 2007 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
---------------------
-
-pixman/pixman-region.c:
-
- Copyright 1987, 1988, 1989, 1998  The Open Group
- 
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.
- 
- 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
- OPEN GROUP 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.
- 
- Except as contained in this notice, the name of The Open Group shall not be
- used in advertising or otherwise to promote the sale, use or other dealings
- in this Software without prior written authorization from The Open Group.
- 
----
-
- Copyright 1987, 1988, 1989 by
- Digital Equipment Corporation, Maynard, Massachusetts.
- 
-                    All Rights Reserved
- 
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Digital not be
- used in advertising or publicity pertaining to distribution of the
- software without specific, written prior permission.
- 
- DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
----
-
- Copyright © 1998 Keith Packard
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
- 
---------------------
-
-pixman/pixman-region16.c:
-
- Copyright © 2008 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without
- fee, provided that the above copyright notice appear in all copies
- and that both that copyright notice and this permission notice
- appear in supporting documentation, and that the name of
- Red Hat, Inc. not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission. Red Hat, Inc. makes no representations about the
- suitability of this software for any purpose.  It is provided "as
- is" without express or implied warranty.
-
- RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
- INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author: Soren Sandmann <[email protected]>
- 
---------------------
-
-pixman/pixman-region32.c:
-
- Copyright © 2008 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without
- fee, provided that the above copyright notice appear in all copies
- and that both that copyright notice and this permission notice
- appear in supporting documentation, and that the name of
- Red Hat, Inc. not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission. Red Hat, Inc. makes no representations about the
- suitability of this software for any purpose.  It is provided "as
- is" without express or implied warranty.
-
- RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
- INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author: Soren Sandmann <[email protected]>
- 
---------------------
-
-pixman/pixman-solid-fill.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007, 2009 Red Hat, Inc.
- Copyright © 2009 Soren Sandmann
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
---------------------
-
-pixman/pixman-sse2.c:
-
- Copyright © 2008 Rodrigo Kumpera
- Copyright © 2008 André Tupinambá
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Red Hat not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  Red Hat makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
- Author:  Rodrigo Kumpera ([email protected])
-          André Tupinambá ([email protected])
-
- Based on work by Owen Taylor and Søren Sandmann
-
---------------------
-
-pixman/pixman-timer.c:
-
- Copyright © 2007 Red Hat, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Red Hat not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  Red Hat makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
---------------------
-
-pixman/pixman-trap.c:
-
- Copyright © 2004 Keith Packard
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
- 
---------------------
-
-pixman/pixman-utils.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 1999 Keith Packard
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
-
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author:  Keith Packard, SuSE, Inc.
- 
---------------------
+--------------------------------------------------------------------
 
 pixman/pixman-version.h:
 
@@ -816,9 +649,32 @@
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
- Author: Carl D. Worth <[email protected]>
- 
---------------------
+--------------------------------------------------------------------
+
+pixman/pixman-arm-neon.c:
+
+ Copyright © 2009 ARM Ltd, Movial Creative Technologies Oy
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of ARM Ltd not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  ARM Ltd makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+--------------------------------------------------------------------
 
 pixman/pixman-vmx.c:
 
@@ -843,103 +699,28 @@
  OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
 
- Author:  Luca Barbato ([email protected])
- Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
- 
---------------------
-
-pixman/pixman.c:
-
- Copyright © 2000 SuSE, Inc.
- Copyright © 2007 Red Hat, Inc.
+--------------------------------------------------------------------
 
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of SuSE not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission.  SuSE makes no representations about the
- suitability of this software for any purpose.  It is provided "as is"
- without express or implied warranty.
+pixman/pixman-arm-neon-asm.h:
+
+ Copyright © 2009 Nokia Corporation
 
- SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Author:  Keith Packard, SuSE, Inc.
- 
---------------------
-
-pixman/pixman.h:
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+ 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 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
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
----
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
 
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
----
-
- Copyright © 1998, 2004 Keith Packard
- Copyright   2007 Red Hat, Inc.
+ 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.
 
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of Keith Packard not be used in
- advertising or publicity pertaining to distribution of the software without
- specific, written prior permission.  Keith Packard makes no
- representations about the suitability of this software for any purpose.  It
- is provided "as is" without express or implied warranty.
-
- KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-
---------------------
--- a/open-src/lib/pixman/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/lib/pixman/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -28,11 +28,11 @@
 MODULE_NAME=pixman
 
 # Version number (used in path names)
-MODULE_VERSION=0.20.2
+MODULE_VERSION=0.22.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 7ed10a0f0fde6853613105a99735e7e7
-TARBALL_SHA1 = 9972c8f8ce484f7649d9f588168cd29f61c05c63
+TARBALL_MD5  = 307fe4d7dc83b1a558c362907097c0d0
+TARBALL_SHA1 = d24ea233755d7dce9f0d93136ad99fba8d4e4fa0
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
@@ -42,8 +42,7 @@
 # files in pixman and to work around assertions in Studio 12 when the 
 # -xspace flag is used (Studio bug #6825222)
 include ../../common/Makefile.init
-NO_TARGET_CFLAGS = $(LIB_CFLAGS:-xtarget%=-xchip%)
-NO_XSPACE_CFLAGS = $(NO_TARGET_CFLAGS:-xspace=)
+NO_XSPACE_CFLAGS = $(LIB_CFLAGS:-xspace=)
 MODULE_CONFIG_ENV_i386 = CFLAGS="$(NO_XSPACE_CFLAGS)"
 MODULE_CONFIG_ENV_sparc = # not needed
 MODULE_CONFIG_ENV = $(MODULE_CONFIG_ENV_$(MACH))
--- a/open-src/proto/xextproto/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/proto/xextproto/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,14 +27,18 @@
 MODULE_NAME=xextproto
 
 # Version number (used in path names)
-MODULE_VERSION=7.1.2
+MODULE_VERSION=7.2.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 263ae968b223c23b2986603d84e5c30e
-TARBALL_SHA1 = be6303a9449277af58f38e1be57e442d98f400fe
+TARBALL_MD5  = 220732210ceffb01bf1caf970e3b1bfb
+TARBALL_SHA1 = a117fb9d7fdebee7af3f9e79efe9812e39e650a5
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
 
+# ARC cases that covered this module
+# PSARC/2011/213 X Synchronization Extension version 3.1
+MODULE_ARC_CASES = PSARC/2011/213
+
 ### Include common rulesets
 include ../Makefile.inc
--- a/open-src/xserver/Makefile.inc	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/Makefile.inc	Mon May 09 14:58:28 2011 -0700
@@ -39,7 +39,7 @@
 include $(TOP)/open-src/common/Makefile.init
 
 # Xorg server source tarball to use sources from
-XORGSERVER_VERS=1.9.4
+XORGSERVER_VERS=1.10.1
 
 # Patches shared between Xorg & Xvnc builds
 XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list
@@ -48,7 +48,7 @@
 DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri'
 
 # Changes to apply to man pages
-MODTYPE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/bin/
+MODTYPE_SUNTOUCH_MAN_FLAGS = -p $(MODULE_PREFIX)/bin/
 
 # Command line options to GNU autoconf configure script for xorg-server
 XSERVER_CONFIG_OPTS_COMMON = \
--- a/open-src/xserver/xorg/6535006.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c
---- hw/xfree86/common/xf86Mode.c	2010-09-03 16:45:23.099750744 -0700
-+++ hw/xfree86/common/xf86Mode.c	2010-09-03 16:45:25.275951707 -0700
-@@ -1563,7 +1563,45 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
- 	virtX = virtualX;
- 	virtY = virtualY;
- 	scrp->virtualFrom = X_CONFIG;
--    } else if (!modeNames || !*modeNames) {
-+    } 
-+
-+    if  ((modeNames == NULL) || (*modeNames == NULL)) {
-+	if (UseDefaultRate) {
-+	    modeNames = xnfcalloc(2, sizeof(char *));
-+	    modeNames[0] = strdup("1024x768");
-+	    modeNames[1] = NULL;
-+	} else {
-+	    char *mode_pref = NULL;
-+	    const int types[] = {
-+            	M_T_BUILTIN | M_T_PREFERRED,
-+            	M_T_USERDEF | M_T_PREFERRED,
-+            	M_T_DRIVER | M_T_PREFERRED
-+		};
-+	    const int ntypes = sizeof(types) / sizeof(int);
-+	    int n, type;
-+	    DisplayModePtr modes = scrp->modePool ? scrp->modePool : availModes;
-+
-+	    for (n = 0; n < ntypes; n++) {
-+	        type = types[n];
-+		
-+	    	for (p = modes;  p != NULL;  p = p->next) {
-+	    	    if ((p->type & type) == type) {
-+		    	mode_pref = strdup(p->name);
-+		    	break;
-+	    	    }
-+	    	}
-+	    	if (mode_pref)
-+		    break;
-+	    }
-+	    if (mode_pref) {
-+	    	modeNames = xnfcalloc(2, sizeof(char *));
-+	    	modeNames[0] = strdup(mode_pref);
-+	    	modeNames[1] = NULL;
-+	    }
-+	}
-+    }
-+
-+    if ((virtualY <= 0) && (!modeNames || !*modeNames)) {
- 	/* No virtual size given in the config, try to infer */
- 	/* XXX this doesn't take m{in,ax}Pitch into account; oh well */
- 	inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY);
-@@ -1628,12 +1666,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
- 	xf86DeleteMode(&scrp->modes, scrp->modes);
-     endp = &scrp->modes;
-     last = NULL;
--    if (UseDefaultRate && ((modeNames == NULL) || (*modeNames == NULL))) {
--	modeNames = xnfcalloc(2, sizeof(char *));
--	modeNames[0] = strdup("1024x768");
--	modeNames[1] = NULL;
--    }
--    if (modeNames != NULL) {
-+    if ((modeNames != NULL) && (*modeNames != NULL)) {
- 	for (i = 0; modeNames[i] != NULL; i++) {
- 	    userModes = TRUE;
- 	    new = xnfcalloc(1, sizeof(DisplayModeRec));
--- a/open-src/xserver/xorg/6721634.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/6721634.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,9 +18,10 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c	2010-06-10 07:07:55.000000000 -0700
-+++ hw/xfree86/common/xf86AutoConfig.c	2010-09-03 16:45:29.769441097 -0700
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 5c6e721..64377d3 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
 @@ -59,6 +59,18 @@
  	"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
  	"\tDriver\t\"%s\"\n"
--- a/open-src/xserver/xorg/6906694.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/6906694.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,7 @@
-diff -Nurp -x '*~' -x '*.orig' exa/exa_render.c exa/exa_render.c
---- exa/exa_render.c	2010-06-06 10:53:51.000000000 -0700
-+++ exa/exa_render.c	2010-09-03 16:45:42.134444609 -0700
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 6f2af8a..9a57fe6 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
 @@ -902,8 +902,9 @@ exaComposite(CARD8	op,
      Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
      RegionRec region;
--- a/open-src/xserver/xorg/6912996.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/6912996.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,7 @@
-diff -Nurp -x '*~' -x '*.orig' exa/exa.c exa/exa.c
---- exa/exa.c	2010-07-14 13:23:17.000000000 -0700
-+++ exa/exa.c	2010-09-03 16:45:44.147202216 -0700
+diff --git a/exa/exa.c b/exa/exa.c
+index a4e294a..df29441 100644
+--- a/exa/exa.c
++++ b/exa/exa.c
 @@ -61,7 +61,11 @@ exaGetPixmapOffset(PixmapPtr pPix)
      ExaScreenPriv (pPix->drawable.pScreen);
      ExaPixmapPriv (pPix);
--- a/open-src/xserver/xorg/COPYING	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/COPYING	Mon May 09 14:58:28 2011 -0700
@@ -1,29 +1,284 @@
-The following is the 'standard copyright' agreed upon by most contributors,
-and is currently the canonical license preferred by the X.Org Foundation.
-This is a slight variant of the common MIT license form published by the
-Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
-
-Copyright holders of new code should use this license statement where
-possible, and insert their name to this list.  Please sort by surname
-for people, and by the full name for other entities (e.g.  Juliusz
-Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
-
-Copyright © 2000-2001 Juliusz Chroboczek
-Copyright © 2009 Julien Cristau
-Copyright © 1998 Egbert Eich
-Copyright © 2006-2007, 2010 Intel Corporation
+The following software (or certain identified files distributed with the
+software) may be included in this product. Unless otherwise specified,
+the software identified in this file is licensed under the licenses
+described below. The disclaimers and copyright notices provided are
+based on information made available to Oracle by the third party
+licensors listed.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dri2/dri2.h:
+
+Copyright © 2007 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Soft-
+ware"), to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, provided that the above copyright
+notice(s) and this permission notice appear in all copies of the Soft-
+ware and that both the above copyright notice(s) and this permission
+notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+MANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization of
+the copyright holder.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/posix_tty.c:
+
+Copyright 1993-2003 by The XFree86 Project, 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 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 XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+Copyright (c) 1997  Metro Link Incorporated
+
+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 X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86VGAarbiter.h, hw/xfree86/common/xf86VGAarbiterPriv.h:
+
+Copyright (c) 2009 Tiago Vignatti
+
+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 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.
+
+--------------------------------------------------------------------
+
+hw/dmx/config/dmxcompat.c, hw/dmx/config/dmxcompat.h, hw/dmx/config/dmxconfig.h, hw/dmx/config/dmxparse.c, hw/dmx/config/dmxparse.h, hw/dmx/config/dmxprint.c, hw/dmx/config/dmxprint.h, hw/dmx/config/dmxtodmx.c, hw/dmx/config/vdltodmx.c, hw/dmx/config/xdmxconfig.c, hw/dmx/dmxstat.h, hw/dmx/dmxsync.h, hw/dmx/dmxvisual.h, hw/dmx/examples/ev.c, hw/dmx/examples/xbell.c, hw/dmx/input/ChkNotMaskEv.h, hw/dmx/input/dmxarg.h, hw/dmx/input/dmxbackend.h, hw/dmx/input/dmxconsole.h, hw/dmx/input/dmxdummy.c, hw/dmx/input/dmxdummy.h, hw/dmx/input/dmxinputinit.h, hw/dmx/input/dmxmotion.h, hw/dmx/input/usb-common.h, hw/dmx/input/usb-keyboard.h, hw/dmx/input/usb-mouse.c, hw/dmx/input/usb-mouse.h, hw/dmx/input/usb-other.c, hw/dmx/input/usb-other.h, hw/dmx/input/usb-private.h:
+
+Copyright 2002 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xi/xiselectev.c, Xi/xiselectev.h, Xi/xisetdevfocus.c, Xi/xisetdevfocus.h, os/backtrace.c:
+
+Copyright 2008 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86fbBus.c, hw/xfree86/os-support/int10Defines.h:
+
+Copyright (c) 2000-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+include/xserver-properties.h:
+
+Copyright 2008 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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+them 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 MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS 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.
+
+--------------------------------------------------------------------
+
+dix/getevents.c:
+
 Copyright © 2006 Nokia Corporation
-Copyright © 2006-2008 Peter Hutterer
-Copyright © 2006 Adam Jackson
-Copyright © 2010 Francisco Jerez
-Copyright © 2009 NVIDIA Corporation
-Copyright © 1999 Keith Packard
-Copyright © 2007-2009 Red Hat, Inc.
-Copyright © 2010 Yaakov Selkowitz
-Copyright © 2005-2008 Daniel Stone
-Copyright © 2006-2009 Simon Thum
-Copyright © 1987, 2003-2006, 2008-2009, Oracle and/or its affiliates.
-Copyright © 2006 Luc Verhaegen
+Copyright © 2006-2007 Daniel Stone
+Copyright © 2008 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.
+
+--------------------------------------------------------------------
+
+os/xprintf.c:
+
+Copyright (c) 2004 Alexander Gottwald
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -44,63 +299,318 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-
-
-
-The following licenses are 'legacy': usually MIT/X11 licenses with the name
-of the copyright holder(s) in the license statement, but also some BSD-like
-licenses.
-
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT 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.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
-
-
-Copyright 1997 by The XFree86 Project, Inc.
+--------------------------------------------------------------------
+
+os/strlcat.c, os/strlcpy.c:
+
+Copyright (c) 1998 Todd C. Miller <[email protected]>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/input/lnx-ms.c:
+
+Portions of this file were derived from the following files:
+
+Xserver/hw/kdrive/linux/ms.c
+
+Copyright (c) 2001 by Juliusz Chroboczek
+Copyright (c) 1999 by Keith Packard
+
+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 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.
+
+Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86xvpriv.h:
+
+Copyright (c) 2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/kdrive/src/kmode.c:
+
+Copyright 1999 SuSE, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of the XFree86 Project, Inc.
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The Xfree86
-Project, Inc. makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1985-1998, 2001  The Open Group
-Copyright 2002 Red Hat Inc., Durham, North Carolina.
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+xkb/maprules.c:
+
+Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/x86emu/debug.c, hw/xfree86/x86emu/decode.c, hw/xfree86/x86emu/fpu.c, hw/xfree86/x86emu/ops.c, hw/xfree86/x86emu/ops2.c, hw/xfree86/x86emu/prim_ops.c, hw/xfree86/x86emu/sys.c, hw/xfree86/x86emu/validate.c, hw/xfree86/x86emu/x86emu.h, hw/xfree86/x86emu/x86emu/debug.h, hw/xfree86/x86emu/x86emu/decode.h, hw/xfree86/x86emu/x86emu/fpu.h, hw/xfree86/x86emu/x86emu/fpu_regs.h, hw/xfree86/x86emu/x86emu/ops.h, hw/xfree86/x86emu/x86emu/prim_asm.h, hw/xfree86/x86emu/x86emu/prim_ops.h, hw/xfree86/x86emu/x86emu/regs.h, hw/xfree86/x86emu/x86emu/types.h, hw/xfree86/x86emu/x86emu/x86emui.h:
+
+Copyright (C) 1996-1999 SciTech Software, Inc.
+Copyright (C) David Mosberger-Tang
+Copyright (C) 1999 Egbert Eich
+
+========================================================================
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the authors not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  The authors makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+========================================================================
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Xinput.h:
+
+Copyright 1995-1999 by Frederic Lepied, France. <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is  hereby granted without fee, provided that
+the  above copyright   notice appear  in   all  copies and  that both  that
+copyright  notice   and   this  permission   notice  appear  in  supporting
+documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.     Frederic  Lepied   makes  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 2000-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/glxdri.c:
+
+Copyright © 2006 Red Hat, Inc
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat,
+Inc not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Red Hat, Inc makes no representations about the
+suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+Xext/syncsdk.h, miext/sync/misync.c, miext/sync/misync.h, miext/sync/misyncstr.h:
+
+Copyright © 2010 NVIDIA Corporation
+
+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.
+
+--------------------------------------------------------------------
+
+Xi/xiallowev.c, Xi/xiallowev.h, Xi/xigrabdev.c, Xi/xigrabdev.h, Xi/xipassivegrab.c, Xi/xipassivegrab.h, Xi/xiquerydevice.c, Xi/xiquerydevice.h, Xi/xiqueryversion.c, Xi/xiqueryversion.h, dix/eventconvert.c, include/eventconvert.h, include/events.h, include/eventstr.h, include/protocol-versions.h, test/input.c, test/xi2/protocol-common.c, test/xi2/protocol-common.h, test/xi2/protocol-eventconvert.c, test/xi2/protocol-xigetclientpointer.c, test/xi2/protocol-xigetselectedevents.c, test/xi2/protocol-xiquerydevice.c, test/xi2/protocol-xiquerypointer.c, test/xi2/protocol-xiqueryversion.c, test/xi2/protocol-xiselectevents.c, test/xi2/protocol-xisetclientpointer.c, test/xi2/protocol-xiwarppointer.c, test/xkb.c, test/xtest.c:
+
+Copyright © 2009 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.
+
+--------------------------------------------------------------------
+
+Xext/shape.c, Xext/shm.c, include/validate.h, mi/mifillarc.c, mi/mifillarc.h, mi/mipointer.c, mi/mipointer.h, mi/mipointrst.h, mi/misprite.c, mi/misprite.h, mi/mizerarc.c, mi/mizerarc.h:
+
+Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -122,15 +632,17 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
-Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium
-
-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:
+--------------------------------------------------------------------
+
+Xext/sleepuntil.c:
+
+Copyright 1992, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -138,160 +650,152 @@
 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
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+OPEN GROUP 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.
 
-Except as contained in this notice, the name of the X Consortium shall not be
+Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright © 1999-2000 SuSE, Inc.
-Copyright © 2007 Red Hat, Inc.
+in this Software without prior written authorization from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxinit.h, hw/dmx/input/dmxdetach.c, hw/xfree86/parser/Extensions.c:
+
+Copyright 2004 Red Hat Inc., Raleigh, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xi/xichangehierarchy.c:
+
+Copyright 2007-2008 Peter Hutterer
+Copyright 2009 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.
+
+--------------------------------------------------------------------
+
+tsol/tsolpolicy.h:
+
+Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bsd/bsd_bell.c:
+
+Copyright 1992 by Rich Murphey <[email protected]>
+Copyright 1993 by David Dawes <[email protected]>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+documentation, and that the names of Rich Murphey and David Dawes
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Rich Murphey and
+David Dawes make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
-Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+--------------------------------------------------------------------
+
+hw/dmx/dmxprop.h, hw/dmx/input/dmxcommon.h:
+
+Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
 
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997 Digital Equipment Corporation.
-All rights reserved.
-
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions.  Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-
-1) Any source code used, modified or distributed must reproduce and retain
-   this copyright notice and list of conditions as they appear in the
-   source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-   Equipment Corporation. Neither the "Digital Equipment Corporation"
-   name nor any trademark or logo of Digital Equipment Corporation may be
-   used to endorse or promote products derived from this software without
-   the prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-   including but not limited to, any implied warranties of merchantability,
-   fitness for a particular purpose, or non-infringement are disclaimed.
-   In no event shall DIGITAL be liable for any damages whatsoever, and in
-   particular, DIGITAL shall not be liable for special, indirect,
-   consequential, or incidental damages or damages for lost profits, loss
-   of revenue or loss of use, whether such damages arise in contract,
-   negligence, tort, under statute, in equity, at law or otherwise, even
-   if advised of the possibility of such damage.
-
-
-Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-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.
-
-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
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-
-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 including the dates of first publication and
-either this permission notice or a reference to
-http://oss.sgi.com/projects/FreeB/
-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
-SILICON GRAPHICS, INC. 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.
-
+--------------------------------------------------------------------
+
+dbe/dbe.c, dbe/dbestruct.h, dbe/midbe.c, dbe/midbe.h, dbe/midbestr.h:
 
 Copyright (c) 1994, 1995  Hewlett-Packard Company
 
@@ -319,30 +823,1301 @@
 sale, use or other dealings in this Software without prior written
 authorization from the Hewlett-Packard Company.
 
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_init.c:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1993 by David Wexelblat <[email protected]>
+Copyright 1999 by David Holland <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the names of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, AND IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+os/connection.c:
+
+Copyright 1987, 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmx-config.h, hw/xnest/xnest-config.h:
+
+Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/VTsw_noop.c, hw/xfree86/os-support/shared/VTsw_usl.c, hw/xfree86/os-support/shared/ioperm_noop.c:
+
+Copyright 1993 by David Wexelblat <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of David Wexelblat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  David Wexelblat makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+dix/dixfonts.c:
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+composite/compositeext.h:
+
+Copyright © 2009 NVIDIA Corporation
+
+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.
+
+--------------------------------------------------------------------
+
+dix/window.c:
+
+Copyright (c) 2006, 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.
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxcb.c, hw/dmx/dmxcmap.c, hw/dmx/dmxcursor.c, hw/dmx/dmxcursor.h, hw/dmx/dmxfont.c, hw/dmx/dmxfont.h, hw/dmx/dmxgc.c, hw/dmx/dmxgc.h, hw/dmx/dmxgcops.c, hw/dmx/dmxinit.c, hw/dmx/dmxpict.c, hw/dmx/dmxpict.h, hw/dmx/dmxpixmap.c, hw/dmx/dmxpixmap.h, hw/dmx/dmxscrinit.c, hw/dmx/dmxscrinit.h, hw/dmx/dmxwindow.c, hw/dmx/dmxwindow.h:
+
+Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+glx/dispatch.h, glx/indirect_dispatch.c, glx/indirect_dispatch.h, glx/indirect_dispatch_swap.c, glx/indirect_reqsize.c, glx/indirect_reqsize.h, glx/indirect_util.c, glx/indirect_util.h:
+
+(C) Copyright IBM Corporation 2005
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+exa/exa_offscreen.c:
+
+Copyright © 2003 Anders Carlsson
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Anders Carlsson not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Anders Carlsson makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/kdrive/src/kxv.c, hw/kdrive/src/kxv.h:
+
+Copyright (C) 2000, 2001 - Nokia Home Communications
+Copyright (C) 1998, 1999 - The XFree86 Project Inc.
+
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------
+
+hw/kdrive/ephyr/ephyrdri.c, hw/kdrive/ephyr/ephyrdri.h, hw/kdrive/ephyr/ephyrdriext.c, hw/kdrive/ephyr/ephyrdriext.h, hw/kdrive/ephyr/ephyrglxext.c, hw/kdrive/ephyr/ephyrglxext.h, hw/kdrive/ephyr/ephyrhostglx.c, hw/kdrive/ephyr/ephyrhostglx.h, hw/kdrive/ephyr/ephyrhostvideo.c, hw/kdrive/ephyr/ephyrhostvideo.h, hw/kdrive/ephyr/ephyrlog.h, hw/kdrive/ephyr/ephyrvideo.c:
+
+Copyright © 2007 OpenedHand Ltd
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of OpenedHand Ltd not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. OpenedHand Ltd makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+include/dixfont.h, include/dixfontstr.h, include/dixstruct.h:
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
 All Rights Reserved
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Hewlett-Packard not be
+supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
 
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+randr/randr.c:
+
+Copyright © 2000 Compaq Computer Corporation
+Copyright © 2002 Hewlett-Packard Company
+Copyright © 2006 Intel Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+os/strcasestr.c:
+
+Copyright (c) 1990, 1993
+The Regents of the University of California.  All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Chris Torek.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+4. Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/vgahw/vgaHW.c:
+
+Copyright 1991-1999 by The XFree86 Project, Inc.
+
+Loosely based on code bearing the following copyright:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/fourcc.h, hw/xfree86/os-support/shared/agp_noop.c:
+
+Copyright (c) 2000-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/ddc/interpret_edid.c, hw/xfree86/ddc/print_edid.c:
+
+Copyright 1998 by Egbert Eich <[email protected]>
+Copyright 2007 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.
+
+--------------------------------------------------------------------
+
+hw/kdrive/linux/tslib.c:
+
+Copyright © 1999 Keith Packard
+Copyright © 2000 Compaq Computer Corporation
+Copyright © 2002 MontaVista Software Inc.
+Copyright © 2005 OpenedHand Ltd.
+Copyright © 2006 Nokia Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the authors and/or copyright holders
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  The authors and/or
+copyright holders make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+include/misc.h:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
 ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
 WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-
-Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-Copyright (c) 2003 by the XFree86 Project, Inc.
-Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
+Copyright 1992, 1993 Data General Corporation;
+Copyright 1992, 1993 OMRON Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and that
+neither the name OMRON or DATA GENERAL be used in advertising or publicity
+pertaining to distribution of the software without specific, written prior
+permission of the party whose name is to be used.  Neither OMRON or
+DATA GENERAL make any representation about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied warranty.
+
+OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+randr/rrtransform.c, randr/rrtransform.h, render/matrix.c:
+
+Copyright © 2007 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bus/linuxPci.c:
+
+Copyright 1998 by Concurrent Computer Corporation
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Concurrent Computer
+Corporation not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Concurrent Computer Corporation makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright 1998 by Metro Link Incorporated
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Metro Link
+Incorporated not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Metro Link Incorporated makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/kdrive/ephyr/XF86dri.c, hw/kdrive/ephyr/xf86dri.h, hw/xfree86/dri/dri.c, hw/xfree86/dri/sarea.h, hw/xfree86/dri/xf86dri.c:
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+All Rights Reserved.
+
+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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86PciInfo.h:
+
+Copyright (c) 1995-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+composite/compalloc.c, composite/compext.c, composite/compinit.c, composite/compint.h, composite/compoverlay.c, composite/compwindow.c:
+
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+Copyright © 2003 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/InputClass.c:
+
+Copyright (c) 2009 Dan Nicholson
+
+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 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/iamodule.c:
+
+Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+Xi/xiproperty.c:
+
+Copyright © 2006 Keith Packard
+Copyright © 2008 Peter Hutterer
+
+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 WAXIANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WAXIANTIES 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bsd/arm_video.c:
+
+Copyright 1992 by Rich Murphey <[email protected]>
+Copyright 1993 by David Wexelblat <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Rich Murphey and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Rich Murphey and
+David Wexelblat make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The ARM32 code here carries the following copyright:
+
+Copyright 1997
+Digital Equipment Corporation. All rights reserved.
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+
+1) Any source code used, modified or distributed must reproduce and retain
+this copyright notice and list of conditions as they appear in the
+source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+Equipment Corporation. Neither the "Digital Equipment Corporation"
+name nor any trademark or logo of Digital Equipment Corporation may be
+used to endorse or promote products derived from this software without
+the prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+including but not limited to, any implied warranties of merchantability,
+fitness for a particular purpose, or non-infringement are disclaimed.
+In no event shall DIGITAL be liable for any damages whatsoever, and in
+particular, DIGITAL shall not be liable for special, indirect,
+consequential, or incidental damages or damages for lost profits, loss
+of revenue or loss of use, whether such damages arise in contract,
+negligence, tort, under statute, in equity, at law or otherwise, even
+if advised of the possibility of such damage.
+
+--------------------------------------------------------------------
+
+glx/glxdri2.c:
+
+Copyright © 2007 Red Hat, Inc
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat,
+Inc not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Red Hat, Inc makes no representations about the
+suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86gtf.c, hw/xfree86/utils/gtf/gtf.c:
+
+Copyright (c) 2001, Andy Ritger  [email protected]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+o Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+o Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+o Neither the name of NVIDIA nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+os/strcasecmp.c:
+
+Copyright (c) 1987, 1993
+The Regents of the University of California.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+4. Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+glx/glprocs.h:
+
+Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+(C) Copyright IBM Corporation 2004, 2006
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL, IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/loader/loadext.c, hw/xfree86/os-support/shared/kmod_noop.c, hw/xfree86/os-support/shared/pm_noop.c, hw/xfree86/os-support/shared/xf86Axp.c:
+
+Copyright (c) 2000 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+miext/rootless/rootless.h:
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/extmod/modinit.c:
+
+Copyright (c) 1997 Matthieu Herrb
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Matthieu Herrb not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Matthieu Herrb makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+dix/inpututils.c:
+
+Copyright © 2008 Daniel Stone
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Configure.c, hw/xfree86/common/xf86ShowOpts.c:
+
+Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmx.c, hw/dmx/dmxcmap.h, hw/dmx/dmxsync.c, hw/dmx/dmxvisual.c:
+
+Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
+
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -366,49 +2141,529 @@
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-
-Copyright © 2008 Red Hat, Inc.
-Partly based on code Copyright © 2000 SuSE, Inc.
+--------------------------------------------------------------------
+
+Xext/xcmisc.c, dix/pixmap.c, hw/vfb/InitInput.c, hw/vfb/InitOutput.c, mi/migc.c, mi/migc.h, mi/mivalidate.h:
+
+Copyright 1993, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+Xext/xf86bigfont.c:
+
+Copyright (c) 1999-2000  Bruno Haible
+Copyright (c) 1999-2000  The XFree86 Project, Inc.
+
+--------------------------------------------------------------------
+
+mi/micoord.h:
+
+Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+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
+XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+--------------------------------------------------------------------
+
+hw/xfree86/loader/loader.c:
+
+Copyright 1995-1998 by Metro Link, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Metro Link, Inc. not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Metro Link, Inc. makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 1997-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+mi/miwideline.c, mi/miwideline.h, os/auth.c, os/mitauth.c, os/xdmauth.c:
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bus/Pci.h, hw/xfree86/os-support/bus/xf86Pci.h:
+
+Copyright 1998 by Concurrent Computer Corporation
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Concurrent Computer
+Corporation not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Concurrent Computer Corporation makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright 1998 by Metro Link Incorporated
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Metro Link
+Incorporated not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Metro Link Incorporated makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+This file is derived in part from the original xf86_PCI.h that included
+following copyright message:
+
+Copyright 1995 by Robin Cutshaw <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of the above listed copyright holder(s)
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The above listed
+copyright holder(s) make(s) no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 1999-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+Xi/allowev.c, Xi/chgdctl.c, Xi/chgfctl.c, Xi/chgkbd.c, Xi/chgkmap.c, Xi/chgprop.c, Xi/chgptr.c, Xi/closedev.c, Xi/devbell.c, Xi/exevents.c, Xi/extinit.c, Xi/getbmap.c, Xi/getdctl.c, Xi/getfctl.c, Xi/getfocus.c, Xi/getkmap.c, Xi/getmmap.c, Xi/getprop.c, Xi/getselev.c, Xi/getvers.c, Xi/grabdev.c, Xi/grabdevb.c, Xi/grabdevk.c, Xi/gtmotion.c, Xi/listdev.c, Xi/opendev.c, Xi/selectev.c, Xi/setbmap.c, Xi/setdval.c, Xi/setfocus.c, Xi/setmmap.c, Xi/setmode.c, Xi/stubs.c, Xi/ungrdev.c, Xi/ungrdevb.c, Xi/ungrdevk.c:
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+glx/glxdricommon.c, glx/glxdricommon.h:
+
+Copyright © 2008 Red Hat, Inc
 
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without
 fee, provided that the above copyright notice appear in all copies
 and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Red Hat
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.  Red
-Hat makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
+appear in supporting documentation, and that the name of the
+copyright holders not be used in advertising or publicity
+pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied
 warranty.
 
-Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+miext/cw/cw.c, miext/cw/cw.h, miext/cw/cw_ops.c, miext/cw/cw_render.c:
+
+Copyright © 2004 Eric Anholt
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2006  Red Hat, Inc.
-(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+documentation, and that the name of Eric Anholt not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Eric Anholt makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+tsol/tsol.h, tsol/tsolextension.c, tsol/tsolinfo.h, tsol/tsolpolicy.c, tsol/tsolprotocol.c, tsol/tsolutils.c:
+
+Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_apm.c:
+
+Based on hw/xfree86/os-support/bsd/bsd_apm.c which bore no explicit
+copyright notice, so is covered by the following notice:
+
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+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 XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/kdrive/linux/mouse.c:
+
+Copyright © 2001 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/vgahw/vgaHWmodule.c:
+
+Copyright 1998 by The XFree86 Project, Inc
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86EdidModes.c:
+
+Copyright 2006 Luc Verhaegen.
+Copyright 2008 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, sub license,
+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 NON-INFRINGEMENT. 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/loader/loaderProcs.h, hw/xfree86/loader/loadmod.c:
+
+Copyright 1995-1998 by Metro Link, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Metro Link, Inc. not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Metro Link, Inc. makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 1997-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/glapioffsets.h, glx/glapitemp.h:
+
+Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+(C) Copyright IBM Corporation 2004
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -425,93 +2680,47 @@
 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS 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.
-
-
-Copyright (c) 1995  X Consortium
-Copyright 2004 Red Hat Inc., Durham, North Carolina.
-All Rights Reserved.
-
-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 on 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
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
-AND/OR THEIR SUPPLIERS 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.
-
-Except as contained in this notice, the name of the X Consortium
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written
-authorization from the X Consortium.
-
-
-Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-Copyright (c) 2003-2004 Torrey T. Lyons.
-All Rights Reserved.
-
-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, sub license, 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 NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-
-
-(C) Copyright IBM Corporation 2003
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS 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.
-
-
-(C) Copyright IBM Corporation 2004-2005
+BRIAN PAUL, IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/ddc/edid.h, hw/xfree86/ddc/xf86DDC.h:
+
+Copyright 1998 by Egbert Eich <[email protected]>
+
+--------------------------------------------------------------------
+
+hw/xfree86/xaa/xaaFillArc.c, hw/xfree86/xaa/xaaFillPoly.c:
+
+Copyright 1996  The XFree86 Project
+
+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
+HARM HANEMAAYER 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.
+
+--------------------------------------------------------------------
+
+glx/indirect_size.h, glx/indirect_size_get.c, glx/indirect_size_get.h:
+
+(C) Copyright IBM Corporation 2004
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -534,6 +2743,816 @@
 OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+--------------------------------------------------------------------
+
+hw/kdrive/linux/keyboard.c:
+
+Copyright © 1999 Keith Packard
+XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <[email protected]>
+
+LinuxKeyboardRead() XKB code based on xf86KbdLnx.c:
+Copyright © 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright © 1994-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/loader/loader.h:
+
+Copyright 1995-1998 by Metro Link, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Metro Link, Inc. not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Metro Link, Inc. makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 1997-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+mi/mieq.c:
+
+Copyright 1990, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+--------------------------------------------------------------------
+
+mi/micmap.c:
+
+Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+This is based on cfbcmap.c.  The functions here are useful independently
+of cfb, which is the reason for including them here.  How "mi" these
+are may be debatable.
+
+--------------------------------------------------------------------
+
+dix/events.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+Copyright (c) 2003-2005, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xorgVersion.h:
+
+Copyright (c) 2004, X.Org Foundation
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessValTree.c:
+
+Copyright 1987, 1988, 1989, 1998  The Open Group
+
+All Rights Reserved.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1988, 1989 by
+Digital Equipment Corporation, Maynard, Massachusetts,
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+dix/ffs.c:
+
+Copyright 1996, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
+SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL-
+ITY, 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/fbmodule.c:
+
+Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
+
+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
+XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+--------------------------------------------------------------------
+
+mi/mibstore.h:
+
+Copyright (c) 1987 by the Regents of the University of California
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies.  The University of California
+makes no representations about the suitability of this
+software for any purpose.  It is provided "as is" without
+express or implied warranty.
+
+--------------------------------------------------------------------
+
+hw/xfree86/i2c/xf86i2c.c, hw/xfree86/i2c/xf86i2c.h:
+
+Copyright (C) 1998 Itai Nahshon, Michael Schimek
+
+--------------------------------------------------------------------
+
+Xext/xcalibrate.c:
+
+Copyright © 2003 Philip Blundell
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Philip Blundell not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Philip Blundell makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/hurd/hurd_init.c:
+
+Copyright 1997,1998 by UCHIYAMA Yasushi
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of UCHIYAMA Yasushi not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86RandR.c, render/animcur.c, render/mitrap.c, render/mitri.c:
+
+Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/kdrive/src/kinput.c:
+
+Copyright © 1999 Keith Packard
+Copyright © 2006 Nokia Corporation
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the authors not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The authors make no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/examples/dmxwininfo.c:
+
+Copyright (c) 2003 by the XFree86 Project, Inc.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86InPriv.h:
+
+Copyright (c) 1999 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+dix/grabs.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN action OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxdpms.h, hw/dmx/examples/dmxreconfig.c, hw/dmx/examples/dmxresize.c, hw/dmx/examples/evi.c, hw/dmx/examples/res.c, hw/dmx/examples/xled.c, hw/dmx/examples/xtest.c, hw/dmx/input/dmxmap.c, hw/dmx/input/dmxmap.h:
+
+Copyright 2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xext/security.c:
+
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86VidMode.c, hw/xfree86/common/xf86pciBus.h, hw/xfree86/os-support/shared/sigiostubs.c:
+
+Copyright (c) 1999-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/glapitable.h:
+
+Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+(C) Copyright IBM Corporation 2004
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL, IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86cmap.c, hw/xfree86/common/xf86cmap.h, hw/xfree86/common/xf86fbman.c, hw/xfree86/common/xf86fbman.h:
+
+Copyright (c) 1998-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/dmx/input/usb-keyboard.c:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Thomas Roell not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Thomas Roell makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/vgahw/vgaHW.h:
+
+Copyright (c) 1997,1998 The XFree86 Project, Inc.
+
+Loosely based on code bearing the following copyright:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/xf86Optrec.h:
 
 Copyright (c) 1997  Metro Link Incorporated
 
@@ -559,53 +3578,115 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from Metro Link.
 
-
-Copyright 1995-1998 by Metro Link, Inc.
-Copyright (c) 1997 Matthieu Herrb
+Copyright (c) 1997-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+Xi/queryst.c:
+
+Copyright 1998, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of Metro Link, Inc. not be used in
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/ddc/ddcProperty.c:
+
+Copyright 2006 Luc Verhaegen.
+
+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, sub license,
+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 NON-INFRINGEMENT. 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/hurd/hurd_video.c:
+
+Copyright 1997, 1998 by UCHIYAMA Yasushi
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of UCHIYAMA Yasushi not be used in
 advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Metro Link, Inc. makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 1998 by Metro Link Incorporated
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Metro Link
-Incorporated not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Metro Link Incorporated makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86xv.c:
+
+XFree86 Xv DDX written by Mark Vojkovich ([email protected])
+
+Copyright (c) 1998-2003 by The XFree86 Project, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -620,115 +3701,446 @@
 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
-CONECTIVA LINUX 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.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
-
-
-Copyright (c) 2001, Andy Ritger  [email protected]
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-o Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-o Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-o Neither the name of NVIDIA nor the names of its contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright 1992 Vrije Universiteit, The Netherlands
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
+THE COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/extension_string.c, glx/extension_string.h:
+
+(C) Copyright IBM Corporation 2002-2006
+All Rights Reserved.
+
+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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
+
+Routines to manage the GLX extension string and GLX version for AIGLX
+drivers.  This code is loosely based on src/glx/x11/glxextensions.c from
+Mesa.
+
+--------------------------------------------------------------------
+
+fb/fbtrap.c, hw/kdrive/fake/fake.c, hw/kdrive/fake/fake.h, hw/kdrive/fake/fakeinit.c, hw/kdrive/fake/mouse.c, hw/kdrive/fake/os.c, hw/kdrive/linux/evdev.c:
+
+Copyright © 2004 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of the Vrije Universiteit not be used in
+documentation, and that the name of Keith Packard not be used in
 advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The Vrije Universiteit makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 1998 by Concurrent Computer Corporation
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Concurrent Computer
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Concurrent Computer Corporation makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2004 Nokia
+--------------------------------------------------------------------
+
+xkb/xkbUtils.c:
+
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright © 2008 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86DisplayIDModes.c:
+
+Copyright 2009 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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+them 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 MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS 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.
+
+--------------------------------------------------------------------
+
+dix/selection.c, include/resource.h, os/io.c:
+
+Copyright 1987, 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of Nokia not be used in
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/xf86OSpriv.h:
+
+Copyright (c) 1999-2000 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/vgahw/vgaCmap.c:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Thomas Roell not be used in
 advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Nokia makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+specific, written prior permission.  Thomas Roell makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-(c)Copyright 1988,1991 Adobe Systems Incorporated.
-All rights reserved.
+--------------------------------------------------------------------
+
+hw/dmx/dmx.h, hw/dmx/input/dmxbackend.c, hw/dmx/input/dmxcommon.c, hw/dmx/input/dmxconsole.c:
+
+Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86Crtc.h, hw/xfree86/modes/xf86DiDGA.c, hw/xfree86/modes/xf86RandR12.h, hw/xfree86/modes/xf86Rename.h, hw/xfree86/modes/xf86Rotate.c, randr/rrcrtc.c, randr/rrdispatch.c, randr/rrinfo.c, randr/rrmode.c, randr/rrpointer.c, randr/rrproperty.c, randr/rrscreen.c, randr/rrsdispatch.c:
+
+Copyright © 2006 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86.h, hw/xfree86/common/xf86Bus.c, hw/xfree86/common/xf86Bus.h, hw/xfree86/common/xf86DPMS.c, hw/xfree86/common/xf86Globals.c, hw/xfree86/common/xf86Helper.c, hw/xfree86/common/xf86Module.h, hw/xfree86/common/xf86Privstr.h, hw/xfree86/common/xf86pciBus.c, hw/xfree86/common/xf86str.h, hw/xfree86/modes/xf86Modes.c:
+
+Copyright (c) 1997-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessWindow.h:
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+Xi/sendexev.c:
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Request to send an extension event.
+
+--------------------------------------------------------------------
+
+dix/dixutils.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+(c)Copyright 1988,1991 Adobe Systems Incorporated. All rights reserved.
 
 Permission to use, copy, modify, distribute, and sublicense this software and its
 documentation for any purpose and without fee is hereby granted, provided that
@@ -758,6 +4170,975 @@
 Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
 Incorporated which may be registered in certain jurisdictions.
 
+--------------------------------------------------------------------
+
+os/log.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+Copyright 1994 Quarterdeck Office Systems.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital and
+Quarterdeck not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 1997-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/Device.c, hw/xfree86/parser/Files.c, hw/xfree86/parser/Flags.c, hw/xfree86/parser/Input.c, hw/xfree86/parser/Layout.c, hw/xfree86/parser/Module.c, hw/xfree86/parser/Monitor.c, hw/xfree86/parser/Pointer.c, hw/xfree86/parser/Screen.c, hw/xfree86/parser/Vendor.c, hw/xfree86/parser/Video.c, hw/xfree86/parser/read.c, hw/xfree86/parser/scan.c, hw/xfree86/parser/write.c, hw/xfree86/parser/xf86Parser.h, hw/xfree86/parser/xf86tokens.h:
+
+Copyright (c) 1997  Metro Link Incorporated
+
+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 X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+Copyright (c) 1997-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Init.c:
+
+Loosely based on code bearing the following copyright:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+Copyright (c) 1992-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+Xext/xres.c:
+
+Copyright (c) 2002  XFree86 Inc
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/ia64Pci.c:
+
+Copyright (C) 2002-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+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
+XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_agp.c:
+
+Copyright © 2000 VA Linux Systems, Inc.
+Copyright © 2001 The XFree86 Project, Inc.
+
+Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/i2c/uda1380.c, hw/xfree86/i2c/uda1380.h:
+
+Copyright (C) 2005 Bogdan D. [email protected]
+
+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 AUTHOR 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.
+
+Except as contained in this notice, the name of the author shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Software without prior written
+authorization from the author.
+
+--------------------------------------------------------------------
+
+miext/shadow/shrotpackYX.h:
+
+Copyright © 2004 Philip Blundell
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Philip Blundell not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Philip Blundell makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+dix/main.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+include/opaque.h, mi/mipoly.h, mi/miscanfill.h:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Config.c:
+
+Loosely based on code bearing the following copyright:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+
+Copyright 1992-2003 by The XFree86 Project, Inc.
+Copyright 1997 by Metro Link, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxcb.h, hw/dmx/dmxgcops.h, hw/dmx/dmxinput.c, hw/dmx/dmxinput.h, hw/dmx/examples/dmxinfo.c, hw/dmx/examples/xinput.c:
+
+Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/dmx/config/Canvas.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 2002 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+tsol/tsolextension.h:
+
+Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bsd/alpha_video.c, hw/xfree86/os-support/bsd/bsd_init.c, hw/xfree86/os-support/bsd/i386_video.c, hw/xfree86/os-support/bsd/ppc_video.c, hw/xfree86/os-support/bsd/sparc64_video.c:
+
+Copyright 1992 by Rich Murphey <[email protected]>
+Copyright 1993 by David Wexelblat <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Rich Murphey and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Rich Murphey and
+David Wexelblat make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/x86emu/x86emu/prim_x86_gcc.h:
+
+Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
+
+========================================================================
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the authors not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  The authors makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+========================================================================
+
+--------------------------------------------------------------------
+
+os/access.c:
+
+Copyright 1987, 1998  The Open Group
+
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+X Window System is a trademark of The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/ramdac/BT.c, hw/xfree86/ramdac/IBM.c, hw/xfree86/ramdac/TI.c, hw/xfree86/ramdac/xf86RamDac.c, hw/xfree86/ramdac/xf86RamDacCmap.c:
+
+Copyright 1998 by Alan Hourihane, Wigan, England.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/kdrive/ephyr/ephyr.c, hw/kdrive/ephyr/ephyr.h, hw/kdrive/ephyr/ephyrinit.c, hw/kdrive/ephyr/hostx.c, hw/kdrive/ephyr/hostx.h, hw/kdrive/ephyr/os.c:
+
+Copyright © 2004 Nokia
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Nokia not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Nokia makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/xaa/xaaOverlayDF.c:
+
+Copyright (c) 1999 - The XFree86 Project Inc.
+
+Written by Mark Vojkovich
+
+--------------------------------------------------------------------
+
+mi/miscrinit.c:
+
+Copyright 1990, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86Cursors.c:
+
+Copyright © 2007 Keith Packard
+Copyright © 2010 Aaron Plattner
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/tsolmodule.c:
+
+Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessCommon.h:
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+glx/indirect_table.c, glx/indirect_table.h, glx/indirect_texture_compression.c:
+
+(C) Copyright IBM Corporation 2005, 2006
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+IBM,
+AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/dmx/input/ChkNotMaskEv.c:
+
+Copyright 1985, 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xext/xf86bigfontsrv.h:
+
+Copyright © 2010 Yaakov Selkowitz
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86xvmc.c:
+
+Copyright (c) 2001-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/dmx/glxProxy/glxswap.c, hw/dmx/glxProxy/glxswap.h:
+
+Copyright 2003 Red Hat Inc., Raleigh, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+os/xdmcp.c:
 
 Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
 
@@ -771,90 +5152,409 @@
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 
-
-Copyright (c) 1987 by the Regents of the University of California
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies.  The University of California
-makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used.  Neither OMRON or
-DATA GENERAL make any representation about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright © 1998-2004, 2006 Keith Packard
-Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-Copyright (c) 2003 Torrey T. Lyons.
-All Rights Reserved.
+--------------------------------------------------------------------
+
+dix/resource.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+XSERVER_DTRACE additions:
+Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Priv.h:
+
+Copyright (c) 1997-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_VTsw.c:
+
+Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+mi/mivaltree.c:
+
+Copyright 1987, 1988, 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 1999 Keith Packard
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 MontaVista Software Inc.
-Copyright © 2005 OpenedHand Ltd.
-Copyright © 2006 Nokia Corporation
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1988, 1989 by
+Digital Equipment Corporation, Maynard, Massachusetts,
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+Xext/sleepuntil.h:
+
+Copyright (C) 2001 The XFree86 Project, Inc.  All Rights Reserved.
+
+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
+XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86PM.c, hw/xfree86/common/xf86noBus.c:
+
+Copyright (c) 2000-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bus/Pci.c:
+
+Copyright 1998 by Concurrent Computer Corporation
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Concurrent Computer
+Corporation not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Concurrent Computer Corporation makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright 1998 by Metro Link Incorporated
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Metro Link
+Incorporated not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Metro Link Incorporated makes no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+This software is derived from the original XFree86 PCI code
+which includes the following copyright notices as well:
+
+Copyright 1995 by Robin Cutshaw <[email protected]>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of the authors and/or copyright holders
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  The authors and/or
-copyright holders make no representations about the suitability of this
+documentation, and that the names of the above listed copyright holder(s)
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The above listed
+copyright holder(s) make(s) no representations about the suitability of this
 software for any purpose.  It is provided "as is" without express or
 implied warranty.
 
-THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
 TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+This code is also based heavily on the code in FreeBSD-current, which was
+written by Wolfgang Stanglmeier, and contains the following copyright:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xnest/Args.c, hw/xnest/Args.h, hw/xnest/Color.c, hw/xnest/Color.h, hw/xnest/Cursor.c, hw/xnest/Display.c, hw/xnest/Display.h, hw/xnest/Drawable.h, hw/xnest/Events.c, hw/xnest/Events.h, hw/xnest/Font.c, hw/xnest/GC.c, hw/xnest/GCOps.c, hw/xnest/GCOps.h, hw/xnest/Handlers.c, hw/xnest/Handlers.h, hw/xnest/Init.c, hw/xnest/Init.h, hw/xnest/Keyboard.c, hw/xnest/Keyboard.h, hw/xnest/Pixmap.c, hw/xnest/Pointer.c, hw/xnest/Pointer.h, hw/xnest/Screen.c, hw/xnest/Screen.h, hw/xnest/Visual.c, hw/xnest/Visual.h, hw/xnest/Window.c, hw/xnest/XNCursor.h, hw/xnest/XNFont.h, hw/xnest/XNGC.h, hw/xnest/XNPixmap.h, hw/xnest/XNWindow.h:
 
 Copyright 1993 by Davor Matic
 
@@ -866,17 +5566,200 @@
 the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
-
-Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86VGAarbiter.c:
+
+This code was stolen from RAC and adapted to control the legacy vga
+interface.
+
+Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+
+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 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.
+
+--------------------------------------------------------------------
+
+mi/mispans.c, mi/mispans.h:
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+glx/glapi.c, glx/glthread.c, glx/glthread.h:
+
+Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+
+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
+BRIAN PAUL 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/hurd/hurd_bell.c, hw/xfree86/os-support/linux/lnx_bell.c:
+
+Copyright © 2006 Daniel Stone
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Cursor.c:
+
+Copyright (c) 1994-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bus/bsd_pci.c:
+
+Copyright © 2007 Intel Corporation
+
+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.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxclient.h:
+
+Copyright (c) 1995  X Consortium
+Copyright 2004 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
 
 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:
+without limitation on 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.
@@ -884,16 +5767,292 @@
 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 HAROLD L HUNT II 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.
-
-Except as contained in this notice, the name of Harold L Hunt II
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Harold L Hunt II.
-
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
+AND/OR THEIR SUPPLIERS 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.
+
+Except as contained in this notice, the name of the X Consortium
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the X Consortium.
+
+--------------------------------------------------------------------
+
+config/udev.c:
+
+Copyright © 2009 Julien Cristau
+
+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.
+
+--------------------------------------------------------------------
+
+randr/rrxinerama.c:
+
+Copyright © 2006 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+This Xinerama implementation comes from the SiS driver which has
+the following notice:
+
+SiS driver main code
+
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1) Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3) The name of the author may not be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/bios_devmem.c, hw/xfree86/os-support/shared/bios_mmap.c:
+
+Copyright 1993 by David Wexelblat <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of David Wexelblat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  David Wexelblat makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+Xext/securitysrv.h:
+
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+Xext/sync.c:
+
+Copyright 1991, 1993, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  Digital and Olivetti
+make no representations about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied warranty.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+exa/exa.h:
+
+Copyright (C) 2000 Keith Packard
+2004 Eric Anholt
+2005 Zack Rusin
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of copyright holders not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Copyright holders make no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/xf86_OSproc.h:
+
+Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1992 by David Dawes <[email protected]>
+Copyright 1992 by Jim Tsillas <[email protected]>
+Copyright 1992 by Rich Murphey <[email protected]>
+Copyright 1992 by Robert Baron <[email protected]>
+Copyright 1992 by Orest Zborowski <[email protected]>
+Copyright 1993 by Vrije Universiteit, The Netherlands
+Copyright 1993 by David Wexelblat <[email protected]>
+Copyright 1994, 1996 by Holger Veit <[email protected]>
+Copyright 1994-2003 by The XFree86 Project, Inc
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of the above listed copyright holders
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  The above listed
+copyright holders make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The ARM32 code here carries the following copyright:
+
+Copyright 1997
+Digital Equipment Corporation. All rights reserved.
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+
+1) Any source code used, modified or distributed must reproduce and retain
+this copyright notice and list of conditions as they appear in the
+source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+Equipment Corporation. Neither the "Digital Equipment Corporation"
+name nor any trademark or logo of Digital Equipment Corporation may be
+used to endorse or promote products derived from this software without
+the prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+including but not limited to, any implied warranties of merchantability,
+fitness for a particular purpose, or non-infringement are disclaimed.
+In no event shall DIGITAL be liable for any damages whatsoever, and in
+particular, DIGITAL shall not be liable for special, indirect,
+consequential, or incidental damages or damages for lost profits, loss
+of revenue or loss of use, whether such damages arise in contract,
+negligence, tort, under statute, in equity, at law or otherwise, even
+if advised of the possibility of such damage.
+
+--------------------------------------------------------------------
+
+hw/dmx/input/atKeynames.h, hw/xfree86/common/compiler.h, hw/xfree86/common/xf86Events.c:
 
 Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
 
@@ -915,29 +6074,182 @@
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <[email protected]>
+Copyright (c) 1994-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+Xi/allowev.h, Xi/chgdctl.h, Xi/chgfctl.h, Xi/chgkbd.h, Xi/chgkmap.h, Xi/chgprop.h, Xi/chgptr.h, Xi/closedev.h, Xi/devbell.h, Xi/exglobals.h, Xi/getbmap.h, Xi/getdctl.h, Xi/getfctl.h, Xi/getfocus.h, Xi/getkmap.h, Xi/getmmap.h, Xi/getprop.h, Xi/getselev.h, Xi/getvers.h, Xi/grabdev.h, Xi/grabdevb.h, Xi/grabdevk.h, Xi/gtmotion.h, Xi/listdev.h, Xi/opendev.h, Xi/queryst.h, Xi/selectev.h, Xi/sendexev.h, Xi/setbmap.h, Xi/setdval.h, Xi/setfocus.h, Xi/setmmap.h, Xi/setmode.h, Xi/ungrdev.h, Xi/ungrdevb.h, Xi/ungrdevk.h, dix/dispatch.h, include/XIstubs.h, include/dixevents.h, include/dixgrabs.h, include/exevents.h, include/extinit.h, include/swaprep.h, include/swapreq.h:
+
+Copyright 1996 by Thomas E. Dickey <[email protected]>
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+fb/fbpict.c:
+
+Copyright © 2000 SuSE, Inc.
+Copyright © 2007 Red Hat, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the names of Thomas Roell and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Thomas Roell and
-David Wexelblat makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+--------------------------------------------------------------------
+
+hw/xfree86/common/xisb.c, hw/xfree86/common/xisb.h:
+
+Copyright (c) 1997  Metro Link Incorporated
+
+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 X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+--------------------------------------------------------------------
+
+exa/exa_unaccel.c, hw/kdrive/fake/kbd.c, hw/kdrive/fbdev/fbdev.c, hw/kdrive/fbdev/fbdev.h, hw/kdrive/fbdev/fbinit.c, hw/kdrive/linux/linux.c, hw/kdrive/linux/ps2.c, hw/kdrive/src/kcmap.c, hw/kdrive/src/kdrive.c, hw/kdrive/src/kdrive.h, hw/kdrive/src/kinfo.c, hw/kdrive/src/kshadow.c, render/mipict.c:
+
+Copyright © 1999 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Mode.c:
+
+Copyright (c) 1997-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+LCM() and scanLineWidth() are:
+
+Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of Marc Aurele La France not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Marc Aurele La France makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as-is" without express or implied warranty.
+
+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 
 Copyright 1990,91,92,93 by Thomas Roell, Germany.
 Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.
@@ -961,28 +6273,2762 @@
 CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 1998 by Alan Hourihane, Wigan, England.
-Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+--------------------------------------------------------------------
+
+hw/dmx/input/lnx-ps2.c:
+
+Portions of this file were derived from the following files:
+
+Xserver/hw/kdrive/linux/ps2.c
+
+Copyright (c) 1999 by Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2001,2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+mi/miexpose.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+xfixes/cursor.c, xfixes/xfixes.c, xfixes/xfixesint.h:
+
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+Copyright © 2002 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dri/drimodule.c:
+
+Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessCommon.c:
+
+Common rootless definitions and code
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
+Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+glx/indirect_program.c:
+
+(C) Copyright IBM Corporation 2005, 2006
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+exa/exa.c, exa/exa_accel.c, exa/exa_render.c:
+
+Copyright © 2001 Keith Packard
+
+Partly based on code that is Copyright © The XFree86 Project Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/ddc/ddc.c:
+
+Copyright 1998,1999 by Egbert Eich <[email protected]>
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/glxmodule.c, hw/xfree86/dri/dri.h, hw/xfree86/dri/dristruct.h:
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+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, sub license, 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 NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+Xext/syncsrv.h:
+
+Copyright 1991, 1993, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+Xext/saver.c:
+
+Copyright (c) 1992  X Consortium
+
+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
+X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/sigio.c:
+
+Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+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
+PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+Copyright (c) 2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/glxbyteorder.h:
+
+(C) Copyright IBM Corporation 2006, 2007
+All Rights Reserved.
+
+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, sub license,
+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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86sbusBus.c, hw/xfree86/common/xf86sbusBus.h, hw/xfree86/os-support/bus/Sbus.c, hw/xfree86/os-support/bus/xf86Sbus.h:
+
+Copyright (C) 2000 Jakub Jelinek ([email protected])
+
+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
+JAKUB JELINEK 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.
+
+--------------------------------------------------------------------
+
+glx/glapi.h:
+
+Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+
+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
+BRIAN PAUL 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/xkbKillSrv.c, hw/xfree86/dixmods/xkbVT.c, include/xkbsrv.h, include/xkbstr.h, xkb/XKBAlloc.c, xkb/XKBGAlloc.c, xkb/XKBMAlloc.c, xkb/XKBMisc.c, xkb/ddxBeep.c, xkb/ddxCtrls.c, xkb/ddxKillSrv.c, xkb/ddxLEDs.c, xkb/ddxLoad.c, xkb/ddxVT.c, xkb/xkb.c, xkb/xkbAccessX.c, xkb/xkbActions.c, xkb/xkbEvents.c, xkb/xkbInit.c, xkb/xkbPrKeyEv.c, xkb/xkbSwap.c, xkb/xkbgeom.h:
+
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+miext/shadow/shrotate.c, render/miindex.c:
+
+Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/examples/dmxaddinput.c, hw/dmx/examples/dmxrminput.c:
+
+Copyright 2003,2004 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+exa/exa_migration_classic.c, hw/kdrive/ephyr/ephyr_draw.c, hw/xfree86/exa/examodule.c, hw/xfree86/modes/xf86Modes.h:
+
+Copyright © 2006 Intel Corporation
+
+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.
+
+--------------------------------------------------------------------
+
+dix/region.c:
+
+Copyright 1987, 1988, 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1988, 1989 by
+Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+exa/exa_priv.h:
+
+Copyright (C) 2000 Keith Packard, member of The XFree86 Project, Inc.
+2005 Zack Rusin, Trolltech
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/DRI.c:
+
+Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+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
+PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/vbe/vbeModes.h:
+
+Copyright © 2002 David Dawes
+
+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 AUTHOR(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.
+
+Except as contained in this notice, the name of the author(s) shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from
+the author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Xinput.c:
+
+Copyright 1995-1999 by Frederic Lepied, France. <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is  hereby granted without fee, provided that
+the  above copyright   notice appear  in   all  copies and  that both  that
+copyright  notice   and   this  permission   notice  appear  in  supporting
+documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.     Frederic  Lepied   makes  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) 2000-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+glx/glxcmds.c, glx/glxcmdsswap.c, glx/glxext.c, glx/glxscreens.c, glx/render2.c, glx/render2swap.c, glx/renderpix.c, glx/renderpixswap.c, glx/rensize.c, glx/single2.c, glx/single2swap.c, glx/singlepix.c, glx/singlepixswap.c, glx/singlesize.c, glx/xfont.c, hw/dmx/dmx_glxvisuals.c, hw/dmx/dmx_glxvisuals.h, hw/dmx/glxProxy/compsize.c, hw/dmx/glxProxy/g_disptab.c, hw/dmx/glxProxy/g_renderswap.c, hw/dmx/glxProxy/global.c, hw/dmx/glxProxy/glxcmds.c, hw/dmx/glxProxy/glxcmdsswap.c, hw/dmx/glxProxy/glxext.c, hw/dmx/glxProxy/glxfbconfig.c, hw/dmx/glxProxy/glxfbconfig.h, hw/dmx/glxProxy/glxscreens.c, hw/dmx/glxProxy/glxsingle.c, hw/dmx/glxProxy/glxsingle.h, hw/dmx/glxProxy/glxutil.c, hw/dmx/glxProxy/glxvendor.c, hw/dmx/glxProxy/glxvendor.h, hw/dmx/glxProxy/glxvisuals.c, hw/dmx/glxProxy/glxvisuals.h, hw/dmx/glxProxy/render2swap.c, hw/dmx/glxProxy/renderpixswap.c:
+
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+
+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 including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/
+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
+SILICON GRAPHICS, INC. 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.
+
+Except as contained in this notice, the name of Silicon Graphics, Inc.
+shall not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+Silicon Graphics, Inc.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dri2/dri2.c:
+
+Copyright © 2007, 2008 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Soft-
+ware"), to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, provided that the above copyright
+notice(s) and this permission notice appear in all copies of the Soft-
+ware and that both the above copyright notice(s) and this permission
+notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+MANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization of
+the copyright holder.
+
+--------------------------------------------------------------------
+
+Xi/xiproperty.h:
+
+Copyright © 2008 Peter Hutterer
+
+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.
+
+--------------------------------------------------------------------
+
+glx/glxdriswrast.c:
+
+Copyright © 2008 George Sapountzis <[email protected]>
+Copyright © 2008 Red Hat, Inc
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of the
+copyright holders not be used in advertising or publicity
+pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied
+warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxdpms.c, hw/dmx/dmxextension.c, hw/dmx/dmxextension.h, hw/dmx/examples/dmxaddscreen.c, hw/dmx/examples/dmxrmscreen.c:
+
+Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xext/geext.c, Xext/geint.h, Xi/xichangecursor.c, Xi/xichangecursor.h, Xi/xichangehierarchy.h, Xi/xigetclientpointer.c, Xi/xigetclientpointer.h, Xi/xiquerypointer.c, Xi/xiquerypointer.h, Xi/xisetclientpointer.c, Xi/xisetclientpointer.h, Xi/xiwarppointer.c, Xi/xiwarppointer.h:
+
+Copyright 2007-2008 Peter Hutterer
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86xvmc.h:
+
+Copyright (c) 2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/int10/generic.c, hw/xfree86/int10/helper_exec.c, hw/xfree86/int10/helper_mem.c, hw/xfree86/int10/stub.c, hw/xfree86/int10/xf86int10.c, hw/xfree86/int10/xf86int10.h, hw/xfree86/int10/xf86int10module.c, hw/xfree86/int10/xf86x86emu.c, hw/xfree86/int10/xf86x86emu.h:
+
+Copyright 1999 Egbert Eich
+
+--------------------------------------------------------------------
+
+fb/fb24_32.c, fb/fb24_32.h, fb/fboverlay.c, fb/fboverlay.h, render/glyph.c, render/glyphstr.h, render/mipict.h, render/picture.c, render/picture.h, render/picturestr.h, render/render.c:
+
+Copyright © 2000 SuSE, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/configProcs.h:
+
+Copyright (c) 1997-2001 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86RandR12.c:
+
+Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Config.h:
+
+Copyright (c) 1997-2000 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+Xext/xvdisp.c, Xext/xvdix.h, Xext/xvmain.c:
+
+Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+config/hal.c:
+
+Copyright © 2007 Daniel Stone
+Copyright © 2007 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.
+
+--------------------------------------------------------------------
+
+randr/randrstr.h:
+
+Copyright © 2000 Compaq Computer Corporation
+Copyright © 2002 Hewlett-Packard Company
+Copyright © 2006 Intel Corporation
+Copyright © 2008 Red Hat, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+exa/exa_glyphs.c:
+
+Copyright © 2008 Red Hat, Inc.
+Partly based on code Copyright © 2000 SuSE, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Red Hat not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Red Hat makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Red Hat
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  SuSE makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxlog.c, hw/dmx/dmxlog.h, hw/dmx/dmxshadow.c, hw/dmx/dmxshadow.h, hw/dmx/input/dmxevents.h, hw/dmx/input/dmxsigio.h, hw/dmx/input/lnx-keyboard.h, hw/dmx/input/lnx-ms.h, hw/dmx/input/lnx-ps2.h:
+
+Copyright 2001 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/extmod/xf86dga2.c:
+
+Copyright (c) 1995  Jon Tombs
+Copyright (c) 1995, 1996, 1999  XFree86 Inc
+Copyright (c) 1999 - The XFree86 Project Inc.
+
+Written by Mark Vojkovich
+
+--------------------------------------------------------------------
+
+os/utils.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+Copyright 1994 Quarterdeck Office Systems.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital and
+Quarterdeck not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/shmodule.c, miext/shadow/shadow.c, miext/shadow/shadow.h, miext/shadow/shalloc.c, miext/shadow/shpacked.c, miext/shadow/shplanar.c, miext/shadow/shplanar8.c, miext/shadow/shrot16pack.c, miext/shadow/shrot16pack_180.c, miext/shadow/shrot16pack_270.c, miext/shadow/shrot16pack_90.c, miext/shadow/shrot32pack.c, miext/shadow/shrot32pack_180.c, miext/shadow/shrot32pack_270.c, miext/shadow/shrot32pack_90.c, miext/shadow/shrot8pack.c, miext/shadow/shrot8pack_180.c, miext/shadow/shrot8pack_270.c, miext/shadow/shrot8pack_90.c, miext/shadow/shrotpack.h:
+
+Copyright © 2000 Keith Packard
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/parser/Configint.h:
+
+Copyright (c) 1997  Metro Link Incorporated
+
+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 X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+Copyright (c) 1997-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+mi/miline.h:
+
+Copyright 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessWindow.c:
+
+Rootless window management
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
+Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+Xext/geext.h:
+
+Copyright 2007 Peter Hutterer <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 AUTHOR 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.
+
+Except as contained in this notice, the name of the author shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the author.
+
+--------------------------------------------------------------------
+
+glx/swap_interval.c:
+
+(C) Copyright IBM Corporation 2006
+All Rights Reserved.
+
+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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
+
+--------------------------------------------------------------------
+
+include/extnsionst.h:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------
+
+Xext/shmint.h, miext/damage/damage.c, miext/damage/damage.h, miext/damage/damagestr.h, xfixes/region.c:
+
+Copyright © 2003 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
 advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+exa/exa_classic.c, exa/exa_driver.c, exa/exa_migration_mixed.c, exa/exa_mixed.c:
+
+Copyright © 2009 Maarten Maathuis
+
+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.
+
+--------------------------------------------------------------------
+
+miext/shadow/shrot16pack_270YX.c, miext/shadow/shrot16pack_90YX.c:
+
+Copyright  2000 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xnest/Xnest.h:
+
+Copyright (c) 1995  X Consortium
+
+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 X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
+
+--------------------------------------------------------------------
+
+Xext/panoramiX.c, Xext/panoramiX.h, Xext/panoramiXSwap.c, Xext/panoramiXprocs.c:
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+hw/dmx/dmxstat.c:
+
+Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+config/config-backends.h, config/config.c, config/dbus-core.c, config/dbus.c, include/hotplug.h:
+
+Copyright © 2006-2007 Daniel Stone
+
+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.
+
+--------------------------------------------------------------------
+
+Xext/xselinux_hooks.c:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+Portions of this code copyright (c) 2005 by Trusted Computer Solutions, Inc.
+All rights reserved.
+
+--------------------------------------------------------------------
+
+dix/atom.c, dix/colormap.c, dix/cursor.c, dix/deprecated.c, dix/devices.c, dix/extension.c, dix/gc.c, dix/globals.c, dix/glyphcurs.c, dix/property.c, dix/swaprep.c, dix/swapreq.c, dix/tables.c, include/callback.h, include/closure.h, include/colormap.h, include/colormapst.h, include/cursor.h, include/cursorstr.h, include/dix.h, include/extension.h, include/gc.h, include/gcstruct.h, include/input.h, include/inputstr.h, include/miscstruct.h, include/os.h, include/pixmap.h, include/pixmapstr.h, include/property.h, include/propertyst.h, include/region.h, include/regionstr.h, include/rgb.h, include/screenint.h, include/scrnintstr.h, include/selection.h, include/servermd.h, include/site.h, include/window.h, include/windowstr.h, mi/mi.h, mi/miarc.c, mi/mibitblt.c, mi/micursor.c, mi/midash.c, mi/mifillrct.c, mi/mifpoly.h, mi/mifpolycon.c, mi/miglblt.c, mi/miinitext.c, mi/mipoly.c, mi/mipolycon.c, mi/mipolygen.c, mi/mipolypnt.c, mi/mipolyrect.c, mi/mipolyseg.c, mi/mipolytext.c, mi/mipolyutil.c, mi/mipushpxl.c, mi/mistruct.h, mi/miwindow.c, mi/mizerclip.c, mi/mizerline.c, os/WaitFor.c, os/oscolor.c, os/osdep.h, os/osinit.c:
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+--------------------------------------------------------------------
+
+include/closestr.h, os/rpcauth.c:
+
+Copyright 1991, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+fb/fbpict.h, hw/xfree86/xaa/xaaPict.c, render/mirect.c:
+
+Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
+--------------------------------------------------------------------
+
+hw/dmx/config/Canvas.h, hw/dmx/config/CanvasP.h:
+
+Copyright 1987, 1998  The Open Group
+Copyright 2002 Red Hat Inc., Durham, North Carolina.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+--------------------------------------------------------------------
+
+dix/ptrveloc.c, include/ptrveloc.h:
+
+Copyright © 2006-2009 Simon Thum             simon dot thum at gmx dot de
+
+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.
+
+--------------------------------------------------------------------
+
+fb/fbcmap_mi.c:
+
+Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+include/xkbfile.h, xkb/xkbout.c, xkb/xkbtext.c, xkb/xkmread.c:
+
+Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+dix/dispatch.c:
+
+Copyright 1987, 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+The panoramix components contained the following notice
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+Xext/bigreq.c, Xext/xtest.c:
+
+Copyright 1992, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+dix/privates.c:
+
+Copyright 1993, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+Copyright © 2010, Keith Packard
+Copyright © 2010, Jamey Sharp
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86Opt.h, hw/xfree86/common/xf86Option.c, hw/xfree86/common/xf86xv.h:
+
+Copyright (c) 1998-2003 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+tsol/auditwrite.c, tsol/auditwrite.h:
+
+Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+"AS, 1989, 1998, A, ACTION, AN, AND, ANY, ANY, ARISING, BE, BUT, CLAIM, CONNECTION, CONTRACT, Copyright, DAMAGES, DEALINGS, EVENT, EXPRESS, Except, FITNESS, FOR, FOR, FROM, GROUP, Group, Group, Group., IMPLIED, IN, IN, IN, IN, INCLUDING, IS, IS", KIND, LIABILITY, LIABLE, LIMITED, MERCHANTABILITY, NO, NONINFRINGEMENT., NOT, OF, OF, OF, OF, OPEN, OR, OR, OR, OR, OR, OR, OTHER, OTHER, OTHERWISE, OUT, Open, Open, Open, PARTICULAR, PROVIDED, PURPOSE, Permission, SHALL, SOFTWARE, SOFTWARE, SOFTWARE., Software, Software., THE, THE, THE, THE, THE, THE, TO, TORT, The, The, The, The, USE, WARRANTIES, WARRANTY, WHETHER, WITH, WITHOUT, above, above, advertising, all, all, and, and, and, and, and, any, appear, appear, as, authorization, be, be, both, contained, copies, copies, copy, copyright, copyright, copyright, dealings, distribute, documentation, documentation., fee, for, from, granted, hereby, in, in, in, in, in, in, included, is, its, modify, name, not, notice, notice, notice, notice, notice, notice, of, of, or, or, or, other, otherwise, permission, permission, portions, prior, promote, provided, purpose, sale, sell, shall, shall, software, substantial, supporting, that, that, that, the, the, the, the, this, this, this, this, this, to, to, use, use, used, without, without, written:
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessConfig.h:
+
+Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+Xext/xace.c, Xext/xace.h, Xext/xacestr.h, Xext/xselinux.h, Xext/xselinux_ext.c, Xext/xselinux_label.c, Xext/xselinuxint.h, dix/registry.c:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+--------------------------------------------------------------------
+
+fb/fb.h, fb/fballpriv.c, fb/fbarc.c, fb/fbbits.c, fb/fbbits.h, fb/fbblt.c, fb/fbbltone.c, fb/fbcopy.c, fb/fbfill.c, fb/fbfillrect.c, fb/fbfillsp.c, fb/fbgc.c, fb/fbgetsp.c, fb/fbglyph.c, fb/fbimage.c, fb/fbline.c, fb/fbpixmap.c, fb/fbpoint.c, fb/fbpush.c, fb/fbrop.h, fb/fbscreen.c, fb/fbseg.c, fb/fbsetsp.c, fb/fbsolid.c, fb/fbstipple.c, fb/fbtile.c, fb/fbutil.c, fb/fbwindow.c, mi/micopy.c:
+
+Copyright © 1998 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/bsd/bsd_VTsw.c:
+
+Derived from VTsw_usl.c which is
+Copyright 1993 by David Wexelblat <[email protected]>
+by S_ren Schmidt ([email protected])
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of David Wexelblat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  David Wexelblat makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+miext/rootless/rootlessGC.c, miext/rootless/rootlessScreen.c:
+
+Copyright (c) 2001 Greg Parker. All Rights Reserved.
+Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
+Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+
+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.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/hurd/hurd_mmap.c:
+
+Copyright 1997 by UCHIYAMA Yasushi
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of UCHIYAMA Yasushi not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  UCHIYAMA Yasushi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+include/list.h:
+
+Copyright © 2010 Intel Corporation
+Copyright © 2010 Francisco Jerez <[email protected]>
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/vbe/vbe.c, hw/xfree86/vbe/vbe.h:
+
+Copyright 2000 Egbert Eich
+
+Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86Crtc.c, randr/rroutput.c:
+
+Copyright © 2006 Keith Packard
+Copyright © 2008 Red Hat, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+damageext/damageext.c, damageext/damageext.h, damageext/damageextint.h, render/filter.c, xfixes/saveset.c, xfixes/select.c, xfixes/xfixes.h:
+
+Copyright © 2002 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Keith Packard makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+record/record.c, record/set.c, record/set.h:
+
+Copyright 1995, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+--------------------------------------------------------------------
+
+dix/enterleave.c, dix/enterleave.h:
+
+Copyright © 2008 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/modes/xf86cvt.c, hw/xfree86/utils/cvt/cvt.c:
+
+Copyright 2005-2006 Luc Verhaegen.
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86AutoConfig.c:
+
+Copyright 2003 by David H. Dawes.
+Copyright 2003 by X-Oz Technologies.
+All rights reserved.
+
+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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+os/dtlogin.c:
+
+Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_vid.c:
+
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
+Copyright 1993 by David Wexelblat <[email protected]>
+Copyright 1999 by David Holland <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the names of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/dmx/config/dmxconfig.c, hw/dmx/dmxprop.c, hw/dmx/input/dmxarg.c, hw/dmx/input/dmxevents.c, hw/dmx/input/dmxinputinit.c, hw/dmx/input/dmxmotion.c, hw/dmx/input/dmxsigio.c, hw/dmx/input/dmxxinput.c, hw/dmx/input/usb-common.c:
+
+Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+
+All Rights Reserved.
+
+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 on 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
+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+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.
+
+--------------------------------------------------------------------
+
+Xext/dpms.c, Xext/dpmsstubs.c:
+
+Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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.
+
+Except as contained in this notice, the name of Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+--------------------------------------------------------------------
+
+include/inpututils.h:
+
+Copyright © 2010 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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/loader/os.c:
+
+Copyright (c) 1999-2002 by The XFree86 Project, 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(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.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+hw/xfree86/dixmods/extmod/xf86vmode.c:
 
 Copyright 1995  Kaleb S. KEITHLEY
 
@@ -1010,274 +9056,19 @@
 or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
-
-Copyright (c) 1997 Matthieu Herrb
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Matthieu Herrb not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Matthieu Herrb makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2004, Egbert Eich
-
-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
-EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Egbert Eich shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from Egbert Eich.
-
-
-Copyright 1993 by David Wexelblat <[email protected]>
-Copyright 2005 by Kean Johnston <[email protected]>
-Copyright 1993 by David McCullough <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of David Wexelblat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  David Wexelblat makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <[email protected]>
-Copyright 1993 by David Wexelblat <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <[email protected]>
-Copyright 1993 by David Dawes <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995-1999 by Frederic Lepied, France. <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is  hereby granted without fee, provided that
-the  above copyright   notice appear  in   all  copies and  that both  that
-copyright  notice   and   this  permission   notice  appear  in  supporting
-documentation, and that   the  name of  Frederic   Lepied not  be  used  in
-advertising or publicity pertaining to distribution of the software without
-specific,  written      prior  permission.     Frederic  Lepied   makes  no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
-INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
-EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
-TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <[email protected]>
-Copyright 1993 by David Wexelblat <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <[email protected]>
-Copyright 1993 by David Dawes <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Anders Carlsson
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Anders Carlsson not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Anders Carlsson makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2003 Anders Carlsson
-Copyright © 2003-2004 Eric Anholt
-Copyright © 2004 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Eric Anholt not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Eric Anholt makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1998 Todd C. Miller <[email protected]>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Philip Blundell
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Philip Blundell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Philip Blundell makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (c) 1994-2003 by The XFree86 Project, Inc.
-Copyright 1997 by Metro Link, Inc.
-Copyright 2003 by David H. Dawes.
-Copyright 2003 by X-Oz Technologies.
-Copyright (c) 2004, X.Org Foundation
+--------------------------------------------------------------------
+
+hw/xfree86/shadowfb/shadow.c:
+
+Copyright (C) 1999.  The XFree86 Project Inc.
+
+Written by Mark Vojkovich ([email protected])
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/shared/vidmem.c:
+
+Copyright (c) 1993-2003 by The XFree86 Project, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -1302,255 +9093,36 @@
 the sale, use or other dealings in this Software without prior written
 authorization from the copyright holder(s) and author(s).
 
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <[email protected]>
-Copyright 1999 by David Holland <[email protected]>
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 Hewlett-Packard Company
-Copyright © 2004, 2005 Red Hat, Inc.
-Copyright © 2004 Nicholas Miell
-Copyright © 2005 Trolltech AS
-Copyright © 2006 Intel Corporation
-Copyright © 2006-2007, 2010 Keith Packard
-Copyright © 2008 Red Hat, Inc
-Copyright © 2008 George Sapountzis <[email protected]>
-Copyright © 2010, Jamey Sharp
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of the copyright holders not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  The copyright holders make no representations
-about the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-            2005 Lars Knoll & Zack Rusin, Trolltech
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987, 1998  The Open Group
-Copyright © 1998-1999, 2001 The XFree86 Project, Inc.
-Copyright © 2000 VA Linux Systems, Inc.
-Copyright (c) 2000, 2001 Nokia Home Communications
-Copyright © 2007, 2008 Red Hat, Inc.
-All rights reserved.
-
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright 1996 by Thomas E. Dickey <[email protected]>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2001 Andreas Monitzer.
-Copyright (c) 2001-2004 Greg Parker.
-Copyright (c) 2001-2004 Torrey T. Lyons
-Copyright (c) 2002-2003 Apple Computer, Inc.
-Copyright (c) 2004-2005 Alexander Gottwald
-Copyright (c) 2002-2009 Apple Inc.
-Copyright (c) 2007 Jeremy Huddleston
-All Rights Reserved.
-
-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
+--------------------------------------------------------------------
+
+IA/interactive_srv.h, include/Xprintf.h, os/solaris/mdb/modules/Xserver_clients.c, os/solaris/mdb/modules/Xserver_device_grabs.c, os/solaris/mdb/modules/Xserver_mdb.h, os/solaris/mdb/modules/mdb_module.c:
+
+Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+
+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.
 
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written authorization.
-
-
-Copyright (C) 1999,2000 by Eric Sunshine <[email protected]>
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright (C) 2005 Bogdan D. [email protected]
-
-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
-AUTHOR 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.
-
-Except as contained in this notice, the name of the author shall not be used in
-advertising or otherwise to promote the sale, use or other dealings in this
-Software without prior written authorization from the author.
-
-
-Copyright © 2002 David Dawes
-
-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 AUTHOR(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.
-
-Except as contained in this notice, the name of the author(s) shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-the author(s).
-
-
-Copyright (C) 1996-1999 SciTech Software, Inc.
-Copyright (C) David Mosberger-Tang
-Copyright (C) 1999 Egbert Eich
-Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the authors not be used
-in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  The authors makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2005-2006 Luc Verhaegen.
+--------------------------------------------------------------------
+
+hw/xfree86/common/xf86DGA.c:
+
+Copyright (c) 1998-2002 by The XFree86 Project, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -1570,51 +9142,72 @@
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-
-Copyright 1995 by Robin Cutshaw <[email protected]>
-Copyright 2000 by Egbert Eich
-Copyright 2002 by David Dawes
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of the above listed copyright holder(s)
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holder(s) make(s) no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), [email protected]
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of Marc Aurele La France not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Marc Aurele La France makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+--------------------------------------------------------------------
+
+IA/interactive.c:
+
+Copyright (c) 1993, 2011, Oracle and/or its affiliates. All rights reserved.
+
+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.
+
+--------------------------------------------------------------------
+
+hw/xfree86/xaa/xaaOffscreen.c:
+
+Copyright (c) 1999 -  The XFree86 Project Inc.
+
+--------------------------------------------------------------------
+
+xkb/ddxList.c, xkb/xkbLEDs.c, xkb/xkbfmisc.c:
+
+Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/xf86_OSlib.h:
 
 Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
 Copyright 1992 by David Dawes <[email protected]>
@@ -1647,102 +9240,105 @@
 IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-
-Copyright 2001-2005 by J. Kean Johnston <[email protected]>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name J. Kean Johnston not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  J. Kean Johnston makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Jakub Jelinek ([email protected])
-
-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
-JAKUB JELINEK 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.
-
-
-Copyright 1997,1998 by UCHIYAMA Yasushi
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of UCHIYAMA Yasushi not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  UCHIYAMA Yasushi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Keith Packard
-              2004 Eric Anholt
-              2005 Zack Rusin
+The ARM32 code here carries the following copyright:
+
+Copyright 1997
+Digital Equipment Corporation. All rights reserved.
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+
+1) Any source code used, modified or distributed must reproduce and retain
+this copyright notice and list of conditions as they appear in the
+source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+Equipment Corporation. Neither the "Digital Equipment Corporation"
+name nor any trademark or logo of Digital Equipment Corporation may be
+used to endorse or promote products derived from this software without
+the prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+including but not limited to, any implied warranties of merchantability,
+fitness for a particular purpose, or non-infringement are disclaimed.
+In no event shall DIGITAL be liable for any damages whatsoever, and in
+particular, DIGITAL shall not be liable for special, indirect,
+consequential, or incidental damages or damages for lost profits, loss
+of revenue or loss of use, whether such damages arise in contract,
+negligence, tort, under statute, in equity, at law or otherwise, even
+if advised of the possibility of such damage.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/linux/lnx_init.c, hw/xfree86/os-support/linux/lnx_video.c:
+
+Copyright 1992 by Orest Zborowski <[email protected]>
+Copyright 1993 by David Wexelblat <[email protected]>
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
-documentation, and that the name of copyright holders not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Copyright holders make no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2002-2007
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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:
+documentation, and that the names of Orest Zborowski and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.  Orest Zborowski
+and David Wexelblat make no representations about the suitability of this
+software for any purpose.  It is provided "as is" without express or
+implied warranty.
+
+OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+hw/xfree86/dri2/dri2ext.c:
+
+Copyright © 2008 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Soft-
+ware"), to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, provided that the above copyright
+notice(s) and this permission notice appear in all copies of the Soft-
+ware and that both the above copyright notice(s) and this permission
+notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+MANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization of
+the copyright holder.
+
+--------------------------------------------------------------------
+
+hw/xfree86/os-support/solaris/sun_bell.c:
+
+Copyright (c) 2004-2005, Oracle and/or its affiliates. All rights reserved.
+
+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
@@ -1750,100 +9346,9 @@
 
 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS 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.
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-this permission notice appear in supporting documentation.  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
-AUTHOR 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.
-
-
-Copyright © 2007 OpenedHand Ltd
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of OpenedHand Ltd not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. OpenedHand Ltd makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1989, 1990, 1993, 1994
-     The Regents of the University of California.  All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Chris Torek.
-
-This code is derived from software contributed to Berkeley by
-Michael Rendell of Memorial University of Newfoundland.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-Copyright (c) 2009 Dan Nicholson
-
-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 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.
+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.
+
--- a/open-src/xserver/xorg/IA.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/IA.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -18,10 +18,10 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
-diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am	2010-08-26 14:51:37.000000000 -0700
-+++ Makefile.am	2011-02-15 15:53:19.157650482 -0800
+diff --git a/Makefile.am b/Makefile.am
+index 62c8d95..4d2e2ca 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -36,6 +36,7 @@ SUBDIRS = \
  	damageext \
  	$(COMPOSITE_DIR) \
@@ -30,10 +30,11 @@
  	exa \
  	config \
  	hw \
-diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2011-02-15 15:53:16.732320605 -0800
-+++ configure.ac	2011-02-15 15:53:19.158803446 -0800
-@@ -1158,6 +1158,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input ex
+diff --git a/configure.ac b/configure.ac
+index 926d159..f4311c3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1141,6 +1141,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])
  XI_LIB='$(top_builddir)/Xi/libXi.la'
  XI_INC='-I$(top_srcdir)/Xi'
  
@@ -44,17 +45,18 @@
  AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
  AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
  AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
-@@ -2273,3 +2277,6 @@ test/Makefile
+@@ -2270,3 +2274,6 @@ test/Makefile
  test/xi2/Makefile
  xorg-server.pc
  ])
 +
 +# Add Sun IA extension
 +AC_OUTPUT([IA/Makefile])
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2011-02-15 15:53:16.711587149 -0800
-+++ hw/xfree86/common/xf86Config.c	2011-02-15 15:53:19.159630285 -0800
-@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = 
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 9622eab..21bfe0b 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -125,6 +125,7 @@ static ModuleDefault ModuleDefaults[] = {
  #ifdef DRI2
      {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
  #endif
@@ -62,10 +64,11 @@
      {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
  };
  
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am	2009-09-27 18:57:00.000000000 -0700
-+++ hw/xfree86/dixmods/Makefile.am	2011-02-15 15:53:19.159921744 -0800
-@@ -66,3 +66,11 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index 365f006..ea065fa 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
+@@ -66,3 +66,11 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
  
  libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
  libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
@@ -77,9 +80,10 @@
 +libia_la_LDFLAGS = -avoid-version
 +libia_la_LIBADD = $(top_builddir)/IA/libIA.la
 +libia_la_SOURCES = iamodule.c
-diff -Nurp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c	2010-05-02 19:59:26.000000000 -0700
-+++ mi/miinitext.c	2011-02-15 15:53:19.160356394 -0800
+diff --git a/mi/miinitext.c b/mi/miinitext.c
+index 4499f37..ee04b05 100644
+--- a/mi/miinitext.c
++++ b/mi/miinitext.c
 @@ -94,6 +94,7 @@ SOFTWARE.
  #include "micmap.h"
  #include "globals.h"
@@ -109,7 +113,7 @@
  
  /* FIXME: this whole block of externs should be from the appropriate headers */
  #ifdef MITSHM
-@@ -304,6 +312,9 @@ static ExtensionToggle ExtensionToggleLi
+@@ -304,6 +312,9 @@ static ExtensionToggle ExtensionToggleList[] =
  #ifdef XCSECURITY
      { "SECURITY", &noSecurityExtension },
  #endif
@@ -119,7 +123,7 @@
  #ifdef RES
      { "X-Resource", &noResExtension },
  #endif
-@@ -472,6 +483,9 @@ InitExtensions(int argc, char *argv[])
+@@ -470,6 +481,9 @@ InitExtensions(int argc, char *argv[])
  	GlxPushProvider(&__glXDRISWRastProvider);
      if (!noGlxExtension) GlxExtensionInit();
  #endif
--- a/open-src/xserver/xorg/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -32,8 +32,8 @@
 MODULE_VERSION=$(XORGSERVER_VERS)
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 040f091dfdfb4e335116eb0032cc690b
-TARBALL_SHA1 = e8d5776fe973f15c0e907fd827106f8d296acf7e
+TARBALL_MD5  = 75f117c74f2ecaf9dd167f6a66ac98de
+TARBALL_SHA1 = 59ada4c9a59f7f1eb4b68c359e9cd58272aa4809
 
 # Patches to apply to source after unpacking, in order
 # *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds
@@ -70,16 +70,23 @@
 MODULE_ARC_CASES += PSARC/2009/679
 # PSARC/2010/109 Introduce libXcb in Solaris
 MODULE_ARC_CASES += PSARC/2010/109
+# PSARC/2011/008 Xorg server 1.9
+MODULE_ARC_CASES += PSARC/2011/008
+# PSARC/2010/382 Removal of 32-bit X servers
+MODULE_ARC_CASES += PSARC/2010/382
+# PSARC/2011/214 Xorg server 1.10
+MODULE_ARC_CASES += PSARC/2011/214
 
 # Man pages to apply Sun footer to & attributes to list
-# XXX: Need to adjust some of these to correct packages/stability
 SUNTOUCHED_MANPAGES= \
-	hw/kdrive/ephyr/Xephyr.man.pre \
-	hw/xfree86/utils/gtf/gtf.man.pre \
-	hw/xfree86/utils/cvt/cvt.man.pre \
-	hw/xfree86/doc/man/Xorg.man.pre \
-	hw/xfree86/doc/man/xorg.conf.man.pre \
-	hw/vfb/Xvfb.man.pre
+	doc/man/Xserver.man \
+	hw/kdrive/ephyr/man/Xephyr.man \
+	hw/xfree86/utils/man/cvt.man \
+	hw/xfree86/utils/man/gtf.man \
+	hw/xfree86/doc/man/Xorg.man \
+	hw/xfree86/doc/man/xorg.conf.man \
+	hw/xfree86/doc/man/xorg.conf.d.man \
+	hw/vfb/man/Xvfb.man
 
 MODULE_STABILITY=Volatile
 
@@ -90,10 +97,7 @@
 SUNTOUCH_MAN_FLAGS_Xephyr = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xephyr)}'
 SUNTOUCH_MAN_FLAGS_Xvfb = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xvfb)}'
 SUNTOUCH_MAN_FLAGS_Xdmx = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xdmx)}'
-
-# Used in sun-manpage.patch to set distro name in Xserver man page
-# DISTRO_NAME is set in open-src/common/Makefile.options.*
-MODULE_BUILD_ENV = DISTRO_NAME="$(DISTRO_NAME)"
+SUNTOUCH_MAN_FLAGS_Xserver = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xserver-common)}'
 
 # Binary built in tree
 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg
--- a/open-src/xserver/xorg/amd64-loader-path.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/amd64-loader-path.patch	Mon May 09 14:58:28 2011 -0700
@@ -20,10 +20,10 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
-index 615e8c6..a9ccdf0 100644
+index eaa99e8..0c8b21c 100644
 --- a/hw/xfree86/loader/loadmod.c
 +++ b/hw/xfree86/loader/loadmod.c
-@@ -167,6 +167,13 @@ InitPathList(const char *path)
+@@ -166,6 +166,13 @@ InitPathList(const char *path)
  		list[n][len - 1] = '/';
  		list[n][len] = '\0';
  	    }
@@ -37,7 +37,7 @@
  	    n++;
  	}
  	elem = strtok(NULL, ",");
-@@ -388,6 +395,24 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -387,6 +394,24 @@ FindModuleInSubdir(const char *dirpath, const char *module)
      char *ret = NULL, tmpBuf[PATH_MAX];
      struct stat stat_buf;
  
@@ -62,7 +62,7 @@
      dir = opendir(dirpath);
      if (!dir)
          return NULL;
-@@ -395,6 +420,13 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -394,6 +419,13 @@ FindModuleInSubdir(const char *dirpath, const char *module)
      while ((direntry = readdir(dir))) {
          if (direntry->d_name[0] == '.')
              continue;
@@ -76,7 +76,7 @@
          snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);
  	/* the stat with the appended / fails for normal files,
  	   and works for sub dirs fine, looks a bit strange in strace
-@@ -404,6 +436,12 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -403,6 +435,12 @@ FindModuleInSubdir(const char *dirpath, const char *module)
                  break;
              continue;
          }
--- a/open-src/xserver/xorg/autoconfig.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/autoconfig.patch	Mon May 09 14:58:28 2011 -0700
@@ -20,15 +20,16 @@
 # DEALINGS IN THE SOFTWARE.
 6385111: Xorg auto-configuration Improvement
 
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2010-09-03 16:45:19.100446935 -0700
-+++ hw/xfree86/common/xf86Config.c	2010-09-03 16:45:21.057252713 -0700
-@@ -2045,7 +2045,7 @@ configMonitor(MonPtr monitorp, XF86ConfM
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index d5e2097..e64d54c 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -2005,7 +2005,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
      cmodep = conf_monitor->mon_modeline_lst;
      while( cmodep ) {
          mode = xnfcalloc(1, sizeof(DisplayModeRec));
 -	mode->type       = 0;
-+	mode->type       = M_T_USERDEF;
++        mode->type       = M_T_USERDEF;
          mode->Clock      = cmodep->ml_clock;
          mode->HDisplay   = cmodep->ml_hdisplay;
          mode->HSyncStart = cmodep->ml_hsyncstart;
--- a/open-src/xserver/xorg/autoconfig2.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
-#
-# 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.
-Raise hsync and default to "1024x768" when DDC data not available.
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c
---- hw/xfree86/common/xf86Mode.c	2010-06-05 18:16:49.000000000 -0700
-+++ hw/xfree86/common/xf86Mode.c	2010-09-03 16:45:23.099750744 -0700
-@@ -1367,6 +1367,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
-     range hsync[MAX_HSYNC];
-     range vrefresh[MAX_VREFRESH];
-     Bool inferred_virtual = FALSE;
-+    Bool UseDefaultRate = FALSE;
- 
-     DebugF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t  %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
- 	   scrp, availModes, modeNames, clockRanges,
-@@ -1412,8 +1413,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
- 		}
- 	    } else {
- 		scrp->monitor->hsync[0].lo = 31.5;
--		scrp->monitor->hsync[0].hi = 37.9;
-+		scrp->monitor->hsync[0].hi = 60.0;
- 		scrp->monitor->nHsync = 1;
-+		UseDefaultRate = TRUE;
- 	    }
- 	    type = "default ";
- 	}
-@@ -1626,6 +1628,11 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
- 	xf86DeleteMode(&scrp->modes, scrp->modes);
-     endp = &scrp->modes;
-     last = NULL;
-+    if (UseDefaultRate && ((modeNames == NULL) || (*modeNames == NULL))) {
-+	modeNames = xnfcalloc(2, sizeof(char *));
-+	modeNames[0] = strdup("1024x768");
-+	modeNames[1] = NULL;
-+    }
-     if (modeNames != NULL) {
- 	for (i = 0; modeNames[i] != NULL; i++) {
- 	    userModes = TRUE;
--- a/open-src/xserver/xorg/autodetect-kernel-dev-fb.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/autodetect-kernel-dev-fb.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,9 +18,10 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c	2010-12-16 15:40:50.420727168 -0500
-+++ hw/xfree86/common/xf86AutoConfig.c	2010-12-03 15:50:42.721496105 -0500
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 64377d3..7dc3189 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
 @@ -219,6 +219,12 @@ static void
  listPossibleVideoDrivers(char *matches[], int nmatches)
  {
@@ -34,7 +35,7 @@
      
      for (i = 0 ; i < nmatches ; i++) {
          matches[i] = NULL;
-@@ -229,50 +235,50 @@ listPossibleVideoDrivers(char *matches[]
+@@ -229,50 +235,50 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
      /* Check for driver type based on /dev/fb type and if valid, use
         it instead of PCI bus probe results */
      if (xf86Info.consoleFd >= 0) {
--- a/open-src/xserver/xorg/cli-nobanner.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/cli-nobanner.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,11 +18,12 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c	2011-02-15 15:53:10.744333673 -0800
-+++ os/utils.c	2011-02-15 15:53:12.747548720 -0800
-@@ -772,6 +772,12 @@ ProcessCommandLine(int argc, char *argv[
+
+diff --git a/os/utils.c b/os/utils.c
+index 0cf4d37..55c0ecf 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -770,6 +770,12 @@ ProcessCommandLine(int argc, char *argv[])
  	    nolock = TRUE;
  	}
  #endif
@@ -32,6 +33,6 @@
 +	  /* ignore - just maintaining compatibility with Xsun CLI */
 +	}
 +#endif
- #ifndef NOLOGOHACK
- 	else if ( strcmp( argv[i], "-logo") == 0)
+ 	else if ( strcmp( argv[i], "-nolisten") == 0)
  	{
+             if(++i < argc) {
--- a/open-src/xserver/xorg/cli-nolock.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/cli-nolock.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,10 +18,10 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c	2011-01-07 06:26:45.000000000 -0800
-+++ os/utils.c	2011-02-15 15:53:10.744333673 -0800
+diff --git a/os/utils.c b/os/utils.c
+index 18fd911..0cf4d37 100644
+--- a/os/utils.c
++++ b/os/utils.c
 @@ -509,7 +509,9 @@ void UseMsg(void)
  #ifdef RLIMIT_STACK
      ErrorF("-ls int                limit stack space to N Kb\n");
@@ -29,10 +29,10 @@
 +#ifndef SUNSOFT /* Not in Sun version as required by PSARC 2004/187 TCR */
      ErrorF("-nolock                disable the locking mechanism\n");
 +#endif
- #ifndef NOLOGOHACK
-     ErrorF("-logo                  enable logo in screen saver\n");
-     ErrorF("nologo                 disable logo in screen saver\n");
-@@ -759,6 +761,7 @@ ProcessCommandLine(int argc, char *argv[
+     ErrorF("-nolisten string       don't listen on protocol\n");
+     ErrorF("-noreset               don't reset after last client exists\n");
+     ErrorF("-background [none]     create root window with no background\n");
+@@ -757,6 +759,7 @@ ProcessCommandLine(int argc, char *argv[])
  		UseMsg();
  	}
  #endif
@@ -40,11 +40,11 @@
  	else if ( strcmp ( argv[i], "-nolock") == 0)
  	{
  #if !defined(WIN32) && !defined(__CYGWIN__)
-@@ -768,6 +771,7 @@ ProcessCommandLine(int argc, char *argv[
+@@ -766,6 +769,7 @@ ProcessCommandLine(int argc, char *argv[])
  #endif
  	    nolock = TRUE;
  	}
 +#endif
- #ifndef NOLOGOHACK
- 	else if ( strcmp( argv[i], "-logo") == 0)
+ 	else if ( strcmp( argv[i], "-nolisten") == 0)
  	{
+             if(++i < argc) {
--- a/open-src/xserver/xorg/dixmods-deps.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/dixmods-deps.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,7 @@
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am	2010-09-03 16:45:29.752570908 -0700
-+++ hw/xfree86/dixmods/Makefile.am	2010-09-03 16:45:32.323005868 -0700
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index bf81436..e27bbc3 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
 @@ -36,6 +36,7 @@ libdbe_la_SOURCES = dbemodule.c
  
  libfb_la_LDFLAGS = -avoid-version
@@ -9,7 +10,7 @@
  libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
  libfb_la_CFLAGS = $(AM_CFLAGS)
  
-@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACC
+@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
  libglx_la_LDFLAGS = -avoid-version -mimpure-text
  if AIGLX
  GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
@@ -18,27 +19,30 @@
  endif
  libglx_la_LIBADD = \
  	$(top_builddir)/glx/libglx.la \
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/int10/Makefile.am hw/xfree86/int10/Makefile.am
---- hw/xfree86/int10/Makefile.am	2010-07-14 13:23:17.000000000 -0700
-+++ hw/xfree86/int10/Makefile.am	2010-09-03 16:45:32.323355539 -0700
-@@ -44,3 +44,5 @@ libint10_la_SOURCES = stub.c xf86int10mo
+diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
+index f5ece69..ee87284 100644
+--- a/hw/xfree86/int10/Makefile.am
++++ b/hw/xfree86/int10/Makefile.am
+@@ -44,3 +44,5 @@ libint10_la_SOURCES = stub.c xf86int10module.c
  endif
  
  EXTRA_DIST = xf86x86emu.h INT10.HOWTO
 +
 +libint10_la_LIBADD = $(PCIACCESS_LIBS)
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/shadowfb/Makefile.am hw/xfree86/shadowfb/Makefile.am
---- hw/xfree86/shadowfb/Makefile.am	2010-06-05 18:16:52.000000000 -0700
-+++ hw/xfree86/shadowfb/Makefile.am	2010-09-03 16:45:32.323606069 -0700
+diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
+index 02d2dd4..8c7abb3 100644
+--- a/hw/xfree86/shadowfb/Makefile.am
++++ b/hw/xfree86/shadowfb/Makefile.am
 @@ -7,3 +7,5 @@ sdk_HEADERS = shadowfb.h
  INCLUDES = $(XORG_INCS)
  
  AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 +
 +libshadowfb_la_LIBADD = -lXfont
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/vbe/Makefile.am hw/xfree86/vbe/Makefile.am
---- hw/xfree86/vbe/Makefile.am	2010-06-05 18:16:52.000000000 -0700
-+++ hw/xfree86/vbe/Makefile.am	2010-09-03 16:45:32.323810540 -0700
+diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
+index 85c6fd8..be8359e 100644
+--- a/hw/xfree86/vbe/Makefile.am
++++ b/hw/xfree86/vbe/Makefile.am
 @@ -8,3 +8,5 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
  
  INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
--- a/open-src/xserver/xorg/dtlogin-userinfo.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/dtlogin-userinfo.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,11 +18,11 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
-diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2011-02-04 11:37:03.000000000 -0800
-+++ configure.ac	2011-02-15 15:53:16.732320605 -0800
-@@ -1472,6 +1472,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUI
+diff --git a/configure.ac b/configure.ac
+index 524c2af..926d159 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1458,6 +1458,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
  XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
  XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
  XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
@@ -30,10 +30,11 @@
  AC_SUBST([XSERVER_LIBS])
  AC_SUBST([XSERVER_SYS_LIBS])
  
-diff -Nurp -x '*~' -x '*.orig' dix/main.c dix/main.c
---- dix/main.c	2010-12-02 12:16:53.000000000 -0800
-+++ dix/main.c	2011-02-15 15:53:16.732690379 -0800
-@@ -116,6 +116,11 @@ Equipment Corporation.
+diff --git a/dix/main.c b/dix/main.c
+index 692bec1..9c3951a 100644
+--- a/dix/main.c
++++ b/dix/main.c
+@@ -115,6 +115,11 @@ Equipment Corporation.
  #include "dpmsproc.h"
  #endif
  
@@ -44,8 +45,8 @@
 +
  extern void Dispatch(void);
  
- extern void InitProcVectors(void);
-@@ -168,6 +173,13 @@ int main(int argc, char *argv[], char *e
+ #ifdef XQUARTZ
+@@ -165,6 +170,13 @@ int main(int argc, char *argv[], char *envp[])
  	InitBlockAndWakeupHandlers();
  	/* Perform any operating system dependent initializations you'd like */
  	OsInit();
@@ -59,7 +60,7 @@
  	if(serverGeneration == 1)
  	{
  	    CreateWellKnownSockets();
-@@ -290,6 +302,11 @@ int main(int argc, char *argv[], char *e
+@@ -286,6 +298,11 @@ int main(int argc, char *argv[], char *envp[])
  
  	Dispatch();
  
@@ -71,10 +72,11 @@
          UndisplayDevices();
  
  	/* Now free up whatever must be freed */
-diff -Nurp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am
---- os/Makefile.am	2010-03-25 22:17:44.000000000 -0700
-+++ os/Makefile.am	2011-02-15 15:53:16.732911213 -0800
-@@ -47,6 +47,9 @@ if NEED_STRLCAT
+diff --git a/os/Makefile.am b/os/Makefile.am
+index 66a4a0f..b4f90ce 100644
+--- a/os/Makefile.am
++++ b/os/Makefile.am
+@@ -40,6 +40,9 @@ if NEED_STRLCAT
  libos_la_SOURCES += $(STRLCAT_SRCS)
  endif
  
@@ -84,10 +86,11 @@
  EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
       $(XDMCP_SRCS) $(STRLCAT_SRCS)
  
-diff -Nurp -x '*~' -x '*.orig' os/auth.c os/auth.c
---- os/auth.c	2010-05-12 20:16:31.000000000 -0700
-+++ os/auth.c	2011-02-15 15:53:16.733178408 -0800
-@@ -290,6 +290,19 @@ AddAuthorization (unsigned name_length, 
+diff --git a/os/auth.c b/os/auth.c
+index 7685751..995235e 100644
+--- a/os/auth.c
++++ b/os/auth.c
+@@ -290,6 +290,19 @@ AddAuthorization (unsigned name_length, const char *name,
      return 0;
  }
  
--- a/open-src/xserver/xorg/fontmod.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/fontmod.patch	Mon May 09 14:58:28 2011 -0700
@@ -21,10 +21,11 @@
 Add Sun's old "bitstream" font module to the list of obsolete modules
 to ignore in xorg.conf files.
 
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2010-09-03 16:45:07.229888581 -0700
-+++ hw/xfree86/common/xf86Config.c	2010-09-03 16:45:09.170375390 -0700
-@@ -256,6 +256,7 @@ xf86ModulelistFromConfig(pointer **optli
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 7c548eb..7638e5c 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -253,6 +253,7 @@ xf86ModulelistFromConfig(pointer **optlist)
      char **modulearray;
      char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
  		       "freetype", "type1",
--- a/open-src/xserver/xorg/glx-impure.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/glx-impure.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,7 +1,8 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am	2009-01-22 20:34:57.149681000 -0800
-+++ hw/xfree86/dixmods/Makefile.am	2009-01-22 20:35:04.779066000 -0800
-@@ -44,7 +44,7 @@ libwfb_la_LIBADD = $(top_builddir)/fb/li
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index 5e5725e..bf81436 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
+@@ -44,7 +44,7 @@ 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
  
--- a/open-src/xserver/xorg/headers_64bit.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-From patchwork Thu Jan  6 22:29:01 2011
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [3/3] xfree86: Fix the sdk headers to be multilib-safe
-Date: Fri, 07 Jan 2011 06:29:01 -0000
-From: Adam Jackson <[email protected]>
-X-Patchwork-Id: 3576
-Message-Id: <[email protected]>
-To: [email protected]
-
-Use _LP64 (verified on gcc and sun compilers) instead of _XSERVER64 in
-internal header usage, and always define _XSERVER64 for modules if _LP64
-is defined.  Prevents differing xorg-server.h between 32 and 64 bit
-packages.
-
-Signed-off-by: Adam Jackson <[email protected]>
-Reviewed-by: Alan Coopersmith <[email protected]>
-
----
-include/colormapst.h     |    4 ++--
- include/xorg-server.h.in |    7 ++++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/include/colormapst.h b/include/colormapst.h
-index 0ba5bd0..b597e2c 100644
---- a/include/colormapst.h
-+++ b/include/colormapst.h
-@@ -103,12 +103,12 @@ typedef struct _ColormapRec
- {
-     VisualPtr	pVisual;
-     short	class;		/* PseudoColor or DirectColor */
--#if defined(_XSERVER64)
-+#if defined(_LP64)
-     short	pad0;
-     XID		pad1;
- #endif
-     XID		mid;		/* client's name for colormap */
--#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
-+#if defined(_LP64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
-     XID		pad2;
- #endif
-     ScreenPtr	pScreen;	/* screen map is associated with */
-diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
-index 76cab16..b10b994 100644
---- a/include/xorg-server.h.in
-+++ b/include/xorg-server.h.in
-@@ -157,9 +157,6 @@
- /* Name of X server */
- #undef __XSERVERNAME__
- 
--/* Define to 1 if unsigned long is 64 bits. */
--#undef _XSERVER64
--
- /* Building vgahw module */
- #undef WITH_VGAHW
- 
-@@ -187,4 +184,8 @@
- /* X Access Control Extension */
- #undef XACE
- 
-+#ifdef _LP64
-+#define _XSERVER64 1
-+#endif
-+
- #endif /* _XORG_SERVER_H_ */
--- a/open-src/xserver/xorg/hotkey.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/hotkey.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,8 +1,8 @@
-diff -Nurp -x '*~' -x '*.orig' Xi/exevents.c Xi/exevents.c
-diff -Nurp -x '*~' -x '*.orig' Xi/exevents.c Xi/exevents.c
---- Xi/exevents.c	2010-12-23 14:15:10.000000000 -0800
-+++ Xi/exevents.c	2011-02-15 15:53:51.551620898 -0800
-@@ -194,7 +194,16 @@ CopyKeyClass(DeviceIntPtr device, Device
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 327873e..717f275 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -187,7 +187,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
  {
      KeyClassPtr mk = master->key;
  
@@ -19,9 +19,10 @@
          return;
  
      mk->sourceid = device->id;
-diff -Nurp -x '*~' -x '*.orig' Xi/extinit.c Xi/extinit.c
---- Xi/extinit.c	2010-12-02 12:24:35.000000000 -0800
-+++ Xi/extinit.c	2011-02-15 15:53:51.552122593 -0800
+diff --git a/Xi/extinit.c b/Xi/extinit.c
+index 82df7eb..6b99fae 100644
+--- a/Xi/extinit.c
++++ b/Xi/extinit.c
 @@ -371,6 +371,10 @@ extern XExtensionVersion XIVersion;
  
  Mask PropagateMask[MAXDEVICES];
@@ -45,10 +46,11 @@
      if (!AddCallback(&ClientStateCallback, XIClientCallback, 0))
          FatalError("Failed to add callback to XI.\n");
  
-diff -Nurp -x '*~' -x '*.orig' config/hal.c config/hal.c
---- config/hal.c	2010-06-27 16:43:05.000000000 -0700
-+++ config/hal.c	2011-02-15 15:53:51.552429571 -0800
-@@ -125,6 +125,63 @@ get_prop_string_array(LibHalContext *hal
+diff --git a/config/hal.c b/config/hal.c
+index 297520a..44c1582 100644
+--- a/config/hal.c
++++ b/config/hal.c
+@@ -123,6 +123,63 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
      return ret;
  }
  
@@ -112,7 +114,7 @@
  static void
  device_added(LibHalContext *hal_ctx, const char *udi)
  {
-@@ -136,6 +193,9 @@ device_added(LibHalContext *hal_ctx, con
+@@ -134,6 +191,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
      DBusError error;
      struct xkb_options xkb_opts = {0};
      int rc;
@@ -122,9 +124,9 @@
  
      LibHalPropertySet *set = NULL;
  	LibHalPropertySetIterator set_iter;
-@@ -377,6 +437,16 @@ device_added(LibHalContext *hal_ctx, con
-     if (xkb_opts.options)
+@@ -377,6 +437,16 @@ device_added(LibHalContext *hal_ctx, const char *udi)
          add_option(&options, "xkb_options", xkb_opts.options);
+     add_option(&options, "config_info", config_info);
  
 +#ifdef SUNSOFT
 +    for (tmpo = options; tmpo; tmpo = tmpo->next) {
@@ -139,10 +141,11 @@
      /* this isn't an error, but how else do you output something that the user can see? */
      LogMessage(X_INFO, "config/hal: Adding input device %s\n", name);
      if ((rc = NewInputDeviceRequest(options, &attrs, &dev)) != Success) {
-diff -Nurp -x '*~' -x '*.orig' config/x11-input.fdi config/x11-input.fdi
---- config/x11-input.fdi	2009-09-27 18:56:59.000000000 -0700
-+++ config/x11-input.fdi	2011-02-15 15:53:51.552591586 -0800
-@@ -76,6 +76,12 @@
+diff --git a/config/x11-input.fdi b/config/x11-input.fdi
+index b263f36..425aec2 100644
+--- a/config/x11-input.fdi
++++ b/config/x11-input.fdi
+@@ -71,6 +71,12 @@
        <!-- If we're using Linux, we use evdev by default (falling back to
             kbd otherwise). -->
        <merge key="input.x11_driver" type="string">kbd</merge>
@@ -155,9 +158,10 @@
        <merge key="input.x11_options.XkbModel" type="string">pc105</merge>
        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
               string="Linux">
-diff -Nurp -x '*~' -x '*.orig' include/inputstr.h include/inputstr.h
---- include/inputstr.h	2010-12-03 21:53:07.000000000 -0800
-+++ include/inputstr.h	2011-02-15 15:53:51.552836408 -0800
+diff --git a/include/inputstr.h b/include/inputstr.h
+index b74ee04..808f36f 100644
+--- a/include/inputstr.h
++++ b/include/inputstr.h
 @@ -57,6 +57,11 @@ SOFTWARE.
  #include "geext.h"
  #include "privates.h"
--- a/open-src/xserver/xorg/make_xkm_output_dir.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/make_xkm_output_dir.patch	Mon May 09 14:58:28 2011 -0700
@@ -12,9 +12,10 @@
 by gid 0, to fix bug:
 6916317 Changing xkb settings after login not working on snv130
 
-diff -Nurp -x '*~' -x '*.orig' xkb/Makefile.am xkb/Makefile.am
---- xkb/Makefile.am	2010-06-05 18:17:03.000000000 -0700
-+++ xkb/Makefile.am	2010-09-03 16:44:59.203991086 -0700
+diff --git a/xkb/Makefile.am b/xkb/Makefile.am
+index fb3ccbf..5a82e09 100644
+--- a/xkb/Makefile.am
++++ b/xkb/Makefile.am
 @@ -1,6 +1,7 @@
  noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
  
@@ -23,10 +24,11 @@
  
  DDX_SRCS = \
          ddxBeep.c \
-diff -Nurp -x '*~' -x '*.orig' xkb/ddxLoad.c xkb/ddxLoad.c
---- xkb/ddxLoad.c	2010-07-14 13:23:17.000000000 -0700
-+++ xkb/ddxLoad.c	2010-09-03 16:44:59.204354950 -0700
-@@ -150,6 +150,18 @@ Win32System(const char *cmdline)
+diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
+index a935698..7682228 100644
+--- a/xkb/ddxLoad.c
++++ b/xkb/ddxLoad.c
+@@ -146,6 +146,18 @@ Win32System(const char *cmdline)
  #define System(x) Win32System(x)
  #endif
  
@@ -45,7 +47,7 @@
  static void
  OutputDirectory(
      char* outdir,
-@@ -157,7 +169,11 @@ OutputDirectory(
+@@ -153,7 +165,11 @@ OutputDirectory(
  {
  #ifndef WIN32
      /* Can we write an xkm and then open it too? */
@@ -58,7 +60,7 @@
      {
  	(void) strcpy (outdir, XKM_OUTPUT_DIR);
      } else
-@@ -199,6 +215,15 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		
+@@ -195,6 +211,15 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
      const char *xkmfile = "-";
  #endif
  
@@ -74,7 +76,7 @@
      snprintf(keymap, sizeof(keymap), "server-%s", display);
  
      OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
-@@ -246,6 +271,11 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		
+@@ -245,6 +270,11 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
  #else
      out= fopen(tmpname, "w");
  #endif
--- a/open-src/xserver/xorg/nvidia-autoconfig.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/nvidia-autoconfig.patch	Mon May 09 14:58:28 2011 -0700
@@ -18,22 +18,14 @@
 # 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.
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2010-09-03 16:45:16.628892543 -0700
-+++ hw/xfree86/common/xf86Config.c	2010-09-03 16:45:19.100446935 -0700
-@@ -538,11 +538,30 @@ fixup_video_driver_list(char **drivers)
-                 if (!strcmp(*drv, "ati")) {
-                     ati = drv;
-                     x = *ati; *ati = *atimisc; *atimisc = x;
--                    return;
-+		    break;
-                 }
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 7638e5c..d5e2097 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -523,6 +523,25 @@ fixup_video_driver_list(char **drivers)
              }
-             /* if we get here, ati was already ahead of atimisc */
--            return;
-+	    break;
-+        }
-+    }
+         }
+     }
 +    /*
 +     * Since the nvidia kernel driver interferes with the nv Xorg driver,
 +     * make sure to prefer nvidia if it's installed
@@ -51,6 +43,8 @@
 +            }
 +            /* if we get here, nvidia was already ahead of nv */
 +            break;
-         }
-     }
++        }
++    }
  }
+ 
+ static char **
--- a/open-src/xserver/xorg/patch-list	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/patch-list	Mon May 09 14:58:28 2011 -0700
@@ -1,31 +1,27 @@
-upstream-in-1.9-branch.patch,-p1
-headers_64bit.patch,-p1
 oslog-race.patch,-p1
-sun-paths.patch
-sun-extramodes.patch
-sun-manpage.patch
-cli-nolock.patch
-cli-nobanner.patch
-make_xkm_output_dir.patch
-dtlogin-userinfo.patch
-IA.patch
-xtsol.patch
+sun-paths.patch,-p1
+sun-extramodes.patch,-p1
+sun-manpage.patch,-p1
+cli-nolock.patch,-p1
+cli-nobanner.patch,-p1
+make_xkm_output_dir.patch,-p1
+dtlogin-userinfo.patch,-p1
+IA.patch,-p1
+xtsol.patch,-p1
 amd64-loader-path.patch,-p1
-fontmod.patch
-sparc-probe.patch
-sparc-nopciprobe.patch
-glx-impure.patch
-nvidia-autoconfig.patch
-autoconfig.patch
-autoconfig2.patch
-6535006.patch
-signal-handler.patch
-6721634.patch
-dixmods-deps.patch
-sparc-initvisuals.patch
-hotkey.patch
-vt.patch
-6906694.patch
-6912996.patch
-record-regset.patch
-autodetect-kernel-dev-fb.patch
+fontmod.patch,-p1
+sparc-probe.patch,-p1
+sparc-nopciprobe.patch,-p1
+glx-impure.patch,-p1
+nvidia-autoconfig.patch,-p1
+autoconfig.patch,-p1
+signal-handler.patch,-p1
+6721634.patch,-p1
+dixmods-deps.patch,-p1
+sparc-initvisuals.patch,-p1
+hotkey.patch,-p1
+vt.patch,-p1
+6906694.patch,-p1
+6912996.patch,-p1
+record-regset.patch,-p1
+autodetect-kernel-dev-fb.patch,-p1
--- a/open-src/xserver/xorg/record-regset.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/record-regset.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,7 +1,8 @@
-diff -Nurp -x '*~' -x '*.orig' record/record.c record/record.c
---- record/record.c	2010-07-14 13:23:17.000000000 -0700
-+++ record/record.c	2010-09-03 16:45:46.118590143 -0700
-@@ -1467,6 +1467,9 @@ typedef struct
+diff --git a/record/record.c b/record/record.c
+index facaebb..8256738 100644
+--- a/record/record.c
++++ b/record/record.c
+@@ -1470,6 +1470,9 @@ typedef struct
      short first, last;	/* if for extension, major opcode interval */
  } SetInfoRec, *SetInfoPtr;
  
--- a/open-src/xserver/xorg/signal-handler.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/signal-handler.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,7 +1,8 @@
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dri/dri.c hw/xfree86/dri/dri.c
---- hw/xfree86/dri/dri.c	2010-06-06 10:53:51.000000000 -0700
-+++ hw/xfree86/dri/dri.c	2010-09-03 16:45:27.658917271 -0700
-@@ -2494,7 +2494,11 @@ int drmInstallSIGIOHandler(int fd, void 
+diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
+index 3c64ae4..62e6c7f 100644
+--- a/hw/xfree86/dri/dri.c
++++ b/hw/xfree86/dri/dri.c
+@@ -2489,7 +2489,11 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
      entry     = drmGetEntry(fd);
      entry->f  = f;
  
@@ -13,7 +14,7 @@
  }
  
  int drmRemoveSIGIOHandler(int fd)
-@@ -2503,5 +2507,9 @@ int drmRemoveSIGIOHandler(int fd)
+@@ -2498,5 +2502,9 @@ int drmRemoveSIGIOHandler(int fd)
  
      entry->f = NULL;
  
--- a/open-src/xserver/xorg/sparc-initvisuals.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sparc-initvisuals.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,7 @@
-diff -Nurp -x '*~' -x '*.orig' mi/micmap.c mi/micmap.c
---- mi/micmap.c	2010-06-10 07:07:55.000000000 -0700
-+++ mi/micmap.c	2010-09-03 16:45:35.359696561 -0700
+diff --git a/mi/micmap.c b/mi/micmap.c
+index 41e0300..266d442 100644
+--- a/mi/micmap.c
++++ b/mi/micmap.c
 @@ -494,6 +494,11 @@ maskShift (Pixel p)
   * the set which can be used with this version of cfb.
   */
@@ -13,7 +14,7 @@
  Bool
  miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
  		int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
-@@ -513,6 +518,13 @@ miInitVisuals(VisualPtr *visualp, DepthP
+@@ -513,6 +518,13 @@ miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
      int		*preferredCVCs, *prefp;
      int		first_depth;
  
--- a/open-src/xserver/xorg/sparc-nopciprobe.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sparc-nopciprobe.patch	Mon May 09 14:58:28 2011 -0700
@@ -23,10 +23,11 @@
 Omit Bus probing on sparc. It is terribly slow and we get the same info thru /dev/fb
 
 *** hw/xfree86/common/xf86Init.c.orig	Thu Dec 18 18:01:47 2008
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
---- hw/xfree86/common/xf86Init.c	2010-06-10 07:07:55.000000000 -0700
-+++ hw/xfree86/common/xf86Init.c	2010-09-03 16:45:14.619429003 -0700
-@@ -396,7 +396,10 @@ InitOutput(ScreenInfo *pScreenInfo, int 
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index e664ce4..1da5f5a 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -388,7 +388,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
          DoShowOptions();
  
      /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
--- a/open-src/xserver/xorg/sparc-probe.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sparc-probe.patch	Mon May 09 14:58:28 2011 -0700
@@ -22,9 +22,10 @@
 
 Allow probing for /dev/fb cards other than the traditional sbus devices.
 
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c
---- hw/xfree86/common/xf86sbusBus.c	2010-06-10 07:07:55.000000000 -0700
-+++ hw/xfree86/common/xf86sbusBus.c	2010-09-03 16:45:12.667073647 -0700
+diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
+index 181c6ab..e9328b3 100644
+--- a/hw/xfree86/common/xf86sbusBus.c
++++ b/hw/xfree86/common/xf86sbusBus.c
 @@ -40,6 +40,10 @@
  #include "xf86sbusBus.h"
  #include "xf86Sbus.h"
@@ -63,9 +64,10 @@
  	xf86ErrorF("\n");
      }
      if (useProm)
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h
---- hw/xfree86/common/xf86sbusBus.h	2010-06-05 18:16:49.000000000 -0700
-+++ hw/xfree86/common/xf86sbusBus.h	2010-09-03 16:45:12.667333987 -0700
+diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
+index 66a96e3..e27b0e6 100644
+--- a/hw/xfree86/common/xf86sbusBus.h
++++ b/hw/xfree86/common/xf86sbusBus.h
 @@ -39,6 +39,7 @@
  #define SBUS_DEVICE_FFB		0x000b
  #define SBUS_DEVICE_GT		0x000c
@@ -74,10 +76,11 @@
  
  typedef struct sbus_prom_node {
      int			node;
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c
---- hw/xfree86/os-support/bus/Sbus.c	2010-07-14 13:23:17.000000000 -0700
-+++ hw/xfree86/os-support/bus/Sbus.c	2010-09-03 16:45:12.667732075 -0700
-@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] =
+diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
+index 7829d80..86c74d6 100644
+--- a/hw/xfree86/os-support/bus/Sbus.c
++++ b/hw/xfree86/os-support/bus/Sbus.c
+@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] = {
      { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },
      { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
      { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },
--- a/open-src/xserver/xorg/sun-extramodes.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sun-extramodes.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,7 +1,8 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/extramodes hw/xfree86/common/extramodes
---- hw/xfree86/common/extramodes	2008-07-02 10:10:44.000000000 -0700
-+++ hw/xfree86/common/extramodes	2008-09-22 21:38:06.550110000 -0700
-@@ -25,3 +25,42 @@ Modeline "2048x1536" 340.48  2048 2216 2
+diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes
+index 4505026..86b3d51 100644
+--- a/hw/xfree86/common/extramodes
++++ b/hw/xfree86/common/extramodes
+@@ -25,3 +25,42 @@ Modeline "2048x1536" 340.48  2048 2216 2440 2832  1536 1537 1540 1603 -hsync +vs
  # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
  Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
  
--- a/open-src/xserver/xorg/sun-manpage.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,22 +1,10 @@
-diff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in
-diff -Nurp -x '*~' -x '*.orig' cpprules.in cpprules.in
---- cpprules.in	2010-04-27 13:16:52.000000000 -0700
-+++ cpprules.in	2011-02-15 15:53:08.559356397 -0800
-@@ -23,7 +23,7 @@ XORGRELSTRING = @PACKAGE_STRING@
-   XORGMANNAME = X Version 11
-   XSERVERNAME = Xorg
- 
--MANDEFS = \
-+MANDEFS = -D__SOLARIS_BUILD__ -D__distroname__="$${DISTRO_NAME}" \
-         -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-         -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
- 	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
-diff -Nurp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre
---- doc/Xserver.man.pre	2010-05-21 23:06:42.000000000 -0700
-+++ doc/Xserver.man.pre	2011-02-15 15:53:08.559855800 -0800
+diff --git a/doc/man/Xserver.man b/doc/man/Xserver.man
+index b725949..a09b3ed 100644
+--- a/doc/man/Xserver.man
++++ b/doc/man/Xserver.man
 @@ -1,3 +1,25 @@
 +.\" 
-+.\" Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
++.\" Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 +.\" 
 +.\" Permission is hereby granted, free of charge, to any person obtaining a
 +.\" copy of this software and associated documentation files (the "Software"),
@@ -40,83 +28,46 @@
  .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
  .\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
  .\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group
-@@ -32,14 +54,31 @@ Xserver \- X Window System display serve
+@@ -32,14 +54,22 @@ Xserver \- X Window System display server
  .SH SYNOPSIS
  .B X
  [option ...]
-+#ifdef __SOLARIS_BUILD__ 
++.PP
 +\fB/usr/bin/Xserver\fP [\fB-c\fP \fIclass\fP] \fB:\fP\fIdisplaynumber\fP [\fIX server arguments\fP]
-+#endif
-+.PP
  .SH DESCRIPTION
  .I X
  is the generic name for the X Window System display server.  It is
  frequently a link or a copy of the appropriate server binary for
  driving the most frequently used server on a given machine.
-+#ifdef __SOLARIS_BUILD__
-+In this release of __distroname__, /usr/bin/X is a link to the 
++In this release of __distroname__, /usr/bin/X is a link to the
 +Xserver program which starts the appropriate X server based on properties
 +set for the service management facility, under the service identifier
 +\fIsvc:/application/x11/x11-server\fP.  The properties are described in the
 +SMF PROPERTIES section below.
-+#endif
  .SH "STARTING THE SERVER"
-+#ifdef __SOLARIS_BUILD__
+-The X server is usually started from the X Display Manager program
+-\fIxdm\fP(1) or a similar display manager program.
 +On __distroname__, the X server is usually started from the GNOME
 +Display Manager program \fIgdm\fP(1m).   This role may also be performed
 +by the X Display Manager program \fIxdm\fP(1), or another display manager. 
-+#else
- The X server is usually started from the X Display Manager program 
- \fIxdm\fP(1) or a similar display manager program.
-+#endif
  This utility is run from the system boot files and takes care of keeping
  the server running, prompting for usernames and passwords, and starting up
  the user sessions.
-@@ -175,6 +214,35 @@ MB.
- .TP 8
- .B \-nocursor
- disable the display of the pointer cursor.
-+#ifdef __SOLARIS_BUILD__
-+.TP 8
-+.B \-nolisten \fItransport\fP
-+disables listening for client connections on the named transport. The 
-+current transport names supported are as follows: 
+@@ -182,6 +212,13 @@ with
+ .BR "\-nolisten tcp" .
+ This option may be issued multiple times to disable listening to different
+ transport types.
++The current transport names supported on __distroname__ are as follows: 
 +.sp
 +.nf 
 +tcp     TCP over IPv4 or IPv6
 +unix    UNIX Domain Sockets (/tmp/.x11-unix)
-+pipe    Named pipes (/tmp/.x11-pipe/) and shared memory
-+.fi
-+.PP
-+.in +8
-+By default each of the above servers opens listeners on each of the 
-+above transports. The -nolisten command line argument disables listening 
-+on the named transports. You can disable multiple transports by listing 
-+this option multiple times, for example: 
-+.sp
-+.nf 
-+-nolisten pipe -nolisten tcp
++pipe    Named pipes (/tmp/.x11-pipe/)
 +.fi
-+.PP
-+.in -8
-+.in +13
-+If all available transports are disabled, then the commands issue a fatal 
-+error message and exit. A server not listening for any clients is of little 
-+value.
-+.in -13
-+#else 
- .TP 8
- .B \-nolisten \fItrans-type\fP
- disables a transport type.  For example, TCP/IP connections can be disabled
-@@ -182,6 +250,7 @@ with
- .BR "\-nolisten tcp" .
- This option may be issued multiple times to disable listening to different
- transport types.
-+#endif
  .TP 8
  .B \-noreset
  prevents a server reset when the last client connection is closed.  This
-@@ -381,7 +450,7 @@ located in the XKB base directory or a s
+@@ -373,7 +410,7 @@ located in the XKB base directory or a subdirectory, and specified as the
  relative path from the XKB base directory.  The default XKB base directory is
  .IR __projectroot__/lib/X11/xkb .
  .TP 8
@@ -125,11 +76,10 @@
  enables(+) or disables(-) AccessX key sequences.
  .TP 8
  .B \-xkbdir \fIdirectory\fP
-@@ -537,6 +606,117 @@ the following font path:
+@@ -529,6 +566,115 @@ the following font path:
      /usr/share/fonts/default/Type1,
      /usr/share/fonts/default/ghostscript
  .fi
-+#ifdef __SOLARIS_BUILD__
 + 
 +.SH SMF PROPERTIES
 +.PP
@@ -239,60 +189,46 @@
 +.nf
 +svccfg -s svc:/application/x11/x11-server setprop options/server_args=+xinerama
 +.fi
-+#endif
  
  .SH FILES
  .TP 30
-@@ -551,12 +731,23 @@ Outline font directories
- .TP 30
+@@ -544,11 +690,18 @@ Outline font directories
  .I /tmp/.X11-unix/X\fBn\fP
  Unix domain socket for display number \fBn\fP
-+#ifdef __SOLARIS_BUILD__
-+.TP 30
+ .TP 30
 +.I /tmp/.X11-pipe/X\fBn\fP
 +Named pipe (FIFO) for display number \fBn\fP
-+#endif
- .TP 30
++.TP 30
  .I /usr/adm/X\fBn\fPmsgs
  Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)
  .TP 30
  .I __projectroot__/lib/X11/xdm/xdm-errors
  Default error log file if the server is run from \fIxdm\fP(1)
-+#ifdef __SOLARIS_BUILD__
 +.TP 30
 +.I /var/log/gdm/:\fBn\fP.log
 +Default error log file for display number \fBn\fP if the server is run 
 +from \fIgdm\fP(1m)
-+#endif
  .SH "SEE ALSO"
  General information: \fIX\fP(__miscmansuffix__)
  .PP
-@@ -573,14 +764,28 @@ Security: \fIXsecurity\fP(__miscmansuffi
+@@ -565,14 +718,17 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
  \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
  .I "Security Extension Specification"
  .PP
-+#ifdef __SOLARIS_BUILD__
+-Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
 +Starting the server: \fIgdm\fP(1m), \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
-+#else
- Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
-+#endif
  .PP
  Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
  \fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)
-+#ifdef __SOLARIS_BUILD__ 
 +.\" Only list the servers shipped on Solaris
-+.PP
-+Server-specific man pages:
+ .PP
+ Server-specific man pages:
+-\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
+-\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
 +\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1)
 +.PP
 +Service management framework:
 +\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
-+#else
- .PP
- Server-specific man pages:
- \fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
- \fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
-+#endif
  .PP
  Server internal documentation:
  .I "Definition of the Porting Layer for the X v11 Sample Server"
--- a/open-src/xserver/xorg/sun-paths.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/sun-paths.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,7 +1,8 @@
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2010-06-10 23:10:22.000000000 -0700
-+++ hw/xfree86/common/xf86Config.c	2011-02-15 15:53:04.379144701 -0800
-@@ -75,9 +75,9 @@ extern DeviceAssocRec mouse_assoc;
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 5312ca6..9622eab 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -74,9 +74,9 @@
   */
  #ifndef ROOT_CONFIGPATH
  #define ROOT_CONFIGPATH	"%A," "%R," \
@@ -10,10 +11,10 @@
  			"%E," "%F," \
 -			"/etc/X11/%F," "%P/etc/X11/%F," \
 +			"/etc/X11/%F," "%P/lib/X11/%F," \
- 			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- 			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+ 			"/etc/X11/%X," "/etc/%X," \
+ 			"%P/etc/X11/%X.%H," \
  			"%P/etc/X11/%X," \
-@@ -85,8 +85,8 @@ extern DeviceAssocRec mouse_assoc;
+@@ -84,8 +84,8 @@
  			"%P/lib/X11/%X"
  #endif
  #ifndef USER_CONFIGPATH
@@ -21,13 +22,14 @@
 -			"/etc/X11/%G," "%P/etc/X11/%G," \
 +#define USER_CONFIGPATH	"/etc/X11/%S," "%P/lib/X11/%S," \
 +			"/etc/X11/%G," "%P/lib/X11/%G," \
- 			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- 			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+ 			"/etc/X11/%X," "/etc/%X," \
+ 			"%P/etc/X11/%X.%H," \
  			"%P/etc/X11/%X," \
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
---- hw/xfree86/common/xf86Globals.c	2010-06-06 14:37:03.000000000 -0700
-+++ hw/xfree86/common/xf86Globals.c	2011-02-15 15:53:04.379410669 -0800
-@@ -140,7 +140,8 @@ xf86InfoRec xf86Info = {
+diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
+index 16d5557..f87c1eb 100644
+--- a/hw/xfree86/common/xf86Globals.c
++++ b/hw/xfree86/common/xf86Globals.c
+@@ -138,7 +138,8 @@ xf86InfoRec xf86Info = {
  };
  const char *xf86ConfigFile = NULL;
  const char *xf86ConfigDir = NULL;
@@ -37,9 +39,10 @@
  MessageType xf86ModPathFrom = X_DEFAULT;
  const char *xf86LogFile = DEFAULT_LOGPREFIX;
  MessageType xf86LogFileFrom = X_DEFAULT;
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/doc/man/xorg.conf.man.pre hw/xfree86/doc/man/xorg.conf.man.pre
---- hw/xfree86/doc/man/xorg.conf.man.pre	2010-06-10 23:10:22.000000000 -0700
-+++ hw/xfree86/doc/man/xorg.conf.man.pre	2011-02-15 15:53:04.380098603 -0800
+diff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/doc/man/xorg.conf.man
+index e3fd0ea..dac9a10 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man
++++ b/hw/xfree86/doc/man/xorg.conf.man
 @@ -36,9 +36,9 @@ server is started as a normal user:
  .RS 4
  .nf
@@ -49,10 +52,10 @@
  .IB /etc/X11/ $XORGCONFIG
 -.IB __projectroot__/etc/X11/ $XORGCONFIG
 +.IB __projectroot__/lib/X11/ $XORGCONFIG
- .I /etc/X11/__xconfigfile__\-4
  .I /etc/X11/__xconfigfile__
  .I /etc/__xconfigfile__
-@@ -70,10 +70,10 @@ search locations are as follows:
+ .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
+@@ -67,10 +67,10 @@ search locations are as follows:
  .nf
  <cmdline>
  .IR /etc/X11/ <cmdline>
@@ -62,12 +65,13 @@
  .IB /etc/X11/ $XORGCONFIG
 -.IB __projectroot__/etc/X11/ $XORGCONFIG
 +.IB __projectroot__/lib/X11/ $XORGCONFIG
- .I /etc/X11/__xconfigfile__\-4
  .I /etc/X11/__xconfigfile__
  .I /etc/__xconfigfile__
-diff -Nurp -x '*~' -x '*.orig' include/xorg-server.h.in include/xorg-server.h.in
---- include/xorg-server.h.in	2011-02-15 15:53:02.434190580 -0800
-+++ include/xorg-server.h.in	2011-02-15 15:53:04.380266311 -0800
+ .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
+diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
+index b10b994..feaedfc 100644
+--- a/include/xorg-server.h.in
++++ b/include/xorg-server.h.in
 @@ -184,6 +184,7 @@
  /* X Access Control Extension */
  #undef XACE
--- a/open-src/xserver/xorg/upstream-in-1.9-branch.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-From 0a4b0de9afeab0cd47e1e297d5b5d42bfda0a5a7 Mon Sep 17 00:00:00 2001
-From: Maarten Maathuis <[email protected]>
-Date: Sun, 30 Jan 2011 14:06:15 +0100
-Subject: [PATCH 01/16] exa: Only call driver FinishAccess hook if PrepareAccess hook succeeded.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Michel Dänzer <[email protected]>
-Signed-off-by: Maarten Maathuis <[email protected]>
-Signed-off-by: Keith Packard <[email protected]>
-(cherry picked from commit af87f6367ef733d1a4f3cfca4eeb92bfd84c2b6f)
----
- exa/exa.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/exa/exa.c b/exa/exa.c
-index 8adf847..a4e294a 100644
---- a/exa/exa.c
-+++ b/exa/exa.c
-@@ -421,7 +421,8 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
-     /* We always hide the devPrivate.ptr. */
-     pPixmap->devPrivate.ptr = NULL;
- 
--    if (!pExaScr->info->FinishAccess || !exaPixmapHasGpuCopy(pPixmap))
-+    /* Only call FinishAccess if PrepareAccess was called and succeeded. */
-+    if (!pExaScr->info->FinishAccess || !pExaScr->access[i].retval)
- 	return;
- 
-     if (i >= EXA_PREPARE_AUX_DEST &&
--- 
-1.7.3.2
-
-From 7b3b7efe78dec87c8059ea0d0985f08a97f0633d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
-Date: Thu, 24 Feb 2011 12:17:57 +0100
-Subject: [PATCH 06/16] EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy
-pitch to that instead of to a possibly bogus value derived from the new width.
-This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes
-https://bugs.freedesktop.org/show_bug.cgi?id=33929 .
-
-On the other hand, the system memory copy doesn't need the pitch to be aligned
-beyond the PixmapBytePad of the width.
-
-Signed-off-by: Michel Dänzer <[email protected]>
-Acked-by: Cyril Brulebois <[email protected]>
-Tested-by: Cyril Brulebois <[email protected]>
-Reported-by: Thierry Vignaud <[email protected]>
-Tested-by: Thierry Vignaud <[email protected]>
-Signed-off-by: Keith Packard <[email protected]>
-(cherry picked from commit 31704510f448706524b7b7085cc4ff0ada7bfe7e)
----
- exa/exa_mixed.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
-index 606f1e1..fd1afb2 100644
---- a/exa/exa_mixed.c
-+++ b/exa/exa_mixed.c
-@@ -175,8 +175,10 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- 	depth != pPixmap->drawable.depth ||
- 	bitsPerPixel != pPixmap->drawable.bitsPerPixel) {
- 	if (pExaPixmap->driverPriv) {
--            exaSetFbPitch(pExaScr, pExaPixmap,
--                          width, height, bitsPerPixel);
-+	    if (devKind > 0)
-+		pExaPixmap->fb_pitch = devKind;
-+	    else
-+		exaSetFbPitch(pExaScr, pExaPixmap, width, height, bitsPerPixel);
- 
-             exaSetAccelBlock(pExaScr, pExaPixmap,
-                              width, height, bitsPerPixel);
-@@ -187,8 +189,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- 	if (has_gpu_copy && pExaPixmap->sys_ptr) {
- 	    free(pExaPixmap->sys_ptr);
- 	    pExaPixmap->sys_ptr = NULL;
--	    pExaPixmap->sys_pitch = devKind > 0 ? devKind :
--	        PixmapBytePad(width, depth);
-+	    pExaPixmap->sys_pitch = PixmapBytePad(width, depth);
- 	    DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
- 	    DamageDestroy(pExaPixmap->pDamage);
- 	    pExaPixmap->pDamage = NULL;
--- 
-1.7.3.2
-
-From 11bf10e22cefe661f5650d49316bbd938a40094c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Mon, 8 Feb 2010 15:23:04 -0500
-Subject: [PATCH 12/16] xfree86: If the driver found modes on an output, don't add more
-
-Inferring modes from sync ranges is only valid if the monitor says it's
-valid.  If the monitor says it's valid, then we'll have already added
-those modes during EDID block parse.  If it doesn't, then we should
-believe it.
-
-If there's no EDID for an output, but sync ranges from the config, we'll
-still add default modes as normal.
-
-Reviewed-by: Alex Deucher <[email protected]>
-Signed-off-by: Adam Jackson <[email protected]>
-(cherry picked from commit dc498b433f36af5d2de3065e7c64cdb575385d81)
----
- hw/xfree86/modes/xf86Crtc.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index b2daec7..dd8ccad 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1566,7 +1566,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- 	int		    min_clock = 0;
- 	int		    max_clock = 0;
- 	double		    clock;
--	Bool		    add_default_modes = xf86ReturnOptValBool(output->options, OPTION_DEFAULT_MODES, TRUE);
-+	Bool		    add_default_modes;
- 	Bool		    debug_modes = config->debug_modes ||
- 					  xf86Initialising;
- 	enum det_monrec_source sync_source = sync_default;
-@@ -1612,6 +1612,14 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- 	}
- 	
- 	output_modes = (*output->funcs->get_modes) (output);
-+
-+	/*
-+	 * If the user has a preference, respect it.
-+	 * Otherwise, don't second-guess the driver.
-+	 */
-+	if (!xf86GetOptValBool(output->options, OPTION_DEFAULT_MODES,
-+			       &add_default_modes))
-+	    add_default_modes = (output_modes == NULL);
- 	
- 	edid_monitor = output->MonInfo;
- 	
--- 
-1.7.3.2
-
-From 8a18d18bb31933d8dd0fe63cd293d7ae6711abcc Mon Sep 17 00:00:00 2001
-From: Evan Broder <[email protected]>
-Date: Tue, 1 Feb 2011 16:09:50 -0800
-Subject: [PATCH 13/16] xfree86/modes: Be sure to only use new EDID for physical output dimensions
-
-The EDID processing regards physical dimensions of 0mm x 0mm as
-invalid. Previously the old values for height and width would be
-preserved if none of the physical dimension specifications in the new
-EDID were considered valid.
-
-This will come up in particular if first a monitor is connected to an
-output, and then a projector is connected. Since projectors generally
-report physical dimensions of 0mm x 0mm, this would result in the
-projector claiming to have the physical dimensions of the monitor.
-
-Signed-off-by: Evan Broder <[email protected]>
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Keith Packard <[email protected]>
-(cherry picked from commit 12b0f7df2caa78d68b453aaa91248bb3577fd724)
----
- hw/xfree86/modes/xf86Crtc.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index dd8ccad..30742ff 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -2976,6 +2976,8 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
- 	free(output->MonInfo);
-     
-     output->MonInfo = edid_mon;
-+    output->mm_width = 0;
-+    output->mm_height = 0;
- 
-     if (debug_modes) {
- 	xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
--- 
-1.7.3.2
-
-From 457728d723a7d93cd88691dd920bf42a7540616a Mon Sep 17 00:00:00 2001
-From: Julien Cristau <[email protected]>
-Date: Sat, 3 Jul 2010 19:42:26 +0100
-Subject: [PATCH 14/16] glx: make sure screen is non-negative in validGlxScreen
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Adam Jackson <[email protected]>
-Reviewed-by: Kristian Høgsberg <[email protected]>
-Reviewed-by: Daniel Stone <[email protected]>
-Signed-off-by: Julien Cristau <[email protected]>
-(cherry picked from commit 3f0d3f4d97bce75c1828635c322b6560a45a037f)
----
- glx/glxcmds.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/glx/glxcmds.c b/glx/glxcmds.c
-index 8d13c15..9e32d6c 100644
---- a/glx/glxcmds.c
-+++ b/glx/glxcmds.c
-@@ -57,7 +57,7 @@ validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
-     /*
-     ** Check if screen exists.
-     */
--    if (screen >= screenInfo.numScreens) {
-+    if (screen < 0 || screen >= screenInfo.numScreens) {
- 	client->errorValue = screen;
- 	*err = BadValue;
- 	return FALSE;
--- 
-1.7.3.2
-
-From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Thu, 24 Feb 2011 16:06:34 -0500
-Subject: [PATCH 16/16] vbe: Fix malloc size bug
-
-v2: Slightly more obvious sizing math.
-
-==14882== Invalid write of size 2
-==14882==    at 0x6750267: VBEGetVBEInfo (vbe.c:400)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-==14882==  Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
-==14882==    at 0x4A0640D: malloc (vg_replace_malloc.c:236)
-==14882==    by 0x675024B: VBEGetVBEInfo (vbe.c:398)
-==14882==    by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
-==14882==    by 0x471895: InitOutput (xf86Init.c:519)
-==14882==    by 0x422778: main (main.c:205)
-
-Reviewed-by: Mark Kettenis <[email protected]>
-Reviewed-by: Alan Coopersmith <[email protected]>
-Signed-off-by: Adam Jackson <[email protected]>
-(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
----
- hw/xfree86/vbe/vbe.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
-index 7a64a4a..1d3775b 100644
---- a/hw/xfree86/vbe/vbe.c
-+++ b/hw/xfree86/vbe/vbe.c
-@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
-     i = 0;
-     while (modes[i] != 0xffff)
- 	i++;
--    block->VideoModePtr = malloc(sizeof(CARD16) * i + 1);
-+    block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1));
-     memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i);
-     block->VideoModePtr[i] = 0xffff;
- 
--- 
-1.7.3.2
-
--- a/open-src/xserver/xorg/vt.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/vt.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,6 +1,7 @@
-diff -Nurp -x '*~' -x '*.orig' dix/main.c dix/main.c
---- dix/main.c	2010-09-03 16:45:37.986184004 -0700
-+++ dix/main.c	2010-09-03 16:45:40.072259890 -0700
+diff --git a/dix/main.c b/dix/main.c
+index 9c3951a..86afa8c 100644
+--- a/dix/main.c
++++ b/dix/main.c
 @@ -79,6 +79,8 @@ Equipment Corporation.
  #include <version-config.h>
  #endif
@@ -10,9 +11,9 @@
  #include <X11/X.h>
  #include <X11/Xos.h>   /* for unistd.h  */
  #include <X11/Xproto.h>
-@@ -125,6 +127,30 @@ extern void Dispatch(void);
+@@ -122,6 +124,30 @@ extern void DtloginCloseDown(void);
  
- extern void InitProcVectors(void);
+ extern void Dispatch(void);
  
 +#if defined(sun) 
 +extern const char * GetAuthFilename(void);
@@ -41,7 +42,7 @@
  #ifdef XQUARTZ
  #include <pthread.h>
  
-@@ -141,6 +167,9 @@ int main(int argc, char *argv[], char *e
+@@ -138,6 +164,9 @@ int main(int argc, char *argv[], char *envp[])
  {
      int		i;
      HWEventQueueType	alwaysCheckForInput[2];
@@ -51,7 +52,7 @@
  
      display = "0";
  
-@@ -156,6 +185,12 @@ int main(int argc, char *argv[], char *e
+@@ -153,6 +182,12 @@ int main(int argc, char *argv[], char *envp[])
  
      ProcessCommandLine(argc, argv);
  
@@ -64,9 +65,10 @@
      alwaysCheckForInput[0] = 0;
      alwaysCheckForInput[1] = 1;
      while(1)
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/os-support/solaris/sun_init.c hw/xfree86/os-support/solaris/sun_init.c
---- hw/xfree86/os-support/solaris/sun_init.c	2010-06-05 18:16:52.000000000 -0700
-+++ hw/xfree86/os-support/solaris/sun_init.c	2010-09-03 16:45:40.072623997 -0700
+diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
+index 281a6df..42e20ac 100644
+--- a/hw/xfree86/os-support/solaris/sun_init.c
++++ b/hw/xfree86/os-support/solaris/sun_init.c
 @@ -45,6 +45,9 @@
  #define	CONSOLE_VTNO	1
  #define	SOL_CONSOLE_DEV	"/dev/console"
@@ -77,7 +79,7 @@
  static Bool KeepTty = FALSE;
  static Bool Protect0 = FALSE;
  static Bool UseConsole = FALSE;
-@@ -235,6 +238,8 @@ OPENCONSOLE:
+@@ -234,6 +237,8 @@ OPENCONSOLE:
  
  	    if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
  		xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
--- a/open-src/xserver/xorg/xtsol.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/xtsol.patch	Mon May 09 14:58:28 2011 -0700
@@ -19,9 +19,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am	2011-02-15 15:53:19.157650482 -0800
-+++ Makefile.am	2011-02-15 15:53:21.258518321 -0800
+diff --git a/Makefile.am b/Makefile.am
+index 4d2e2ca..e14a6e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -17,6 +17,10 @@ if RECORD
  RECORD_DIR=record
  endif
@@ -41,10 +42,11 @@
  	exa \
  	config \
  	hw \
-diff -Nurp -x '*~' -x '*.orig' Xext/security.c Xext/security.c
---- Xext/security.c	2010-06-10 23:10:22.000000000 -0700
-+++ Xext/security.c	2011-02-15 15:53:21.258912860 -0800
-@@ -1146,3 +1146,27 @@ SecurityExtensionInit(INITARGS)
+diff --git a/Xext/security.c b/Xext/security.c
+index 8673880..14bb5cd 100644
+--- a/Xext/security.c
++++ b/Xext/security.c
+@@ -1144,3 +1144,27 @@ SecurityExtensionInit(INITARGS)
      /* Label objects that were created before we could register ourself */
      SecurityLabelInitial();
  }
@@ -72,9 +74,10 @@
 +    
 +    return oldLevel;
 +}
-diff -Nurp -x '*~' -x '*.orig' Xext/securitysrv.h Xext/securitysrv.h
---- Xext/securitysrv.h	2009-09-27 18:56:58.000000000 -0700
-+++ Xext/securitysrv.h	2011-02-15 15:53:21.259073802 -0800
+diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
+index 3d3894a..8b7317f 100644
+--- a/Xext/securitysrv.h
++++ b/Xext/securitysrv.h
 @@ -80,4 +80,8 @@ typedef struct {
  /* Give this value or higher to the -audit option to get security messages */
  #define SECURITY_AUDIT_LEVEL 4
@@ -84,10 +87,11 @@
 +extern _X_EXPORT unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
 +
  #endif /* _SECURITY_SRV_H */
-diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2011-02-15 15:53:19.158803446 -0800
-+++ configure.ac	2011-02-15 15:53:21.259892485 -0800
-@@ -231,6 +231,14 @@ dnl Find the math libary
+diff --git a/configure.ac b/configure.ac
+index f4311c3..69057ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,6 +227,14 @@ dnl Find the math libary
  AC_CHECK_LIB(m, sqrt)
  AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
  
@@ -102,48 +106,49 @@
  AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
  
  dnl AGPGART headers
-@@ -1515,6 +1523,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xy
+@@ -1501,6 +1509,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
  if test "x$XVFB" = xyes; then
- 	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
+ 	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
  	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
 +	XVFB_LIBS="$XVFB_LIBS $TSOL_LIB"
 +	XVFB_SYS_LIBS="$XVFB_SYS_LIBS $TSOL_SYS_LIBS"
  	AC_SUBST([XVFB_LIBS])
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
-@@ -1536,6 +1546,8 @@ if test "x$XNEST" = xyes; then
+@@ -1522,6 +1532,8 @@ if test "x$XNEST" = xyes; then
  	fi
- 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
+ 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
  	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
 +	XNEST_LIBS="$XNEST_LIBS $TSOL_LIB"
 +	XNEST_SYS_LIBS="$XNEST_SYS_LIBS $TSOL_SYS_LIBS"
  	AC_SUBST([XNEST_LIBS])
  	AC_SUBST([XNEST_SYS_LIBS])
  fi
-@@ -2100,6 +2112,7 @@ if test "$KDRIVE" = yes; then
+@@ -2086,6 +2098,7 @@ if test "$KDRIVE" = yes; then
      KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
  
-     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
+     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
 +    KDRIVE_PURE_LIBS="$KDRIVE_PURE_LIBS $TSOL_LIB"
      KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
      case $host_os in
  	*linux*)
-@@ -2280,3 +2293,6 @@ xorg-server.pc
+@@ -2277,3 +2290,6 @@ xorg-server.pc
  
  # Add Sun IA extension
  AC_OUTPUT([IA/Makefile])
 +
 +# Add Sun Trusted Extensions extension
 +AC_OUTPUT([tsol/Makefile])
-diff -Nurp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c
---- dix/dispatch.c	2010-06-10 23:10:22.000000000 -0700
-+++ dix/dispatch.c	2011-02-15 15:53:21.260755445 -0800
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 7b2132d..63a2378 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
 @@ -74,8 +74,8 @@ Equipment Corporation.
  
  ******************************************************************/
  
 -/* XSERVER_DTRACE additions:
-- * Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+- * Copyright (c) 2005-2006, Oracle and/or its affiliates. All rights reserved.
 +/* 
 + * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
   *
@@ -160,7 +165,7 @@
  static int nextFreeClientID; /* always MIN free client ID */
  
  static int	nClients;	/* number of authorized clients */
-@@ -897,7 +901,12 @@ ProcCirculateWindow(ClientPtr client)
+@@ -896,7 +900,12 @@ ProcCirculateWindow(ClientPtr client)
      return Success;
  }
  
@@ -174,7 +179,7 @@
  GetGeometry(ClientPtr client, xGetGeometryReply *rep)
  {
      DrawablePtr pDraw;
-@@ -2000,7 +2009,12 @@ ProcPutImage(ClientPtr client)
+@@ -1990,7 +1999,12 @@ ProcPutImage(ClientPtr client)
       return Success;
  }
  
@@ -188,49 +193,10 @@
  DoGetImage(ClientPtr client, int format, Drawable drawable, 
             int x, int y, int width, int height, 
             Mask planemask, xGetImageReply **im_return)
-diff -Nurp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c	2010-12-02 12:16:53.000000000 -0800
-+++ dix/events.c	2011-02-15 15:53:21.262022757 -0800
-@@ -75,7 +75,7 @@ Equipment Corporation.
- ******************************************************************/
- 
- /*
-- * Copyright © 2003-2005 Sun Microsystems, Inc.  All rights reserved.
-+ * Copyright (c) 2003-2005, 2007, Oracle and/or its affiliates. All rights reserved.
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a
-  * copy of this software and associated documentation files (the "Software"),
-@@ -334,7 +334,12 @@ IsMaster(DeviceIntPtr dev)
-     return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
- }
- 
--static WindowPtr XYToWindow(
-+#ifdef TSOL
-+_X_EXPORT
-+#else
-+static
-+#endif
-+WindowPtr XYToWindow(
-     DeviceIntPtr pDev,
-     int x,
-     int y
-@@ -2583,7 +2588,12 @@ PointInBorderSize(WindowPtr pWin, int x,
-  *
-  * @returns the window at the given coordinates.
-  */
--static WindowPtr
-+#ifdef TSOL
-+_X_EXPORT
-+#else
-+static
-+#endif
-+WindowPtr
- XYToWindow(DeviceIntPtr pDev, int x, int y)
- {
-     WindowPtr  pWin;
-diff -Nurp -x '*~' -x '*.orig' dix/window.c dix/window.c
---- dix/window.c	2010-11-09 22:26:52.000000000 -0800
-+++ dix/window.c	2011-02-15 15:53:21.262869239 -0800
+diff --git a/dix/window.c b/dix/window.c
+index 9be7064..25f1a52 100644
+--- a/dix/window.c
++++ b/dix/window.c
 @@ -97,6 +97,33 @@ Equipment Corporation.
  
  ******************************************************************/
@@ -265,7 +231,7 @@
  
  #ifdef HAVE_DIX_CONFIG_H
  #include <dix-config.h>
-@@ -173,6 +200,11 @@ static Bool TileScreenSaver(ScreenPtr pS
+@@ -175,6 +202,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
  
  #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
  
@@ -277,7 +243,7 @@
  #ifdef DEBUG
  /******
   * PrintWindowTree
-@@ -1805,7 +1837,12 @@ IsSiblingAboveMe(
+@@ -1835,7 +1867,12 @@ IsSiblingAboveMe(
      return Below;
  }
  
@@ -291,7 +257,7 @@
  WindowExtents(
      WindowPtr pWin,
      BoxPtr pBox)
-@@ -1835,7 +1872,12 @@ MakeBoundingRegion (
+@@ -1865,7 +1902,12 @@ MakeBoundingRegion (
      return pRgn;
  }
  
@@ -305,7 +271,7 @@
  ShapeOverlap (
      WindowPtr	pWin,
      BoxPtr	pWinBox,
-@@ -2035,7 +2077,12 @@ WhereDoIGoInTheStack(
+@@ -2065,7 +2107,12 @@ WhereDoIGoInTheStack(
      }
  }
  
@@ -319,10 +285,11 @@
  ReflectStackChange(
      WindowPtr pWin,
      WindowPtr pSib,
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c	2011-02-15 15:53:19.159630285 -0800
-+++ hw/xfree86/common/xf86Config.c	2011-02-15 15:53:21.263463226 -0800
-@@ -127,6 +127,7 @@ static ModuleDefault ModuleDefaults[] = 
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 21bfe0b..7c548eb 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = {
      {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
  #endif
      {.name = "ia",       .toLoad = TRUE,    .load_opt=NULL},
@@ -330,10 +297,11 @@
      {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
  };
  
-diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am	2011-02-15 15:53:19.159921744 -0800
-+++ hw/xfree86/dixmods/Makefile.am	2011-02-15 15:53:21.263627438 -0800
-@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(t
+diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
+index ea065fa..5e5725e 100644
+--- a/hw/xfree86/dixmods/Makefile.am
++++ b/hw/xfree86/dixmods/Makefile.am
+@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
  libia_la_LDFLAGS = -avoid-version
  libia_la_LIBADD = $(top_builddir)/IA/libIA.la
  libia_la_SOURCES = iamodule.c
@@ -345,10 +313,11 @@
 +libxtsol_la_LIBADD = $(top_builddir)/tsol/libxtsol.la
 +libxtsol_la_SOURCES = tsolmodule.c
 +endif
-diff -Nurp -x '*~' -x '*.orig' include/dix.h include/dix.h
---- include/dix.h	2010-06-10 23:10:22.000000000 -0700
-+++ include/dix.h	2011-02-15 15:53:21.263857126 -0800
-@@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientExceptio
+diff --git a/include/dix.h b/include/dix.h
+index 12e4b59..50c20ed 100644
+--- a/include/dix.h
++++ b/include/dix.h
+@@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientException(
      ClientPtr /*client*/);
  
  extern _X_HIDDEN Bool CreateConnectionBlock(void);
@@ -364,21 +333,10 @@
  /* dixutils.c */
  
  extern _X_EXPORT int CompareISOLatin1Lowered(
-diff -Nurp -x '*~' -x '*.orig' include/dixevents.h include/dixevents.h
---- include/dixevents.h	2009-09-27 18:57:02.000000000 -0700
-+++ include/dixevents.h	2011-02-15 15:53:21.264009881 -0800
-@@ -88,4 +88,8 @@ extern _X_EXPORT void PostSyntheticMotio
-                                 unsigned long time);
- #endif
- 
-+#ifdef TSOL
-+extern _X_EXPORT WindowPtr XYToWindow(DeviceIntPtr pDev, int x, int y);
-+#endif
-+
- #endif /* DIXEVENTS_H */
-diff -Nurp -x '*~' -x '*.orig' include/extnsionst.h include/extnsionst.h
---- include/extnsionst.h	2010-05-23 00:30:24.000000000 -0700
-+++ include/extnsionst.h	2011-02-15 15:53:21.264213101 -0800
+diff --git a/include/extnsionst.h b/include/extnsionst.h
+index bb66dfb..3a51180 100644
+--- a/include/extnsionst.h
++++ b/include/extnsionst.h
 @@ -45,6 +45,34 @@ SOFTWARE.
  
  ******************************************************************/
@@ -447,10 +405,11 @@
 +
  #endif /* EXTENSIONSTRUCT_H */
  
-diff -Nurp -x '*~' -x '*.orig' include/input.h include/input.h
---- include/input.h	2010-08-13 01:02:40.000000000 -0700
-+++ include/input.h	2011-02-15 15:53:21.264443755 -0800
-@@ -406,7 +406,7 @@ extern void NoteLedState(
+diff --git a/include/input.h b/include/input.h
+index f96a0a9..89ab1bf 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -403,7 +403,7 @@ extern void NoteLedState(
      int /*led*/,
      Bool /*on*/);
  
@@ -459,10 +418,11 @@
      DeviceIntPtr /*device*/,
      ClientPtr /*client*/);
  
-diff -Nurp -x '*~' -x '*.orig' include/window.h include/window.h
---- include/window.h	2009-09-27 18:57:02.000000000 -0700
-+++ include/window.h	2011-02-15 15:53:21.264618099 -0800
-@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEve
+diff --git a/include/window.h b/include/window.h
+index 6fb2f8c..29e4364 100644
+--- a/include/window.h
++++ b/include/window.h
+@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEvents(
  extern _X_EXPORT void EnableMapUnmapEvents(
      WindowPtr /* pWin */ );
  
@@ -472,9 +432,10 @@
 +#endif
 +
  #endif /* WINDOW_H */
-diff -Nurp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c	2011-02-15 15:53:19.160356394 -0800
-+++ mi/miinitext.c	2011-02-15 15:53:21.264889170 -0800
+diff --git a/mi/miinitext.c b/mi/miinitext.c
+index ee04b05..82a4d2e 100644
+--- a/mi/miinitext.c
++++ b/mi/miinitext.c
 @@ -66,6 +66,7 @@ SOFTWARE.
  #undef DAMAGE
  #undef COMPOSITE
@@ -503,7 +464,7 @@
  
  /* FIXME: this whole block of externs should be from the appropriate headers */
  #ifdef MITSHM
-@@ -315,6 +322,9 @@ static ExtensionToggle ExtensionToggleLi
+@@ -315,6 +322,9 @@ static ExtensionToggle ExtensionToggleList[] =
  #ifdef SolarisIAExtension
      { IANAME /* "SolarisIA" */, &noIAExtension },
  #endif
@@ -513,7 +474,7 @@
  #ifdef RES
      { "X-Resource", &noResExtension },
  #endif
-@@ -486,6 +496,11 @@ InitExtensions(int argc, char *argv[])
+@@ -484,6 +494,11 @@ InitExtensions(int argc, char *argv[])
  #ifdef SolarisIAExtension
      if (!noIAExtension) IAExtensionInit();
  #endif
@@ -525,10 +486,11 @@
  }
  
  #else /* XFree86LOADER */
-diff -Nurp -x '*~' -x '*.orig' os/connection.c os/connection.c
---- os/connection.c	2010-09-11 14:20:51.000000000 -0700
-+++ os/connection.c	2011-02-15 15:53:21.265265952 -0800
-@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE
+diff --git a/os/connection.c b/os/connection.c
+index 5580fab..c69d4fe 100644
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
  
  ******************************************************************/
@@ -562,7 +524,7 @@
  /*****************************************************************
   *  Stuff to create connections --- OS dependent
   *
-@@ -256,6 +283,11 @@ static int		ListenTransCount;
+@@ -255,6 +282,11 @@ static int		ListenTransCount;
  
  static void ErrorConnMax(XtransConnInfo /* trans_conn */);
  
@@ -574,7 +536,7 @@
  static XtransConnInfo
  lookup_trans_conn (int fd)
  {
-@@ -651,6 +683,12 @@ ClientAuthorized(ClientPtr client, 
+@@ -646,6 +678,12 @@ ClientAuthorized(ClientPtr client,
      priv = (OsCommPtr)client->osPrivate;
      trans_conn = priv->trans_conn;
  
--- a/open-src/xserver/xvnc/Makefile	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xvnc/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -39,11 +39,11 @@
 MODULE_LICENSE_PREPEND	= $(GPL_CHOICE_FILE)
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION=1.0.90
 
 # Checksums for upstream tarball
-TARBALL_MD5  = daca3eb16afe65253b766eccb8bfdbc5
-TARBALL_SHA1 = 0c3dd6a3540966fea979a06df08c3aa9bdd1dc67
+TARBALL_MD5  = 90db4d34543e20f053e2ac93745af7e3
+TARBALL_SHA1 = 9fbfb1680bf118ad9d5033159504552c779629ad
 
 # Source tarball
 SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERSION).tar.gz
@@ -54,26 +54,29 @@
 XORG_SOURCE_DIR=$(BUILD_DIR)/xorg-server-$(XORGSERVER_VERS)
 XORG_BUILD_DIR=$(SOURCE_DIR)/unix/xserver
 
+# Java VNCviewer applet for connecting from a web browser
+JAVA_SOURCE_DIR = $(SOURCE_DIR)/java/src/com/tigervnc/vncviewer
+
 # Download site for source
-SOURCE_URL=$(SF_DOWNLOADS_URL)/tigervnc/tigervnc/$(MODULE_VERSION)/$(SOURCE_TARBALL_NAME)
+SOURCE_URL=$(SF_DOWNLOADS_URL)/tigervnc/tigervnc/1.0.90%20%281.1beta1%29/$(SOURCE_TARBALL_NAME)
 SOURCE_URL_SET=yes
 SOURCE_UNCOMPRESS=gzcat
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	upstream-xorg-version.patch,-p1 \
-	upstream-input-refactor.patch,-p1 \
-	upstream-modkeystick.patch,-p1 \
-	upstream-port-to-1.7.patch,-p1 \
-	upstream-port-to-1.8.patch,-p1 \
-	upstream-xorg-1.8-closeinput.patch,-p1 \
-	upstream-xkbconvertcase.patch,-p1 \
-	port-to-1.9.patch \
-	$(SOURCE_DIR)/unix/xserver18.patch,'-p0 -d unix' \
+	miext-sync.patch,-p1 \
+	$(SOURCE_DIR)/unix/xserver110.patch,'-p0 -d unix' \
+	no-nasm.patch,-p1 \
+	applet-html.patch \
+	icon.patch \
+	solaris-libraries.patch,-p1 \
 	vnc-nobuildtime.patch \
 	vnc-nohttpd.patch \
 	solaris-port.patch
 
+# Need to regenerate autoconf/automake files after patching
+AUTORECONF=yes
+
 # ARC cases that covered this module
 # PSARC/2007/545 Xvnc
 MODULE_ARC_CASES = PSARC/2007/545
@@ -104,16 +107,26 @@
 
 # Xvnc has to configure, build, and install in different directories due to 
 # the mixed codebases and unusual directory layout
-$(NO_RECURSE)MODULE_ADD_SOURCE_TARGETS=Xvnc_source_init
+$(NO_RECURSE)MODULE_ADD_SOURCE_TARGETS = Xvnc_source_init 
 $(NO_RECURSE)MODULE_SOURCE_DEPS = Xvnc_source_init
-CONFIGURE_TARGETS=$(SOURCE_DIR)/unix/Makefile $(XORG_BUILD_DIR)/Makefile
-CONFIGURE_TARGETS_SET=yes
+$(NO_RECURSE)ADDITIONAL_SOURCE_DIR = sun-src
+MODULE_ADD_CONFIGURE_TARGETS = $(XORG_BUILD_DIR)/Makefile
 BUILD_TARGETS=Xvnc_build set-elf-comments java_build
 BUILD_TARGETS_SET=yes
 INSTALL_TARGETS=Xvnc_install_server Xvnc_install_programs \
 	java_install Xvnc_install_data install_fix_paths
 INSTALL_TARGETS_SET=yes
 
+# Environment variable options to GNU autoconf configure script
+# Have to remove CFLAGS entries from default LDFLAGS to avoid conflicts
+# with the C++ compiler we use instead
+MODULE_CONFIG_ENV = \
+    LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(MODULE_LDFLAGS)"
+
+# Command line options to GNU autoconf configure script for vnc clients
+MODULE_CONFIG_OPTS  = --with-installed-zlib --with-system-jpeg --without-simd
+MODULE_CONFIG_OPTS += --libdir='$${exec_prefix}/lib/vnc'
+
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = Xvnc
 
@@ -156,11 +169,6 @@
 		XORG_BUILD_DIR="$(XORG_BUILD_DIR)"
 	touch $(XORG_PATCHED_TARGET)
 
-# Command line options to GNU autoconf configure script for vnc clients
-VNC_CONFIG_OPTS= --with-installed-zlib --prefix=/usr \
-	--mandir='$${prefix}/share/man' --libdir='$${exec_prefix}/lib/vnc' \
-	--localstatedir=/var --with-system-jpeg --without-simd
-
 # Command line options to GNU autoconf configure script for Xvnc
 XVNC_CONFIG_OPTS = $(DEFAULT_CONFIG_OPTS) $(XSERVER_CONFIG_OPTS) \
 	--disable-builddocs --without-int10 \
@@ -168,7 +176,6 @@
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive
 
-
 MODULE_CPPFLAGS = \
 	-D_XOPEN_SOURCE=500 -D__EXTENSIONS__ \
 	-D__extension__=\"\" \
@@ -177,37 +184,18 @@
 
 CFLAGS_gcc += -fPIC
 
-# Environment variable options to GNU autoconf configure script
-# Have to remove CFLAGS entries from default LDFLAGS to avoid conflicts
-# with the C++ compiler we use instead
-VNC_CONFIG_ENV = $(CONFIG_ENV) LIBS="-lsocket -lnsl" \
-    LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(MODULE_LDFLAGS)"
-
-XVNC_CONFIG_ENV = $(CONFIG_ENV) \
-    LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(XSERVER_LDFLAGS)"
-
 # Needed by unix/xorg-x11-server-source/hw/vnc/Makefile.am to find libpixman
 # headers in proto area after solaris-port.patch is applied
 MODULE_MAKEFLAGS = PROTODIR=$(PROTODIR)
 
-# Run configure scripts for vnc sources
-$(SOURCE_DIR)/unix/Makefile: $(SOURCE_TARGETS)
-	(cd $(SOURCE_DIR)/common && \
-		$(AUTORECONF_ENV) autoreconf --install --force && \
-		$(VNC_CONFIG_ENV) $(CONFIG_SHELL) ./configure $(VNC_CONFIG_OPTS) )
-	(cd $(SOURCE_DIR)/unix && \
-		$(AUTORECONF_ENV) autoreconf --install --force && \
-		$(VNC_CONFIG_ENV) $(CONFIG_SHELL) ./configure $(VNC_CONFIG_OPTS) )
-
-
 # Run configure script for Xvnc
 $(XORG_BUILD_DIR)/Makefile: $(SOURCE_TARGETS)
 	(cd $(XORG_BUILD_DIR) &&  \
 		$(AUTORECONF_ENV) autoreconf --install --force && \
-		$(XVNC_CONFIG_ENV) $(CONFIG_SHELL) ./configure $(XVNC_CONFIG_OPTS) )
+		$(CONFIG_ENV) $(CONFIG_SHELL) ./configure $(XVNC_CONFIG_OPTS) )
 
 Xvnc_build: $(CONFIGURE_TARGETS)
-	(cd $(SOURCE_DIR)/unix ; \
+	(cd $(SOURCE_DIR) ; \
 	 $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
 	(cd $(XORG_BUILD_DIR) ; \
 	 $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
@@ -245,23 +233,14 @@
 		$(PROTODIR)$(SMF_MANIFEST_DIR)/application/x11/
 
 # Java VNCviewer applet for connecting from a web browser
-JAVA_SOURCE_DIR = $(SOURCE_DIR)/java/src
 JAVA_INSTALL_DIR = $(PROTODIR)/usr/share/vnc/classes
 JAVA_JAR_FILE = $(JAVA_SOURCE_DIR)/VncViewer.jar
 
-# Temporary special handling of Java build fix submitted upstream
-JAVA_MAKEFILE = $(JAVA_SOURCE_DIR)/Makefile
-BUILD_TARGETS += $(JAVA_MAKEFILE)
-
-$(JAVA_MAKEFILE): $(SOURCE_TARGETS)
-	cp $(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/Makefile $@
-	gpatch -d $(SOURCE_DIR) -p0 < applet-build.patch
-	gpatch -d $(SOURCE_DIR) -p0 < icon.patch
-	cp tigervnc_16.gif $(JAVA_SOURCE_DIR)
-
 java_build: $(JAVA_JAR_FILE)
 
-$(JAVA_JAR_FILE): $(SOURCE_TARGETS) $(JAVA_MAKEFILE)
+$(JAVA_JAR_FILE): $(SOURCE_TARGETS)
+	(cd $(JAVA_SOURCE_DIR)/../decoder ; \
+	 $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
 	(cd $(JAVA_SOURCE_DIR) ; \
 	 $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS))
 
@@ -271,10 +250,11 @@
 	(cd $(JAVA_SOURCE_DIR) ; \
 	 $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS) \
 		install INSTALL_DIR=$(JAVA_INSTALL_DIR))
-	cp -pf  $(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/README \
-		$(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/LICENCE.TXT \
+	$(INSTALL_SCRIPT) -m 0444 $(JAVA_SOURCE_DIR)/README \
+		$(JAVA_SOURCE_DIR)/LICENCE.TXT \
 		$(JAVA_INSTALL_DIR)
 	chmod a+x $(JAVA_INSTALL_DIR)/VncViewer.jar
+	rm -f $(JAVA_INSTALL_DIR)/*.class
 
 # Metadata for vncviewer package
 VNCVIEWER_PKG_METADATA_DIR	= $(PROTOMETA)/desktop-remote-desktop-tigervnc
--- a/open-src/xserver/xvnc/applet-build.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-Index: java/src/Makefile
-===================================================================
---- java/src/Makefile	(revision 3916)
-+++ java/src/Makefile	(working copy)
-@@ -4,41 +4,56 @@
- 
- CP = cp
- JC = javac
--JCFLAGS = -target 1.5 -classpath ../../../
-+JCFLAGS = -target 1.5 -classpath .
- JAR = jar
- ARCHIVE = VncViewer.jar
--MANIFEST = MANIFEST.MF
--PAGES = index.vnc
-+MANIFEST = com/tigervnc/vncviewer/MANIFEST.MF
-+PAGES = com/tigervnc/vncviewer/index.vnc com/tigervnc/vncviewer/index.html
- INSTALL_DIR = /usr/local/vnc/classes
- 
--CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
--	  VncCanvas2.class \
--	  OptionsFrame.class ClipboardFrame.class ButtonPanel.class \
--	  DesCipher.class CapabilityInfo.class CapsContainer.class \
--	  RecordingFrame.class SessionRecorder.class \
--	  SocketFactory.class HTTPConnectSocketFactory.class \
--	  HTTPConnectSocket.class ReloginPanel.class \
--	  InStream.class MemInStream.class ZlibInStream.class
-+SOURCES = \
-+	com/tigervnc/decoder/CopyRectDecoder.java		\
-+	com/tigervnc/decoder/CoRREDecoder.java			\
-+	com/tigervnc/decoder/HextileDecoder.java		\
-+	com/tigervnc/decoder/RawDecoder.java			\
-+	com/tigervnc/decoder/RREDecoder.java			\
-+	com/tigervnc/decoder/TightDecoder.java			\
-+	com/tigervnc/decoder/ZlibDecoder.java			\
-+	com/tigervnc/decoder/ZRLEDecoder.java			\
-+	com/tigervnc/decoder/common/Repaintable.java		\
-+	com/tigervnc/vncviewer/AuthPanel.java			\
-+	com/tigervnc/vncviewer/ButtonPanel.java			\
-+	com/tigervnc/vncviewer/CapabilityInfo.java		\
-+	com/tigervnc/vncviewer/CapsContainer.java		\
-+	com/tigervnc/vncviewer/ClipboardFrame.java		\
-+	com/tigervnc/vncviewer/DesCipher.java			\
-+	com/tigervnc/vncviewer/HTTPConnectSocket.java		\
-+	com/tigervnc/vncviewer/HTTPConnectSocketFactory.java	\
-+	com/tigervnc/vncviewer/InStream.java			\
-+	com/tigervnc/vncviewer/MemInStream.java			\
-+	com/tigervnc/vncviewer/OptionsFrame.java		\
-+	com/tigervnc/vncviewer/RecordingFrame.java		\
-+	com/tigervnc/vncviewer/RecordOutputStream.java		\
-+	com/tigervnc/vncviewer/ReloginPanel.java		\
-+	com/tigervnc/vncviewer/RfbInputStream.java		\
-+	com/tigervnc/vncviewer/RfbProto.java			\
-+	com/tigervnc/vncviewer/SessionRecorder.java		\
-+	com/tigervnc/vncviewer/SocketFactory.java		\
-+	com/tigervnc/vncviewer/VncCanvas.java			\
-+	com/tigervnc/vncviewer/VncCanvas2.java			\
-+	com/tigervnc/vncviewer/VncViewer.java			\
-+	com/tigervnc/vncviewer/ZlibInStream.java
- 
--SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
--	  VncCanvas2.java \
--	  OptionsFrame.java ClipboardFrame.java ButtonPanel.java \
--	  DesCipher.java CapabilityInfo.java CapsContainer.java \
--	  RecordingFrame.java SessionRecorder.java \
--	  SocketFactory.java HTTPConnectSocketFactory.java \
--	  HTTPConnectSocket.java ReloginPanel.java \
--	  InStream.java MemInStream.java ZlibInStream.java
-+CLASSES = $(SOURCES:.java=.class)
- 
--all: $(CLASSES) $(ARCHIVE)
-+all: $(ARCHIVE)
- 
--$(CLASSES): $(SOURCES)
-+$(ARCHIVE): $(SOURCES) $(MANIFEST)
- 	$(JC) $(JCFLAGS) -O $(SOURCES)
--
--$(ARCHIVE): $(CLASSES) $(MANIFEST)
- 	$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
- 
--install: $(CLASSES) $(ARCHIVE)
--	$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
-+install: $(ARCHIVE)
-+	$(CP) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
- 
- export:: $(CLASSES) $(ARCHIVE) $(PAGES)
- 	@$(ExportJavaClasses)
-Index: java/src/com/tigervnc/vncviewer/index.vnc
-===================================================================
---- java/src/com/tigervnc/vncviewer/index.vnc	(revision 3916)
-+++ java/src/com/tigervnc/vncviewer/index.vnc	(working copy)
-@@ -1,3 +1,4 @@
-+<HTML><HEAD>
- <!-- 
-      index.vnc - default HTML page for TigerVNC Java viewer applet, to be
-      used with Xvnc. On any file ending in .vnc, the HTTP server embedded in
-@@ -6,20 +7,20 @@
-      PARAMS. Use two dollar signs ($$) to get a dollar sign in the generated
-      HTML page.
- 
--     NOTE: the $PARAMS variable is not supported by the standard VNC, so
-+     NOTE: the PARAMS variable is not supported by the standard VNC, so
-      make sure you have TigerVNC on the server side, if you're using this
-      variable.
- -->
--
--<HTML>
- <TITLE>
- $USER's $DESKTOP desktop ($DISPLAY)
- </TITLE>
--<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
--        WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
--<param name=PORT value=$PORT>
-+</HEAD><BODY>
-+<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
-+        WIDTH="$APPLETWIDTH" HEIGHT="$APPLETHEIGHT">
-+<param name="PORT" value="$PORT">
- $PARAMS
- </APPLET>
- <BR>
- <A href="http://www.tigervnc.org/">TigerVNC site</A>
-+</BODY>
- </HTML>
-Index: java/src/com/tigervnc/vncviewer/MANIFEST.MF
-===================================================================
---- java/src/com/tigervnc/vncviewer/MANIFEST.MF	(revision 3916)
-+++ java/src/com/tigervnc/vncviewer/MANIFEST.MF	(working copy)
-@@ -1,2 +1,2 @@
- Manifest-Version: 1.0
--Main-Class: VncViewer
-+Main-Class: com.tigervnc.vncviewer.VncViewer
-Index: java/src/com/tigervnc/vncviewer/index.html
-===================================================================
---- java/src/com/tigervnc/vncviewer/index.html	(revision 3916)
-+++ java/src/com/tigervnc/vncviewer/index.html	(working copy)
-@@ -1,3 +1,4 @@
-+<HTML><HEAD>
- <!-- 
-      index.html - an example HTML page for TigerVNC Java viewer applet, to be
-      used with a standalone Web server running on the same machine where the
-@@ -15,15 +16,15 @@
-        actual desktop size on the server (height should be increased to leave
-        enough space for the button panel).
- -->
--
--<HTML>
- <TITLE>
- TigerVNC desktop
- </TITLE>
--<APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
-+</HEAD><BODY>
-+<APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
-         WIDTH="800" HEIGHT="632">
- <PARAM NAME="PORT" VALUE="5901">
- </APPLET>
- <BR>
- <A href="http://www.tigervnc.org/">TigerVNC site</A>
-+</BODY>
- </HTML>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/applet-html.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,76 @@
+Index: java/src/com/tigervnc/vncviewer/Makefile
+===================================================================
+--- java/src/com/tigervnc/vncviewer/Makefile	(revision 3916)
++++ java/src/com/tigervnc/vncviewer/Makefile	(working copy)
+@@ -8,7 +8,7 @@
+ JAR = jar
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF
+-PAGES = index.vnc
++PAGES = index.vnc index.html
+ INSTALL_DIR = /usr/local/vnc/classes
+ 
+ CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
+Index: java/src/com/tigervnc/vncviewer/index.vnc
+===================================================================
+--- java/src/com/tigervnc/vncviewer/index.vnc	(revision 3916)
++++ java/src/com/tigervnc/vncviewer/index.vnc	(working copy)
+@@ -1,3 +1,4 @@
++<HTML><HEAD>
+ <!-- 
+      index.vnc - default HTML page for TigerVNC Java viewer applet, to be
+      used with Xvnc. On any file ending in .vnc, the HTTP server embedded in
+@@ -6,20 +7,20 @@
+      PARAMS. Use two dollar signs ($$) to get a dollar sign in the generated
+      HTML page.
+ 
+-     NOTE: the $PARAMS variable is not supported by the standard VNC, so
++     NOTE: the PARAMS variable is not supported by the standard VNC, so
+      make sure you have TigerVNC on the server side, if you're using this
+      variable.
+ -->
+-
+-<HTML>
+ <TITLE>
+ $USER's $DESKTOP desktop ($DISPLAY)
+ </TITLE>
+-<APPLET CODE=com.tigervnc.vncviewer.VncViewer ARCHIVE=VncViewer.jar
+-        WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
+-<param name=PORT value=$PORT>
++</HEAD><BODY>
++<APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
++        WIDTH="$APPLETWIDTH" HEIGHT="$APPLETHEIGHT">
++<param name="PORT" value="$PORT">
+ $PARAMS
+ </APPLET>
+ <BR>
+ <A href="http://www.tigervnc.org/">TigerVNC site</A>
++</BODY>
+ </HTML>
+Index: java/src/com/tigervnc/vncviewer/index.html
+===================================================================
+--- java/src/com/tigervnc/vncviewer/index.html	(revision 3916)
++++ java/src/com/tigervnc/vncviewer/index.html	(working copy)
+@@ -1,3 +1,4 @@
++<HTML><HEAD>
+ <!-- 
+      index.html - an example HTML page for TigerVNC Java viewer applet, to be
+      used with a standalone Web server running on the same machine where the
+@@ -15,15 +16,15 @@
+        actual desktop size on the server (height should be increased to leave
+        enough space for the button panel).
+ -->
+-
+-<HTML>
+ <TITLE>
+ TigerVNC desktop
+ </TITLE>
++</HEAD><BODY>
+ <APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
+         WIDTH="800" HEIGHT="632">
+ <PARAM NAME="PORT" VALUE="5901">
+ </APPLET>
+ <BR>
+ <A href="http://www.tigervnc.org/">TigerVNC site</A>
++</BODY>
+ </HTML>
--- a/open-src/xserver/xvnc/icon.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xvnc/icon.patch	Mon May 09 14:58:28 2011 -0700
@@ -1,28 +1,27 @@
---- java/src/Makefile	2009-10-30 00:10:31.496797111 -0700
-+++ java/src/Makefile.icon	2009-10-30 00:10:14.375398782 -0700
-@@ -45,14 +45,19 @@
- 
- CLASSES = $(SOURCES:.java=.class)
- 
+--- java/src/com/tigervnc/vncviewer/Makefile	2009-10-30 00:10:31.496797111 -0700
++++ java/src/com/tigervnc/vncviewer/Makefile.icon	2009-10-30 00:10:14.375398782 -0700
+@@ -9,6 +9,7 @@
+ ARCHIVE = VncViewer.jar
+ MANIFEST = MANIFEST.MF
+ PAGES = index.vnc index.html
 +ICON = tigervnc_16.gif
-+
- all: $(ARCHIVE)
+ INSTALL_DIR = /usr/local/vnc/classes
  
- $(ARCHIVE): $(SOURCES) $(MANIFEST)
- 	$(JC) $(JCFLAGS) -O $(SOURCES)
- 	$(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
+ CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
+@@ -44,8 +45,11 @@ $(ARCHIVE): $(CLASSES) $(MANIFEST)
+ 		com/tigervnc/decoder/*.class \
+ 		com/tigervnc/decoder/common/*.class
  
--install: $(ARCHIVE)
--	$(CP) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
+-install: $(CLASSES) $(ARCHIVE)
+-	$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
 +$(ICON):
 +	convert -background transparent ../../media/tigervnc_16.svg $@
 +
-+install: $(ARCHIVE) $(ICON)
-+	$(CP) $(ARCHIVE) $(ICON) $(PAGES) $(INSTALL_DIR)
++install: $(CLASSES) $(ARCHIVE) $(ICON)
++	$(CP) $(CLASSES) $(ARCHIVE) $(ICON) $(PAGES) $(INSTALL_DIR)
  
  export:: $(CLASSES) $(ARCHIVE) $(PAGES)
  	@$(ExportJavaClasses)
-
 --- java/src/com/tigervnc/vncviewer/index.html	2009-10-30 00:12:27.490801957 -0700
 +++ java/src/com/tigervnc/vncviewer/index.html.icon	2009-10-30 00:26:29.413918281 -0700
 @@ -19,12 +19,13 @@
@@ -31,7 +30,7 @@
  </TITLE>
 +<link rel="icon" type="image/gif" href="tigervnc_16.gif">
  </HEAD><BODY>
- <APPLET CODE="com.tigervnc.vncviewer.VncViewer.class" ARCHIVE="VncViewer.jar"
+ <APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
          WIDTH="800" HEIGHT="632">
  <PARAM NAME="PORT" VALUE="5901">
  </APPLET>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/miext-sync.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,13 @@
+diff --git a/tigervnc-1.0.90/unix/xserver110.patch b/tigervnc-1.0.90/unix/xserver110.patch
+index ccdf433..f5cdf72 100644
+--- a/unix/xserver110.patch
++++ b/unix/xserver110.patch
+@@ -23,7 +23,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
+  
+ +dnl Xvnc DDX
+ +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
+-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
+++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
+ +
+ +dnl This is necessary to allow Xvnc to statically link with GnuTLS
+ +AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/no-nasm.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,49 @@
+From 9281c763b3617e5a126012ae15f77ab2102448e4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 30 Oct 2009 16:49:10 -0700
+Subject: [PATCH 1/2] Don't run configure for unused subdirs
+
+Prevents configure from failing if nasm can't be found when it's
+not needed because --with-system-jpeg was passed
+---
+ configure.ac |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5acd762..66b9b34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,8 +5,6 @@ BUILD=`date +%Y%m%d`
+ AC_CONFIG_AUX_DIR([.])
+ AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
+ 
+-AC_CONFIG_SUBDIRS([common/jpeg common/zlib])
+-
+ AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Checks for programs.
+@@ -136,7 +134,9 @@ AC_ARG_WITH([included-zlib],
+ 	[AC_SEARCH_LIBS([inflateEnd], [z], [], [INCLUDED_ZLIB=yes])])
+ 
+ AM_CONDITIONAL([INCLUDED_ZLIB], [ test "x$INCLUDED_ZLIB" = xyes ])
+-AC_CONFIG_SUBDIRS([zlib])
++if test "x$INCLUDED_ZLIB" = xyes ; then
++  AC_CONFIG_SUBDIRS([common/zlib])
++fi
+ 
+ dnl Check for libjpeg library
+ INCLUDED_JPEG=yes
+@@ -148,7 +148,9 @@ AC_ARG_WITH([system-jpeg],
+ 	[])
+ 
+ AM_CONDITIONAL([INCLUDED_JPEG], [ test "x$INCLUDED_JPEG" = xyes ])
+-AC_CONFIG_SUBDIRS([jpeg])
++if test "x$INCLUDED_JPEG" = xyes ; then
++  AC_CONFIG_SUBDIRS([common/jpeg])
++fi
+ 
+ AC_CHECK_FUNCS([vsnprintf snprintf strcasecmp strncasecmp])
+ 
+-- 
+1.7.3.2
+
--- a/open-src/xserver/xvnc/port-to-1.9.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
---- unix/xserver/hw/vnc/xorg-version.h	2010-07-23 18:43:17.578041302 -0700
-+++ unix/xserver/hw/vnc/xorg-version.h	2010-07-23 18:44:00.854078060 -0700
-@@ -32,8 +32,10 @@
- #define XORG 17
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000))
- #define XORG 18
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (9 * 100000) + (99 * 1000))
-+#define XORG 19
- #else
--#error "X.Org newer than 1.8 is not supported"
-+#error "X.Org newer than 1.9 is not supported"
- #endif
- 
- #endif
-
---- unix/xserver/hw/vnc/xvnc.cc
-+++ unix/xserver/hw/vnc/xvnc.cc
-@@ -609,7 +609,11 @@ vfbInstallColormap(ColormapPtr pmap)
- 
- 	for (i = 0; i < entries; i++)  ppix[i] = i;
- 	/* XXX truecolor */
-+#if XORG >= 19
-+	QueryColors(pmap, entries, ppix, prgb, serverClient);
-+#else
- 	QueryColors(pmap, entries, ppix, prgb);
-+#endif
- 
- 	for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */
- 	    defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */
-@@ -857,7 +861,11 @@ static Bool vncRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
- static void
- xf86SetRootClip (ScreenPtr pScreen, Bool enable)
- {
-+#if XORG >= 19
-+    WindowPtr	pWin = pScreen->root;
-+#else
-     WindowPtr	pWin = WindowTable[pScreen->myNum];
-+#endif
-     WindowPtr	pChild;
-     Bool	WasViewable = (Bool)(pWin->viewable);
-     Bool	anyMarked = FALSE;
-
---- unix/xserver/hw/vnc/vncHooks.cc	2010-09-07 16:44:21.556888424 -0700
-+++ unix/xserver/hw/vnc/vncHooks.cc	2010-09-07 17:25:22.176675661 -0700
-@@ -90,7 +90,12 @@
-     GCOps *wrappedOps;
- } vncHooksGCRec, *vncHooksGCPtr;
- 
--#if XORG == 15
-+#if XORG >= 19
-+static DevPrivateKeyRec vncHooksScreenPrivateKeyRec;
-+#define vncHooksScreenPrivateKey (&vncHooksScreenPrivateKeyRec)
-+static DevPrivateKeyRec vncHooksGCPrivateKeyRec;
-+#define vncHooksGCPrivateKey (&vncHooksGCPrivateKeyRec)
-+#elif XORG == 15
- static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKey;
- static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey;
- #else
-@@ -223,11 +228,21 @@
- {
-   vncHooksScreenPtr vncHooksScreen;
- 
-+#if XORG >= 19
-+  if (!dixRegisterPrivateKey(vncHooksScreenPrivateKey, PRIVATE_SCREEN,
-+			     sizeof(vncHooksScreenRec))) {
-+#else
-   if (!dixRequestPrivate(vncHooksScreenPrivateKey, sizeof(vncHooksScreenRec))) {
-+#endif
-     ErrorF("vncHooksInit: Allocation of vncHooksScreen failed\n");
-     return FALSE;
-   }
-+#if XORG >= 19
-+  if (!dixRegisterPrivateKey(vncHooksGCPrivateKey, PRIVATE_GC,
-+			     sizeof(vncHooksGCRec))) {
-+#else
-   if (!dixRequestPrivate(vncHooksGCPrivateKey, sizeof(vncHooksGCRec))) {
-+#endif
-     ErrorF("vncHooksInit: Allocation of vncHooksGCRec failed\n");
-     return FALSE;
-   }
-
---- unix/xserver/hw/vnc/XserverDesktop.cc	2010-09-07 16:44:21.567631294 -0700
-+++ unix/xserver/hw/vnc/XserverDesktop.cc	2010-09-07 18:59:36.858315339 -0700
-@@ -770,7 +770,12 @@
-   region.get_rects(&rects);
-   for (i = rects.begin(); i != rects.end(); i++) {
-     for (int y = i->tl.y; y < i->br.y; y++) {
--      (*pScreen->GetImage) ((DrawablePtr)WindowTable[pScreen->myNum],
-+#if XORG >= 19
-+      WindowPtr screenRoot = pScreen->root;
-+#else
-+      WindowPtr screenRoot = WindowTable[pScreen->myNum];
-+#endif
-+      (*pScreen->GetImage) ((DrawablePtr)screenRoot,
-                             i->tl.x, y, i->width(), 1,
-                             ZPixmap, (unsigned long)~0L,
-                             ((char*)data
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/solaris-libraries.patch	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,66 @@
+From ef06be83bcbd285f49d53e9145f4537fbd299f68 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 30 Oct 2009 22:19:51 -0700
+Subject: [PATCH] Fix detection of network libraries & functions on Solaris/OpenSolaris
+
+---
+ common/network/Makefile.am |    1 +
+ configure.ac               |   13 ++++++++++++-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/common/network/Makefile.am b/common/network/Makefile.am
+index 3db5536..c5139bf 100644
+--- a/common/network/Makefile.am
++++ b/common/network/Makefile.am
+@@ -6,4 +6,6 @@ libnetwork_la_SOURCES = $(HDRS) TcpSocket.cxx
+ 
+ libnetwork_la_CPPFLAGS = -I$(top_srcdir)/common
+ 
++libnetwork_la_LIBADD = $(SOCKET_LIB) $(INET_LIB)
++
+ EXTRA_DIST = CMakeLists.txt
+
+diff --git a/configure.ac b/configure.ac
+index 66b9b34..857000a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,16 +114,24 @@ AC_SUBST(READDISPLAY_DEFINE)
+ 
+ dnl Under Lynx/OS 2.3, we have to link with -lbsd to resolve
+ dnl gethostbyname, inet_addr, htons etc. Check if it's necessary.
++dnl Under Solaris and other SVR4 OS'es, those require -lnsl and
++dnl the socket functions require -lsocket
+ dnl NOTE: Did not want to use AC_SEARCH_LIBS which would add
+ dnl   -lbsd to LIBS. We set INET_LIB instead.
+ AC_LANG_SAVE
+ AC_LANG_C
+ AC_CHECK_FUNC(gethostbyname,INET_LIB_REQ=,INET_LIB_REQ=yes)
+ if test "$INET_LIB_REQ" = yes; then
+-	AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,INET_LIB=)
++	AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,
++		AC_CHECK_LIB(nsl,gethostbyname,INET_LIB=-lnsl,INET_LIB=))
++fi
++AC_CHECK_FUNC(connect,SOCKET_LIB_REQ=,SOCKET_LIB_REQ=yes)
++if test "$SOCKET_LIB_REQ" = yes; then
++	AC_CHECK_LIB(socket,connect,SOCKET_LIB=-lsocket,SOCKET_LIB=,$INET_LIB)
+ fi
+ AC_LANG_RESTORE
+ AC_SUBST(INET_LIB)
++AC_SUBST(SOCKET_LIB)
+ 
+ dnl Check for zlib library
+ INCLUDED_ZLIB=no
+@@ -159,7 +167,10 @@ AC_SEARCH_LIBS([inet_aton], [resolv])
+ AC_CHECK_FUNCS([inet_aton])
+ 
+ # IPv6 related functions
++save_LIBS="$LIBS"
++LIBS="$LIBS $SOCKET_LIB $INET_LIB"
+ AC_CHECK_FUNCS([inet_ntop getaddrinfo])
++LIBS="$save_LIBS"
+ 
+ AC_CHECK_TYPES([socklen_t], [], [], [[#include <sys/socket.h>]])
+ 
+-- 
+1.7.3.2
+
--- a/open-src/xserver/xvnc/solaris-port.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xvnc/solaris-port.patch	Mon May 09 14:58:28 2011 -0700
@@ -26,9 +26,9 @@
 @@ -42,7 +42,7 @@ librfb_la_SOURCES = $(HDRS) Blacklist.cx
  	secTypes.cxx util.cxx
  
- librfb_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/../win
--librfb_la_LIBADD =
-+librfb_la_LIBADD = $(LIBS)
+ librfb_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
+-librfb_la_LIBADD = @GNUTLS_LIBS@
++librfb_la_LIBADD = @GNUTLS_LIBS@ $(LIBS)
  
  if INCLUDED_JPEG
  librfb_la_CPPFLAGS += -I$(top_srcdir)/jpeg
@@ -59,44 +59,22 @@
         "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
         "xsetroot -solid grey\n".
         "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
-diff -urp -x '*~' -x '*.orig' unix/vncviewer/Makefile.am unix/vncviewer/Makefile.am
---- unix/vncviewer/Makefile.am	2009-08-20 02:46:42.000000000 -0700
-+++ unix/vncviewer/Makefile.am	2010-01-07 18:27:36.001729152 -0800
-@@ -13,6 +13,7 @@ vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$
- 
- vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \
- 	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
-+	-ljpeg -lz \
- 	@X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@
- 
- EXTRA_DIST = vncviewer.man
-diff -urp -x '*~' -x '*.orig' unix/x0vncserver/Makefile.am unix/x0vncserver/Makefile.am
---- unix/x0vncserver/Makefile.am	2009-08-20 02:46:42.000000000 -0700
-+++ unix/x0vncserver/Makefile.am	2010-01-07 18:27:36.001861492 -0800
-@@ -15,6 +15,7 @@ x0vncserver_CPPFLAGS = -I$(COMMON_DIR) -
- 	@MITSHM_DEFINE@ @X_CFLAGS@
- 
- x0vncserver_LDADD = $(COMMON_DIR)/rfb/librfb.la \
-+	-ljpeg -lz \
- 	$(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \
- 	$(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
- 	@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@
 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/vnc/Makefile.am unix/xserver/hw/vnc/Makefile.am
 --- unix/xserver/hw/vnc/Makefile.am	2010-01-07 18:27:33.782620873 -0800
 +++ unix/xserver/hw/vnc/Makefile.am	2010-01-07 18:27:36.002105937 -0800
 @@ -17,7 +17,7 @@
  
  libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
--	-I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir)
-+	-I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) $(PIXMAN_CFLAGS)
+ 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \
+-	-I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir)
++	-I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) $(PIXMAN_CFLAGS) -I$(includedir)
  
  bin_PROGRAMS = Xvnc
  
 @@ -32,10 +32,17 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW
- Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
+ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -UHAVE_CONFIG_H \
  	-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
+ 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
 -	-I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
 +	-I$(top_srcdir)/include $(PIXMAN_CFLAGS)
 +
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/decoder/Makefile	Mon May 09 14:58:28 2011 -0700
@@ -0,0 +1,24 @@
+
+JC = javac
+JCFLAGS = -target 1.5 -classpath ../../../
+
+SOURCES = \
+	common/Repaintable.java \
+	CoRREDecoder.java \
+	CopyRectDecoder.java \
+	HextileDecoder.java \
+	TightDecoder.java \
+	RawDecoder.java \
+	ZlibDecoder.java \
+	RREDecoder.java \
+	ZRLEDecoder.java
+
+CLASSES = $(SOURCES:.java=.class)
+
+all: $(CLASSES)
+
+$(CLASSES:%=% + ): $(SOURCES)
+	$(JC) $(JCFLAGS) -O $(SOURCES)
+
+clean::
+	$(RM) *.class common/*.class
Binary file open-src/xserver/xvnc/sun-src/java/src/com/tigervnc/vncviewer/tigervnc_16.gif has changed
--- a/open-src/xserver/xvnc/tigervnc-xserver18.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-# This is the patch from tigervnc svn unix/xserver18.patch
-# modified to apply to the xserver 1.8.x sources used in our builds
-
-# Only changes needed to make the patch apply should happen in
-# this patch - other bug fixes & customizations should go into
-# separate patches, so they aren't lost when this patch is
-# replaced with new versions from upstream.
-
-diff -up xserver/configure.ac.vnc xserver/configure.ac
---- unix/xserver/configure.ac.vnc	2010-01-22 11:23:04.524629373 +0100
-+++ unix/xserver/configure.ac	2010-01-22 11:31:04.704638847 +0100
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.99.3, [https:
- RELEASE_DATE="(unreleased)"
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--AM_MAINTAINER_MODE
- 
- # Require xorg-macros: XORG_DEFAULT_OPTIONS
- m4_ifndef([XORG_MACROS_VERSION],
-@@ -63,6 +62,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_AS
- AC_PROG_INSTALL
- AC_PROG_LN_S
-@@ -1486,6 +1486,10 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"])
- 
- dnl Xnest DDX
- 
-@@ -1524,6 +1528,8 @@ xorg_bus_linuxpci=no
- xorg_bus_bsdpci=no
- xorg_bus_sparc=no
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1765,7 +1771,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
- 	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2195,6 +2200,7 @@ hw/dmx/input/Makefile
- hw/dmx/glxProxy/Makefile
- hw/dmx/Makefile
- hw/vfb/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xwin/Makefile
- hw/xquartz/Makefile
-diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- unix/xserver/hw/Makefile.am.vnc	2010-01-22 11:23:04.560613962 +0100
-+++ unix/xserver/hw/Makefile.am	2010-01-22 11:23:04.600597430 +0100
-@@ -33,7 +33,8 @@ SUBDIRS =			\
- 	$(XNEST_SUBDIRS)	\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
--	$(XQUARTZ_SUBDIRS)
-+	$(XQUARTZ_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
- 
-diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- unix/xserver/mi/miinitext.c.vnc	2010-01-22 11:23:04.564613258 +0100
-+++ unix/xserver/mi/miinitext.c	2010-01-22 11:23:04.600597430 +0100
-@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS
- extern void CompositeExtensionInit(INITARGS);
- #endif
- extern void GEExtensionInit(INITARGS);
-+extern void vncExtensionInit(INITARGS);
- 
- /* The following is only a small first step towards run-time
-  * configurable extensions.
-@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[])
- #ifdef XF86BIGFONT
-     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
- #endif
-+    vncExtensionInit();
- #if !defined(NO_HW_ONLY_EXTS)
- #if defined(XF86VIDMODE)
-     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
Binary file open-src/xserver/xvnc/tigervnc_16.gif has changed
--- a/open-src/xserver/xvnc/upstream-input-refactor.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1896 +0,0 @@
-From 2f97d8a75e7371ac7f3a9a1338db55888754d7c0 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 28 Aug 2009 12:03:11 +0000
-Subject: [PATCH] Initialize eventq in all cases.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3885 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/XserverDesktop.cc |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index d6fe993..533f31b 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -203,6 +203,8 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-     eventq = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-   if (!eventq)
-     FatalError("Couldn't allocate eventq\n");
-+#else
-+  GetEventList(&eventq);
- #endif
- 
-   /*
--- 
-1.5.6.5
-
-From 1093aa3149c24b362781ab7f19c4c63a6eb19990 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 28 Aug 2009 12:04:20 +0000
-Subject: [PATCH] Add Input.h and Input.cc and move all mouse input related code there.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3886 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Input.cc          |  167 +++++++++++++++++++++++++++++++++
- unix/xserver/hw/vnc/Input.h           |   61 ++++++++++++
- unix/xserver/hw/vnc/Makefile.am       |    6 +-
- unix/xserver/hw/vnc/XserverDesktop.cc |  142 +---------------------------
- unix/xserver/hw/vnc/XserverDesktop.h  |    5 +-
- 5 files changed, 240 insertions(+), 141 deletions(-)
- create mode 100644 unix/xserver/hw/vnc/Input.cc
- create mode 100644 unix/xserver/hw/vnc/Input.h
-
-diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
-new file mode 100644
-index 0000000..ca279f0
---- /dev/null
-+++ b/unix/xserver/hw/vnc/Input.cc
-@@ -0,0 +1,167 @@
-+/* Copyright (C) 2009 TightVNC Team
-+ * Copyright (C) 2009 Red Hat, Inc.
-+ *
-+ * This is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this software; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
-+ * USA.
-+ */
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#include "Input.h"
-+#include "xorg-version.h"
-+
-+extern "C" {
-+#include "mi.h"
-+}
-+
-+/* Event queue is shared between all devices. */
-+#if XORG == 15
-+static xEvent *eventq = NULL;
-+#else
-+static EventList *eventq = NULL;
-+#endif
-+
-+static void initEventq(void)
-+{
-+	/* eventq is never free()-ed because it exists during server life. */
-+	if (eventq == NULL) {
-+#if XORG == 15
-+		eventq = (xEvent *)xcalloc(sizeof(xEvent),
-+					   GetMaximumEventsNum());
-+		if (!eventq)
-+			FatalError("Couldn't allocate eventq\n");
-+#else
-+		GetEventList(&eventq);
-+#endif
-+	}
-+}
-+
-+static void enqueueEvents(DeviceIntPtr dev, int n)
-+{
-+	int i;
-+
-+	for (i = 0; i < n; i++) {
-+		/*
-+		 * Passing arguments in global variable eventq is probably not
-+		 * good programming practise but in this case it is safe and
-+		 * clear.
-+		 */
-+		mieqEnqueue(dev,
-+#if XORG == 15
-+			    eventq + i
-+#else
-+			    (eventq + i)->event
-+#endif
-+			   );
-+	}
-+}
-+
-+/* Pointer device pre-declarations */
-+#define BUTTONS 5
-+static int pointerProc(DeviceIntPtr pDevice, int onoff);
-+
-+/* Pointer device methods */
-+
-+PointerDevice::PointerDevice(rfb::VNCServerST *_server)
-+	: server(_server), oldButtonMask(0)
-+{
-+	dev = AddInputDevice(
-+#if XORG >= 16
-+			     serverClient,
-+#endif
-+			     pointerProc, TRUE);
-+	RegisterPointerDevice(dev);
-+	initEventq();
-+}
-+
-+void PointerDevice::ButtonAction(int buttonMask)
-+{
-+	int i, n;
-+
-+	for (i = 0; i < BUTTONS; i++) {
-+		if ((buttonMask ^ oldButtonMask) & (1 << i)) {
-+			int action = (buttonMask & (1<<i)) ?
-+				     ButtonPress : ButtonRelease;
-+			n = GetPointerEvents(eventq, dev, action, i + 1,
-+					     POINTER_RELATIVE, 0, 0, NULL);
-+			enqueueEvents(dev, n);
-+
-+		}
-+	}
-+
-+	oldButtonMask = buttonMask;
-+}
-+
-+void PointerDevice::Move(const rfb::Point &pos)
-+{
-+	int n, valuators[2];
-+
-+	if (pos.equals(cursorPos))
-+		return;
-+
-+	valuators[0] = pos.x;
-+	valuators[1] = pos.y;
-+	n = GetPointerEvents(eventq, dev, MotionNotify, 0, POINTER_ABSOLUTE, 0,
-+			     2, valuators);
-+	enqueueEvents(dev, n);
-+
-+	cursorPos = pos;
-+}
-+
-+void PointerDevice::Sync(void)
-+{
-+	if (cursorPos.equals(oldCursorPos))
-+		return;
-+
-+	oldCursorPos = cursorPos;
-+	server->setCursorPos(cursorPos);
-+	server->tryUpdate();
-+}
-+
-+static int pointerProc(DeviceIntPtr pDevice, int onoff)
-+{
-+	BYTE map[BUTTONS + 1];
-+	DevicePtr pDev = (DevicePtr)pDevice;
-+	int i;
-+
-+	switch (onoff) {
-+	case DEVICE_INIT:
-+		for (i = 0; i < BUTTONS + 1; i++)
-+			map[i] = i;
-+
-+		InitPointerDeviceStruct(pDev, map, BUTTONS,
-+#if XORG == 15
-+					GetMotionHistory,
-+#endif
-+					(PtrCtrlProcPtr)NoopDDA,
-+					GetMotionHistorySize(), 2);
-+		break;
-+	case DEVICE_ON:
-+		pDev->on = TRUE;
-+		break;
-+	case DEVICE_OFF:
-+		pDev->on = FALSE;
-+		break;
-+#if 0
-+	case DEVICE_CLOSE:
-+		break;
-+#endif
-+	}
-+
-+	return Success;
-+}
-+
-diff --git a/unix/xserver/hw/vnc/Input.h b/unix/xserver/hw/vnc/Input.h
-new file mode 100644
-index 0000000..49cedf2
---- /dev/null
-+++ b/unix/xserver/hw/vnc/Input.h
-@@ -0,0 +1,61 @@
-+/* Copyright (C) 2009 TightVNC Team
-+ * Copyright (C) 2009 Red Hat, Inc.
-+ *
-+ * This is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this software; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
-+ * USA.
-+ */
-+
-+/* Make sure macro doesn't conflict with macro in include/input.h. */
-+#ifndef INPUT_H_
-+#define INPUT_H_
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#include <rfb/VNCServerST.h>
-+
-+extern "C" {
-+#include "input.h"
-+};
-+
-+/* Represents pointer device. */
-+class PointerDevice {
-+public:
-+	/* Create new PointerDevice instance. */
-+	PointerDevice(rfb::VNCServerST *_server);
-+
-+	/*
-+	 * Press or release buttons. Relationship between buttonMask and
-+	 * buttons is specified in RFB protocol.
-+	 */
-+	void ButtonAction(int buttonMask);
-+
-+	/* Move pointer to target location (point coords are absolute). */
-+	void Move(const rfb::Point &point);
-+
-+	/*
-+	 * Send pointer position to clients. If not called then Move() calls
-+	 * won't be visible to clients.
-+	 */
-+	void Sync(void);
-+private:
-+	rfb::VNCServerST *server;
-+	DeviceIntPtr dev;
-+	int oldButtonMask;
-+	rfb::Point cursorPos, oldCursorPos;
-+};
-+
-+#endif
-diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
-index a39a10d..c2e78df 100644
---- a/unix/xserver/hw/vnc/Makefile.am
-+++ b/unix/xserver/hw/vnc/Makefile.am
-@@ -9,9 +9,11 @@ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
- 
--HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h
-+HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \
-+	Input.h
- 
--libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc
-+libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc \
-+	Input.cc
- 
- libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
- 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 533f31b..58f70d9 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -42,6 +42,7 @@
- #include "XserverDesktop.h"
- #include "vncExtInit.h"
- #include "xorg-version.h"
-+#include "Input.h"
- 
- extern "C" {
- #define public c_public
-@@ -77,7 +78,6 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
- }
- 
- static DeviceIntPtr vncKeyboardDevice = NULL;
--static DeviceIntPtr vncPointerDevice = NULL;
- #if XORG == 15
- static xEvent *eventq = NULL;
- #else
-@@ -85,7 +85,6 @@ static EventList *eventq = NULL;
- #endif
- 
- static int vfbKeybdProc(DeviceIntPtr pDevice, int onoff);
--static int vfbMouseProc(DeviceIntPtr pDevice, int onoff);
- 
- using namespace rfb;
- using namespace network;
-@@ -180,7 +179,6 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-     listener(listener_), httpListener(httpListener_),
-     cmap(0), deferredUpdateTimerSet(false),
-     grabbing(false), ignoreHooks_(false), directFbptr(true),
--    oldButtonMask(0),
-     queryConnectId(0)
- {
-   format = pf;
-@@ -221,14 +219,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-     RegisterKeyboardDevice(vncKeyboardDevice);
-   }
- 
--  if (vncPointerDevice == NULL) {
--    vncPointerDevice = AddInputDevice(
--#if XORG >= 16
--				      serverClient,
--#endif
--				      vfbMouseProc, TRUE);
--    RegisterPointerDevice(vncPointerDevice);
--  }
-+  pointerDevice = new PointerDevice(server);
- }
- 
- XserverDesktop::~XserverDesktop()
-@@ -237,6 +228,7 @@ XserverDesktop::~XserverDesktop()
-     delete [] data;
-   TimerFree(deferredUpdateTimer);
-   TimerFree(dummyTimer);
-+  delete pointerDevice;
-   delete httpServer;
-   delete server;
- }
-@@ -555,43 +547,9 @@ void XserverDesktop::add_copied(RegionPtr dst, int dx, int dy)
-   }
- }
- 
--void XserverDesktop::positionCursor()
--{
--  if (!cursorPos.equals(oldCursorPos)) {
--    oldCursorPos = cursorPos;
--    (*pScreen->SetCursorPosition) (
--#if XORG >= 16
--				   vncPointerDevice,
--#endif
--				   pScreen, cursorPos.x, cursorPos.y, FALSE);
--    server->setCursorPos(cursorPos);
--    server->tryUpdate();
--  }
--}
--
- void XserverDesktop::blockHandler(fd_set* fds)
- {
-   try {
--#if XORG == 15
--    ScreenPtr screenWithCursor = GetCurrentRootWindow()->drawable.pScreen;
--#else
--    ScreenPtr screenWithCursor =
--	GetCurrentRootWindow(vncPointerDevice)->drawable.pScreen;
--#endif
--    if (screenWithCursor == pScreen) {
--      int x, y;
--      GetSpritePosition(
--#if XORG >= 16
--			vncPointerDevice,
--#endif
--			&x, &y);
--      if (x != cursorPos.x || y != cursorPos.y) {
--        cursorPos = oldCursorPos = Point(x, y);
--        server->setCursorPos(cursorPos);
--        server->tryUpdate();
--      }
--    }
--
-     if (listener)
-       FD_SET(listener->getFd(), fds);
-     if (httpListener)
-@@ -678,7 +636,7 @@ void XserverDesktop::wakeupHandler(fd_set* fds, int nfds)
-         }
-       }
- 
--      positionCursor();
-+      pointerDevice->Sync();
-     }
- 
-     int timeout = server->checkTimeouts();
-@@ -737,63 +695,8 @@ void XserverDesktop::approveConnection(void* opaqueId, bool accept,
- 
- void XserverDesktop::pointerEvent(const Point& pos, int buttonMask)
- {
--  int i, j, n, valuators[2];
--
--  // SetCursorPosition seems to be very expensive (at least on XFree86 3.3.6
--  // for S3), so we delay calling it until positionCursor() is called at the
--  // end of processing a load of RFB.
--  //(*pScreen->SetCursorPosition) (pScreen, pos.x, pos.y, FALSE);
--
--  NewCurrentScreen(
--#if XORG >= 16
--		   vncPointerDevice,
--#endif
--		   pScreen, pos.x, pos.y);
--
--  if (!pos.equals(cursorPos)) {
--    valuators[0] = pos.x;
--    valuators[1] = pos.y;
--
--#if XORG >= 16
--    GetEventList(&eventq);
--#endif
--    n = GetPointerEvents (eventq, vncPointerDevice, MotionNotify, 0,
--			  POINTER_ABSOLUTE, 0, 2, valuators);
--
--    for (i = 0; i < n; i++) {
--      mieqEnqueue (vncPointerDevice,
--#if XORG == 15
--		   eventq + i
--#else
--		   (eventq + i)->event
--#endif
--      );
--    }
--  }
--
--  for (i = 0; i < 5; i++) {
--    if ((buttonMask ^ oldButtonMask) & (1<<i)) {
--      // Do not use the pointer mapping. Treat VNC buttons as logical
--      // buttons.
--      n = GetPointerEvents (eventq, vncPointerDevice,
--			    (buttonMask & (1<<i)) ?
--			     ButtonPress : ButtonRelease,
--			    i + 1, POINTER_RELATIVE, 0, 0, NULL);
--
--      for (j = 0; j < n; j++) {
--	mieqEnqueue (vncPointerDevice,
--#if XORG == 15
--		     eventq + j
--#else
--		     (eventq + j)->event
--#endif
--	);
--      }
--    }
--  }
--
--  cursorPos = pos;
--  oldButtonMask = buttonMask;
-+  pointerDevice->Move(pos);
-+  pointerDevice->ButtonAction(buttonMask);
- }
- 
- void XserverDesktop::clientCutText(const char* str, int len)
-@@ -1481,36 +1384,3 @@ static int vfbKeybdProc(DeviceIntPtr pDevice, int onoff)
-   return Success;
- }
- 
--static int vfbMouseProc(DeviceIntPtr pDevice, int onoff)
--{
--  BYTE map[6];
--  DevicePtr pDev = (DevicePtr)pDevice;
--
--  switch (onoff)
--  {
--  case DEVICE_INIT:
--    map[1] = 1;
--    map[2] = 2;
--    map[3] = 3;
--    map[4] = 4;
--    map[5] = 5;
--    InitPointerDeviceStruct(pDev, map, 5,
--#if XORG == 15
--			    GetMotionHistory,
--#endif
--			    (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2);
--    break;
--
--  case DEVICE_ON:
--    pDev->on = TRUE;
--    break;
--
--  case DEVICE_OFF:
--    pDev->on = FALSE;
--    break;
--
--  case DEVICE_CLOSE:
--    break;
--  }
--  return Success;
--}
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index 7729d3f..9f300f5 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -32,6 +32,7 @@
- #include <rfb/Configuration.h>
- #include <rfb/VNCServerST.h>
- #include <rdr/SubstitutingInStream.h>
-+#include "Input.h"
- 
- extern "C" {
- #define class c_class
-@@ -68,7 +69,6 @@ public:
-   void setCursor(CursorPtr cursor);
-   void add_changed(RegionPtr reg);
-   void add_copied(RegionPtr dst, int dx, int dy);
--  void positionCursor();
-   void ignoreHooks(bool b) { ignoreHooks_ = b; }
-   void blockHandler(fd_set* fds);
-   void wakeupHandler(fd_set* fds, int nfds);
-@@ -122,6 +122,7 @@ private:
-                                             pointer arg);
-   void deferUpdate();
-   ScreenPtr pScreen;
-+  PointerDevice *pointerDevice;
-   OsTimerPtr deferredUpdateTimer, dummyTimer;
-   rfb::VNCServerST* server;
-   rfb::HTTPServer* httpServer;
-@@ -133,8 +134,6 @@ private:
-   bool grabbing;
-   bool ignoreHooks_;
-   bool directFbptr;
--  int oldButtonMask;
--  rfb::Point cursorPos, oldCursorPos;
- 
-   void* queryConnectId;
-   rfb::CharArray queryConnectAddress;
--- 
-1.5.6.5
-
-From 845dbbfbb6a2c0e1a4981920121935febe7c0a50 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 28 Aug 2009 12:05:24 +0000
-Subject: [PATCH] Move keyboard input related code to Input.h and Input.cc.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3887 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Input.cc          |  606 ++++++++++++++++++++++++++++++++-
- unix/xserver/hw/vnc/Input.h           |   13 +
- unix/xserver/hw/vnc/XserverDesktop.cc |  589 +-------------------------------
- unix/xserver/hw/vnc/XserverDesktop.h  |    1 +
- 4 files changed, 622 insertions(+), 587 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
-index ca279f0..478240c 100644
---- a/unix/xserver/hw/vnc/Input.cc
-+++ b/unix/xserver/hw/vnc/Input.cc
-@@ -21,13 +21,49 @@
- #include <dix-config.h>
- #endif
- 
-+#include <rfb/LogWriter.h>
- #include "Input.h"
- #include "xorg-version.h"
-+#include "vncExtInit.h"
- 
- extern "C" {
-+#define public c_public
-+#define class c_class
-+#include "inputstr.h"
- #include "mi.h"
-+#ifndef XKB_IN_SERVER
-+#define XKB_IN_SERVER
-+#endif
-+#ifdef XKB
-+/*
-+ * This include is needed to use XkbConvertCase instead of XConvertCase even if
-+ * we don't use XKB extension.
-+ */
-+#include <xkbsrv.h>
-+#endif
-+#if XORG >= 16
-+#include "exevents.h"
-+extern void
-+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
-+#endif
-+#include <X11/keysym.h>
-+#include <X11/Xutil.h>
-+#undef public
-+#undef class
- }
- 
-+using namespace rdr;
-+using namespace rfb;
-+
-+static LogWriter vlog("Input");
-+
-+#define BUTTONS 5
-+static int pointerProc(DeviceIntPtr pDevice, int onoff);
-+
-+static int keyboardProc(DeviceIntPtr pDevice, int onoff);
-+static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col);
-+static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col);
-+
- /* Event queue is shared between all devices. */
- #if XORG == 15
- static xEvent *eventq = NULL;
-@@ -70,10 +106,6 @@ static void enqueueEvents(DeviceIntPtr dev, int n)
- 	}
- }
- 
--/* Pointer device pre-declarations */
--#define BUTTONS 5
--static int pointerProc(DeviceIntPtr pDevice, int onoff);
--
- /* Pointer device methods */
- 
- PointerDevice::PointerDevice(rfb::VNCServerST *_server)
-@@ -165,3 +197,569 @@ static int pointerProc(DeviceIntPtr pDevice, int onoff)
- 	return Success;
- }
- 
-+/* KeyboardDevice methods */
-+
-+KeyboardDevice::KeyboardDevice(void)
-+{
-+	dev = AddInputDevice(
-+#if XORG >= 16
-+			     serverClient,
-+#endif
-+			     keyboardProc, TRUE);
-+	RegisterKeyboardDevice(dev);
-+	initEventq();
-+}
-+
-+#define IS_PRESSED(keyc, keycode) \
-+	((keyc)->down[(keycode) >> 3] & (1 << ((keycode) & 7)))
-+
-+/*
-+ * ModifierState is a class which helps simplify generating a "fake" press or
-+ * release of shift, ctrl, alt, etc.  An instance of the class is created for
-+ * every modifier which may need to be pressed or released.  Then either
-+ * press() or release() may be called to make sure that the corresponding keys
-+ * are in the right state.  The destructor of the class automatically reverts
-+ * to the previous state.  Each modifier may have multiple keys associated with
-+ * it, so in the case of a fake release, this may involve releasing more than
-+ * one key.
-+ */
-+
-+class ModifierState {
-+public:
-+	ModifierState(DeviceIntPtr _dev, int _modIndex)
-+		: modIndex(_modIndex), nKeys(0), keys(0), pressed(false),
-+		  dev(_dev) {}
-+
-+	~ModifierState()
-+	{
-+		for (int i = 0; i < nKeys; i++)
-+			generateXKeyEvent(keys[i], !pressed);
-+		delete [] keys;
-+	}
-+
-+	void press()
-+	{
-+		KeyClassPtr keyc = dev->key;
-+		if (!(keyc->state & (1 << modIndex))) {
-+			int index = modIndex * keyc->maxKeysPerModifier;
-+			tempKeyEvent(keyc->modifierKeyMap[index], true);
-+			pressed = true;
-+		}
-+	}
-+
-+	void release()
-+	{
-+		KeyClassPtr keyc = dev->key;
-+		if ((keyc->state & (1 << modIndex)) == 0)
-+			return;
-+
-+		for (int k = 0; k < keyc->maxKeysPerModifier; k++) {
-+			int index = modIndex * keyc->maxKeysPerModifier + k;
-+			int keycode = keyc->modifierKeyMap[index];
-+			if (keycode && IS_PRESSED(keyc, keycode))
-+				tempKeyEvent(keycode, false);
-+		}
-+	}
-+
-+private:
-+	void tempKeyEvent(int keycode, bool down)
-+	{
-+		if (keycode) {
-+			if (!keys) keys = new int[dev->key->maxKeysPerModifier];
-+			keys[nKeys++] = keycode;
-+			generateXKeyEvent(keycode, down);
-+		}
-+	}
-+
-+	void generateXKeyEvent(int keycode, bool down)
-+	{
-+		int n, action;
-+
-+		action = down ? KeyPress : KeyRelease;
-+		n = GetKeyboardEvents(eventq, dev, action, keycode);
-+		enqueueEvents(dev, n);
-+
-+		vlog.debug("fake keycode %d %s", keycode,
-+			   down ? "down" : "up");
-+	}
-+
-+	int modIndex;
-+	int nKeys;
-+	int *keys;
-+	bool pressed;
-+	DeviceIntPtr dev;
-+};
-+
-+
-+/* altKeysym is a table of alternative keysyms which have the same meaning. */
-+
-+static struct altKeysym_t {
-+	KeySym a, b;
-+} altKeysym[] = {
-+	{ XK_Shift_L,		XK_Shift_R },
-+	{ XK_Control_L,		XK_Control_R },
-+	{ XK_Meta_L,		XK_Meta_R },
-+	{ XK_Alt_L,		XK_Alt_R },
-+	{ XK_Super_L,		XK_Super_R },
-+	{ XK_Hyper_L,		XK_Hyper_R },
-+	{ XK_KP_Space,		XK_space },
-+	{ XK_KP_Tab,		XK_Tab },
-+	{ XK_KP_Enter,		XK_Return },
-+	{ XK_KP_F1,		XK_F1 },
-+	{ XK_KP_F2,		XK_F2 },
-+	{ XK_KP_F3,		XK_F3 },
-+	{ XK_KP_F4,		XK_F4 },
-+	{ XK_KP_Home,		XK_Home },
-+	{ XK_KP_Left,		XK_Left },
-+	{ XK_KP_Up,		XK_Up },
-+	{ XK_KP_Right,		XK_Right },
-+	{ XK_KP_Down,		XK_Down },
-+	{ XK_KP_Page_Up,	XK_Page_Up },
-+	{ XK_KP_Page_Down,	XK_Page_Down },
-+	{ XK_KP_End,		XK_End },
-+	{ XK_KP_Begin,		XK_Begin },
-+	{ XK_KP_Insert,		XK_Insert },
-+	{ XK_KP_Delete,		XK_Delete },
-+	{ XK_KP_Equal,		XK_equal },
-+	{ XK_KP_Multiply,	XK_asterisk },
-+	{ XK_KP_Add,		XK_plus },
-+	{ XK_KP_Separator,	XK_comma },
-+	{ XK_KP_Subtract,	XK_minus },
-+	{ XK_KP_Decimal,	XK_period },
-+	{ XK_KP_Divide,		XK_slash },
-+	{ XK_KP_0,		XK_0 },
-+	{ XK_KP_1,		XK_1 },
-+	{ XK_KP_2,		XK_2 },
-+	{ XK_KP_3,		XK_3 },
-+	{ XK_KP_4,		XK_4 },
-+	{ XK_KP_5,		XK_5 },
-+	{ XK_KP_6,		XK_6 },
-+	{ XK_KP_7,		XK_7 },
-+	{ XK_KP_8,		XK_8 },
-+	{ XK_KP_9,		XK_9 },
-+};
-+
-+/*
-+ * keyEvent() - work out the best keycode corresponding to the keysym sent by
-+ * the viewer.  This is non-trivial because we can't assume much about the
-+ * local keyboard layout.  We must also find out which column of the keyboard
-+ * mapping the keysym is in, and alter the shift state appropriately.  Column 0
-+ * means both shift and "mode_switch" (AltGr) must be released, column 1 means
-+ * shift must be pressed and mode_switch released, column 2 means shift must be
-+ * released and mode_switch pressed, and column 3 means both shift and
-+ * mode_switch must be pressed.
-+ *
-+ * Magic, which dynamically adds keysym<->keycode mapping depends on X.Org
-+ * version. Quick explanation of that "magic":
-+ * 
-+ * 1.5
-+ * - has only one core keyboard so we have to keep core keyboard mapping
-+ *   synchronized with vncKeyboardDevice. Do it via SwitchCoreKeyboard()
-+ *
-+ * 1.6 (aka MPX - Multi pointer X)
-+ * - multiple master devices (= core devices) exists, keep vncKeyboardDevice
-+ *   synchronized with proper master device
-+ */
-+
-+void KeyboardDevice::keyEvent(rdr::U32 keysym, bool down)
-+{
-+	DeviceIntPtr master;
-+	KeyClassPtr keyc = dev->key;
-+	KeySymsPtr keymap = &keyc->curKeySyms;
-+	KeySym *map = keymap->map;
-+	KeyCode minKeyCode = keymap->minKeyCode;
-+	KeyCode maxKeyCode = keymap->maxKeyCode;
-+	int mapWidth = keymap->mapWidth;
-+	unsigned int i, n;
-+	int j, k, action;
-+
-+	if (keysym == XK_Caps_Lock) {
-+		vlog.debug("Ignoring caps lock");
-+		return;
-+	}
-+
-+	/* find which modifier Mode_switch is on. */
-+	int modeSwitchMapIndex = 0;
-+	for (i = 3; i < 8; i++) {
-+		for (k = 0; k < keyc->maxKeysPerModifier; k++) {
-+			int index = i * keyc->maxKeysPerModifier + k;
-+			int keycode = keyc->modifierKeyMap[index];
-+
-+			if (keycode == 0)
-+				continue;
-+
-+			for (j = 0; j < mapWidth; j++) {
-+				if (map[(keycode - minKeyCode) * mapWidth + j]
-+				    == XK_Mode_switch) {
-+					modeSwitchMapIndex = i;
-+					goto ModeSwitchFound;
-+				}
-+			}
-+		}
-+	}
-+ModeSwitchFound:
-+
-+	int col = 0;
-+	if ((keyc->state & (1 << ShiftMapIndex)) != 0)
-+		col |= 1;
-+	if (modeSwitchMapIndex != 0 &&
-+	    ((keyc->state & (1 << modeSwitchMapIndex))) != 0)
-+		col |= 2;
-+
-+	int kc = KeysymToKeycode(keymap, keysym, &col);
-+
-+	/*
-+	 * Sort out the "shifted Tab" mess.  If we are sent a shifted Tab,
-+	 * generate a local shifted Tab regardless of what the "shifted Tab"
-+	 * keysym is on the local keyboard (it might be Tab, ISO_Left_Tab or
-+	 * HP's private BackTab keysym, and quite possibly some others too).
-+	 * We never get ISO_Left_Tab here because it's already been translated
-+	 * in VNCSConnectionST.
-+	 */
-+	if (keysym == XK_Tab && ((keyc->state & (1 << ShiftMapIndex))) != 0)
-+		col |= 1;
-+
-+	if (kc == 0) {
-+		/*
-+		 * Not a direct match in the local keyboard mapping.  Check for
-+		 * alternative keysyms with the same meaning.
-+		 */
-+		for (i = 0; i < sizeof(altKeysym) / sizeof(altKeysym_t); i++) {
-+			if (keysym == altKeysym[i].a)
-+				kc = KeysymToKeycode(keymap, altKeysym[i].b,
-+						     &col);
-+			else if (keysym == altKeysym[i].b)
-+				kc = KeysymToKeycode(keymap, altKeysym[i].a,
-+						     &col);
-+			if (kc)
-+				break;
-+		}
-+	}
-+
-+	if (kc == 0) {
-+		/* Dynamically add a new key to the keyboard mapping. */
-+		for (kc = maxKeyCode; kc >= minKeyCode; kc--) {
-+			if (map[(kc - minKeyCode) * mapWidth] != 0)
-+				continue;
-+
-+			map[(kc - minKeyCode) * mapWidth] = keysym;
-+			col = 0;
-+
-+			vlog.info("Added unknown keysym 0x%x to keycode %d",
-+				  keysym, kc);
-+#if XORG == 15
-+			master = inputInfo.keyboard;
-+#else
-+			master = dev->u.master;
-+#endif
-+			void *slave = dixLookupPrivate(&master->devPrivates,
-+						       CoreDevicePrivateKey);
-+			if (dev == slave) {
-+				dixSetPrivate(&master->devPrivates,
-+					      CoreDevicePrivateKey, NULL);
-+#if XORG == 15
-+				SwitchCoreKeyboard(dev);
-+#else
-+				CopyKeyClass(dev, master);
-+#endif
-+			}
-+			break;
-+		}
-+	}
-+
-+	if (kc < minKeyCode) {
-+		vlog.info("Keyboard mapping full - ignoring unknown keysym "
-+			  "0x%x",keysym);
-+		return;
-+	}
-+
-+	/*
-+	 * See if it's a modifier key.  If so, then don't do any auto-repeat,
-+	 * because the X server will translate each press into a release
-+	 * followed by a press.
-+	 */
-+	for (i = 0; i < 8; i++) {
-+		for (k = 0; k < keyc->maxKeysPerModifier; k++) {
-+			int index = i * keyc->maxKeysPerModifier + k;
-+			if (kc == keyc->modifierKeyMap[index] &&
-+			    IS_PRESSED(keyc,kc) && down)
-+				return;
-+		}
-+	}
-+
-+	ModifierState shift(dev, ShiftMapIndex);
-+	ModifierState modeSwitch(dev, modeSwitchMapIndex);
-+	if (down) {
-+		if (col & 1)
-+			shift.press();
-+		else
-+			shift.release();
-+		if (modeSwitchMapIndex) {
-+			if (col & 2)
-+				modeSwitch.press();
-+			else
-+				modeSwitch.release();
-+		}
-+	}
-+
-+	vlog.debug("keycode %d %s", kc, down ? "down" : "up");
-+	action = down ? KeyPress : KeyRelease;
-+	n = GetKeyboardEvents(eventq, dev, action, kc);
-+	enqueueEvents(dev, n);
-+}
-+
-+static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)
-+{
-+	int per = keymap->mapWidth;
-+	KeySym *syms;
-+	KeySym lsym, usym;
-+
-+	if ((col < 0) || ((col >= per) && (col > 3)) ||
-+	    (keycode < keymap->minKeyCode) || (keycode > keymap->maxKeyCode))
-+		return NoSymbol;
-+
-+	syms = &keymap->map[(keycode - keymap->minKeyCode) * per];
-+	if (col >= 4)
-+		return syms[col];
-+
-+	if (col > 1) {
-+		while ((per > 2) && (syms[per - 1] == NoSymbol))
-+			per--;
-+		if (per < 3)
-+			col -= 2;
-+	}
-+
-+	if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
-+		XConvertCase(syms[col&~1], &lsym, &usym);
-+		if (!(col & 1))
-+			return lsym;
-+		/*
-+		 * I'm commenting out this logic because it's incorrect even
-+		 * though it was copied from the Xlib sources.  The X protocol
-+		 * book quite clearly states that where a group consists of
-+		 * element 1 being a non-alphabetic keysym and element 2 being
-+		 * NoSymbol that you treat the second element as being the
-+		 * same as the first.  This also tallies with the behaviour
-+		 * produced by the installed Xlib on my linux box (I believe
-+		 * this is because it uses some XKB code rather than the
-+		 * original Xlib code - compare XKBBind.c with KeyBind.c in
-+		 * lib/X11).
-+		 */
-+#if 0
-+		else if (usym == lsym)
-+			return NoSymbol;
-+#endif
-+		else
-+			return usym;
-+	}
-+
-+	return syms[col];
-+}
-+
-+/*
-+ * KeysymToKeycode() - find the keycode and column corresponding to the given
-+ * keysym.  The value of col passed in should be the column determined from the
-+ * current shift state.  If the keysym can be found in that column we prefer
-+ * that to finding it in a different column (which would require fake events to
-+ * alter the shift state).
-+ */
-+static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col)
-+{
-+	int i, j;
-+
-+	j = *col;
-+	for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) {
-+		if (KeyCodetoKeySym(keymap, i, j) == ks)
-+			return i;
-+	}
-+
-+	for (j = 0; j < keymap->mapWidth; j++) {
-+		for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) {
-+			if (KeyCodetoKeySym(keymap, i, j) == ks) {
-+				*col = j;
-+				return i;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* Fairly standard US PC Keyboard */
-+
-+#define MIN_KEY 8
-+#define MAX_KEY 255
-+#define MAP_LEN (MAX_KEY - MIN_KEY + 1)
-+#define KEYSYMS_PER_KEY 2
-+KeySym keyboardMap[MAP_LEN * KEYSYMS_PER_KEY] = {
-+	NoSymbol, NoSymbol,
-+	XK_Escape, NoSymbol,
-+	XK_1, XK_exclam,
-+	XK_2, XK_at,
-+	XK_3, XK_numbersign,
-+	XK_4, XK_dollar,
-+	XK_5, XK_percent,
-+	XK_6, XK_asciicircum,
-+	XK_7, XK_ampersand,
-+	XK_8, XK_asterisk,
-+	XK_9, XK_parenleft,
-+	XK_0, XK_parenright,
-+	XK_minus, XK_underscore,
-+	XK_equal, XK_plus,
-+	XK_BackSpace, NoSymbol,
-+	XK_Tab, NoSymbol,
-+	XK_q, XK_Q,
-+	XK_w, XK_W,
-+	XK_e, XK_E,
-+	XK_r, XK_R,
-+	XK_t, XK_T,
-+	XK_y, XK_Y,
-+	XK_u, XK_U,
-+	XK_i, XK_I,
-+	XK_o, XK_O,
-+	XK_p, XK_P,
-+	XK_bracketleft, XK_braceleft,
-+	XK_bracketright, XK_braceright,
-+	XK_Return, NoSymbol,
-+	XK_Control_L, NoSymbol,
-+	XK_a, XK_A,
-+	XK_s, XK_S,
-+	XK_d, XK_D,
-+	XK_f, XK_F,
-+	XK_g, XK_G,
-+	XK_h, XK_H,
-+	XK_j, XK_J,
-+	XK_k, XK_K,
-+	XK_l, XK_L,
-+	XK_semicolon, XK_colon,
-+	XK_apostrophe, XK_quotedbl,
-+	XK_grave, XK_asciitilde,
-+	XK_Shift_L, NoSymbol,
-+	XK_backslash, XK_bar,
-+	XK_z, XK_Z,
-+	XK_x, XK_X,
-+	XK_c, XK_C,
-+	XK_v, XK_V,
-+	XK_b, XK_B,
-+	XK_n, XK_N,
-+	XK_m, XK_M,
-+	XK_comma, XK_less,
-+	XK_period, XK_greater,
-+	XK_slash, XK_question,
-+	XK_Shift_R, NoSymbol,
-+	XK_KP_Multiply, NoSymbol,
-+	XK_Alt_L, XK_Meta_L,
-+	XK_space, NoSymbol,
-+	/* XK_Caps_Lock */ NoSymbol, NoSymbol,
-+	XK_F1, NoSymbol,
-+	XK_F2, NoSymbol,
-+	XK_F3, NoSymbol,
-+	XK_F4, NoSymbol,
-+	XK_F5, NoSymbol,
-+	XK_F6, NoSymbol,
-+	XK_F7, NoSymbol,
-+	XK_F8, NoSymbol,
-+	XK_F9, NoSymbol,
-+	XK_F10, NoSymbol,
-+	XK_Num_Lock, XK_Pointer_EnableKeys,
-+	XK_Scroll_Lock, NoSymbol,
-+	XK_KP_Home, XK_KP_7,
-+	XK_KP_Up, XK_KP_8,
-+	XK_KP_Prior, XK_KP_9,
-+	XK_KP_Subtract, NoSymbol,
-+	XK_KP_Left, XK_KP_4,
-+	XK_KP_Begin, XK_KP_5,
-+	XK_KP_Right, XK_KP_6,
-+	XK_KP_Add, NoSymbol,
-+	XK_KP_End, XK_KP_1,
-+	XK_KP_Down, XK_KP_2,
-+	XK_KP_Next, XK_KP_3,
-+	XK_KP_Insert, XK_KP_0,
-+	XK_KP_Delete, XK_KP_Decimal,
-+	NoSymbol, NoSymbol,
-+	NoSymbol, NoSymbol,
-+	NoSymbol, NoSymbol,
-+	XK_F11, NoSymbol,
-+	XK_F12, NoSymbol,
-+	XK_Home, NoSymbol,
-+	XK_Up, NoSymbol,
-+	XK_Prior, NoSymbol,
-+	XK_Left, NoSymbol,
-+	NoSymbol, NoSymbol,
-+	XK_Right, NoSymbol,
-+	XK_End, NoSymbol,
-+	XK_Down, NoSymbol,
-+	XK_Next, NoSymbol,
-+	XK_Insert, NoSymbol,
-+	XK_Delete, NoSymbol,
-+	XK_KP_Enter, NoSymbol,
-+	XK_Control_R, NoSymbol,
-+	XK_Pause, XK_Break,
-+	XK_Print, XK_Execute,
-+	XK_KP_Divide, NoSymbol,
-+	XK_Alt_R, XK_Meta_R,
-+};
-+
-+static Bool GetMappings(KeySymsPtr pKeySyms, CARD8 *pModMap)
-+{
-+	int i;
-+
-+	for (i = 0; i < MAP_LENGTH; i++)
-+		pModMap[i] = NoSymbol;
-+
-+	for (i = 0; i < MAP_LEN; i++) {
-+		if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Caps_Lock)
-+			pModMap[i + MIN_KEY] = LockMask;
-+		else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_L ||
-+			 keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_R)
-+			pModMap[i + MIN_KEY] = ShiftMask;
-+		else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_L ||
-+			 keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_R)
-+			pModMap[i + MIN_KEY] = ControlMask;
-+		else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_L ||
-+			 keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_R)
-+			pModMap[i + MIN_KEY] = Mod1Mask;
-+	}
-+
-+	pKeySyms->minKeyCode = MIN_KEY;
-+	pKeySyms->maxKeyCode = MAX_KEY;
-+	pKeySyms->mapWidth = KEYSYMS_PER_KEY;
-+	pKeySyms->map = keyboardMap;
-+
-+	return TRUE;
-+}
-+
-+static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,
-+			 int class_)
-+{
-+	if (percent > 0)
-+		vncBell();
-+}
-+
-+static int keyboardProc(DeviceIntPtr pDevice, int onoff)
-+{
-+	KeySymsRec keySyms;
-+	CARD8 modMap[MAP_LENGTH];
-+	DevicePtr pDev = (DevicePtr)pDevice;
-+
-+	switch (onoff) {
-+	case DEVICE_INIT:
-+		GetMappings(&keySyms, modMap);
-+		InitKeyboardDeviceStruct(pDev, &keySyms, modMap, keyboardBell,
-+					 (KbdCtrlProcPtr)NoopDDA);
-+		break;
-+	case DEVICE_ON:
-+		pDev->on = TRUE;
-+		break;
-+	case DEVICE_OFF:
-+		pDev->on = FALSE;
-+		break;
-+#if 0
-+	case DEVICE_CLOSE:
-+		break;
-+#endif
-+	}
-+
-+	return Success;
-+}
-+
-diff --git a/unix/xserver/hw/vnc/Input.h b/unix/xserver/hw/vnc/Input.h
-index 49cedf2..1bfec92 100644
---- a/unix/xserver/hw/vnc/Input.h
-+++ b/unix/xserver/hw/vnc/Input.h
-@@ -58,4 +58,17 @@ private:
- 	rfb::Point cursorPos, oldCursorPos;
- };
- 
-+/* Represents keyboard device. */
-+class KeyboardDevice {
-+public:
-+	/* Create new Keyboard device instance. */
-+	KeyboardDevice(void);
-+
-+	void Press(rdr::U32 keysym) { keyEvent(keysym, true); }
-+	void Release(rdr::U32 keysym) { keyEvent(keysym, false); }
-+private:
-+	void keyEvent(rdr::U32 keysym, bool down);
-+	DeviceIntPtr dev;
-+};
-+
- #endif
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 58f70d9..66c92d2 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -50,26 +50,7 @@ extern "C" {
- 
- extern char *display;
- 
--#include "inputstr.h"
--#include "servermd.h"
- #include "colormapst.h"
--#include "resource.h"
--#include "cursorstr.h"
--#include "windowstr.h"
--#include "mi.h"
--#define XK_CYRILLIC
--#include <X11/keysym.h>
--#ifndef XKB_IN_SERVER
--#define XKB_IN_SERVER
--#endif
--#ifdef XKB
--#include <xkbsrv.h>
--#endif
--#if XORG >= 16
--#include "exevents.h"
--extern void
--CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
--#endif
- #ifdef RANDR
- #include "randrstr.h"
- #endif
-@@ -77,15 +58,6 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
- #undef class
- }
- 
--static DeviceIntPtr vncKeyboardDevice = NULL;
--#if XORG == 15
--static xEvent *eventq = NULL;
--#else
--static EventList *eventq = NULL;
--#endif
--
--static int vfbKeybdProc(DeviceIntPtr pDevice, int onoff);
--
- using namespace rfb;
- using namespace network;
- 
-@@ -102,8 +74,6 @@ IntParameter queryConnectTimeout("QueryConnectTimeout",
-                                  "rejecting the connection",
-                                  10);
- 
--static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col);
--
- static rdr::U8 reverseBits[] = {
-   0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0,
-   0x30, 0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-@@ -193,33 +163,8 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-   if (httpListener)
-     httpServer = new FileHTTPServer(this);
- 
--#if XORG == 15
--  /*
--   * XXX eventq is never free()-ed because it has to exist during server life
--   * */
--  if (!eventq)
--    eventq = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum());
--  if (!eventq)
--    FatalError("Couldn't allocate eventq\n");
--#else
--  GetEventList(&eventq);
--#endif
--
--  /*
--   * NOTE:
--   * We _might_ have to call ActivateDevice function for both keyboard and
--   * mouse. For Xvnc it's not needed but I have to check libvnc.so module.
--   */
--  if (vncKeyboardDevice == NULL) {
--    vncKeyboardDevice = AddInputDevice(
--#if XORG >= 16
--				       serverClient,
--#endif
--				       vfbKeybdProc, TRUE);
--    RegisterKeyboardDevice(vncKeyboardDevice);
--  }
--
-   pointerDevice = new PointerDevice(server);
-+  keyboardDevice = new KeyboardDevice();
- }
- 
- XserverDesktop::~XserverDesktop()
-@@ -229,6 +174,7 @@ XserverDesktop::~XserverDesktop()
-   TimerFree(deferredUpdateTimer);
-   TimerFree(dummyTimer);
-   delete pointerDevice;
-+  delete keyboardDevice;
-   delete httpServer;
-   delete server;
- }
-@@ -854,550 +800,10 @@
-   }
- }
- 
--//
--// Keyboard handling
--//
--
--#define IS_PRESSED(keyc, keycode) \
--  ((keyc)->down[(keycode) >> 3] & (1 << ((keycode) & 7)))
--
--// ModifierState is a class which helps simplify generating a "fake" press
--// or release of shift, ctrl, alt, etc.  An instance of the class is created
--// for every modifier which may need to be pressed or released.  Then either
--// press() or release() may be called to make sure that the corresponding keys
--// are in the right state.  The destructor of the class automatically reverts
--// to the previous state.  Each modifier may have multiple keys associated with
--// it, so in the case of a fake release, this may involve releasing more than
--// one key.
--
--class ModifierState {
--public:
--  ModifierState(int modIndex_)
--    : modIndex(modIndex_), nKeys(0), keys(0), pressed(false)
--  {
--  }
--  ~ModifierState() {
--    for (int i = 0; i < nKeys; i++)
--      generateXKeyEvent(keys[i], !pressed);
--    delete [] keys;
--  }
--  void press() {
--    KeyClassPtr keyc = vncKeyboardDevice->key;
--    if (!(keyc->state & (1<<modIndex))) {
--      tempKeyEvent(keyc->modifierKeyMap[modIndex * keyc->maxKeysPerModifier],
--                   true);
--      pressed = true;
--    }
--  }
--  void release() {
--    KeyClassPtr keyc = vncKeyboardDevice->key;
--    if (keyc->state & (1<<modIndex)) {
--      for (int k = 0; k < keyc->maxKeysPerModifier; k++) {
--        int keycode
--          = keyc->modifierKeyMap[modIndex * keyc->maxKeysPerModifier + k];
--        if (keycode && IS_PRESSED(keyc, keycode))
--          tempKeyEvent(keycode, false);
--      }
--    }
--  }
--private:
--  void tempKeyEvent(int keycode, bool down) {
--    if (keycode) {
--      if (!keys) keys = new int[vncKeyboardDevice->key->maxKeysPerModifier];
--      keys[nKeys++] = keycode;
--      generateXKeyEvent(keycode, down);
--    }
--  }
--  void generateXKeyEvent(int keycode, bool down) {
--    int i, n;
--    n = GetKeyboardEvents (eventq, vncKeyboardDevice,
--			   down ? KeyPress : KeyRelease, keycode);
--    for (i = 0; i < n; i++) {
--      mieqEnqueue (vncKeyboardDevice,
--#if XORG == 15
--		   eventq + i
--#else
--		   (eventq + i)->event
--#endif
--      );
--    }
--    vlog.debug("fake keycode %d %s", keycode, down ? "down" : "up");
--  }
--  int modIndex;
--  int nKeys;
--  int* keys;
--  bool pressed;
--};
--
--
--// altKeysym is a table of alternative keysyms which have the same meaning.
--
--struct altKeysym_t {
--  KeySym a, b;
--};
--
--altKeysym_t altKeysym[] = {
--  { XK_Shift_L,        XK_Shift_R },
--  { XK_Control_L,      XK_Control_R },
--  { XK_Meta_L,         XK_Meta_R },
--  { XK_Alt_L,          XK_Alt_R },
--  { XK_Super_L,        XK_Super_R },
--  { XK_Hyper_L,        XK_Hyper_R },
--  { XK_KP_Space,       XK_space },
--  { XK_KP_Tab,         XK_Tab },
--  { XK_KP_Enter,       XK_Return },
--  { XK_KP_F1,          XK_F1 },
--  { XK_KP_F2,          XK_F2 },
--  { XK_KP_F3,          XK_F3 },
--  { XK_KP_F4,          XK_F4 },
--  { XK_KP_Home,        XK_Home },
--  { XK_KP_Left,        XK_Left },
--  { XK_KP_Up,          XK_Up },
--  { XK_KP_Right,       XK_Right },
--  { XK_KP_Down,        XK_Down },
--  { XK_KP_Page_Up,     XK_Page_Up },
--  { XK_KP_Page_Down,   XK_Page_Down },
--  { XK_KP_End,         XK_End },
--  { XK_KP_Begin,       XK_Begin },
--  { XK_KP_Insert,      XK_Insert },
--  { XK_KP_Delete,      XK_Delete },
--  { XK_KP_Equal,       XK_equal },
--  { XK_KP_Multiply,    XK_asterisk },
--  { XK_KP_Add,         XK_plus },
--  { XK_KP_Separator,   XK_comma },
--  { XK_KP_Subtract,    XK_minus },
--  { XK_KP_Decimal,     XK_period },
--  { XK_KP_Divide,      XK_slash },
--  { XK_KP_0,           XK_0 },
--  { XK_KP_1,           XK_1 },
--  { XK_KP_2,           XK_2 },
--  { XK_KP_3,           XK_3 },
--  { XK_KP_4,           XK_4 },
--  { XK_KP_5,           XK_5 },
--  { XK_KP_6,           XK_6 },
--  { XK_KP_7,           XK_7 },
--  { XK_KP_8,           XK_8 },
--  { XK_KP_9,           XK_9 },
--};
--
--/*
-- * keyEvent() - work out the best keycode corresponding to the keysym sent by
-- * the viewer.  This is non-trivial because we can't assume much about the
-- * local keyboard layout.  We must also find out which column of the keyboard
-- * mapping the keysym is in, and alter the shift state appropriately.  Column 0
-- * means both shift and "mode_switch" (AltGr) must be released, column 1 means
-- * shift must be pressed and mode_switch released, column 2 means shift must be
-- * released and mode_switch pressed, and column 3 means both shift and
-- * mode_switch must be pressed.
-- *
-- * Magic, which dynamically adds keysym<->keycode mapping depends on X.Org
-- * version. Quick explanation of that "magic":
-- * 
-- * 1.5
-- * - has only one core keyboard so we have to keep core keyboard mapping
-- *   synchronized with vncKeyboardDevice. Do it via SwitchCoreKeyboard()
-- *
-- * 1.6 (aka MPX - Multi pointer X)
-- * - multiple master devices (= core devices) exists, keep vncKeyboardDevice
-- *   synchronized with proper master device
-- */
--
- void XserverDesktop::keyEvent(rdr::U32 keysym, bool down)
- {
--  DeviceIntPtr master;
--  KeyClassPtr keyc = vncKeyboardDevice->key;
--  KeySymsPtr keymap = &keyc->curKeySyms;
--  unsigned int i, n;
--  int j, k;
--
--  /* 
--   * Since we are checking the current state to determine if we need
--   * to fake modifiers, we must make sure that everything put on the
--   * input queue is processed before we start. Otherwise, shift may be
--   * stuck down.
--   */ 
--  mieqProcessInputEvents();
--
--  if (keysym == XK_Caps_Lock) {
--    vlog.debug("Ignoring caps lock");
--    return;
--  }
--
--  // find which modifier Mode_switch is on.
--  int modeSwitchMapIndex = 0;
--  for (i = 3; i < 8; i++) {
--    for (k = 0; k < keyc->maxKeysPerModifier; k++) {
--      int keycode = keyc->modifierKeyMap[i * keyc->maxKeysPerModifier + k];
--      for (j = 0; j < keymap->mapWidth; j++) {
--        if (keycode != 0 &&
--            keymap->map[(keycode - keymap->minKeyCode)
--                        * keymap->mapWidth + j] == XK_Mode_switch)
--        {
--          modeSwitchMapIndex = i;
--          break;
--        }
--      }
--    }
--  }
--
--  int col = 0;
--  if (keyc->state & (1<<ShiftMapIndex)) col |= 1;
--  if (modeSwitchMapIndex && (keyc->state & (1<<modeSwitchMapIndex))) col |= 2;
--
--  int kc = KeysymToKeycode(keymap, keysym, &col);
--
--  // Sort out the "shifted Tab" mess.  If we are sent a shifted Tab, generate a
--  // local shifted Tab regardless of what the "shifted Tab" keysym is on the
--  // local keyboard (it might be Tab, ISO_Left_Tab or HP's private BackTab
--  // keysym, and quite possibly some others too).  We never get ISO_Left_Tab
--  // here because it's already been translated in VNCSConnectionST.
--  if (keysym == XK_Tab && (keyc->state & (1<<ShiftMapIndex)))
--    col |= 1;
--
--  if (kc == 0) {
--    // Not a direct match in the local keyboard mapping.  Check for alternative
--    // keysyms with the same meaning.
--    for (i = 0; i < sizeof(altKeysym) / sizeof(altKeysym_t); i++) {
--      if (keysym == altKeysym[i].a)
--        kc = KeysymToKeycode(keymap, altKeysym[i].b, &col);
--      else if (keysym == altKeysym[i].b)
--        kc = KeysymToKeycode(keymap, altKeysym[i].a, &col);
--      if (kc) break;
--    }
--  }
--
--  if (kc == 0) {
--    // Last resort - dynamically add a new key to the keyboard mapping.
--    for (kc = keymap->maxKeyCode; kc >= keymap->minKeyCode; kc--) {
--      if (!keymap->map[(kc - keymap->minKeyCode) * keymap->mapWidth]) {
--        keymap->map[(kc - keymap->minKeyCode) * keymap->mapWidth] = keysym;
--        col = 0;
--
--	vlog.info("Added unknown keysym 0x%x to keycode %d",keysym,kc);
--
--#if XORG == 15
--	master = inputInfo.keyboard;
--#else
--	master = vncKeyboardDevice->u.master;
--#endif
--	if (vncKeyboardDevice ==
--	    dixLookupPrivate(&master->devPrivates, CoreDevicePrivateKey)) {
--	  dixSetPrivate(&master->devPrivates, CoreDevicePrivateKey, NULL);
--#if XORG == 15
--	  SwitchCoreKeyboard(vncKeyboardDevice);
--#else
--	  CopyKeyClass(vncKeyboardDevice, master);
--#endif
--	}
--        break;
--      }
--    }
--    if (kc < keymap->minKeyCode) {
--      vlog.info("Keyboard mapping full - ignoring unknown keysym 0x%x",keysym);
--      return;
--    }
--  }
--
--  // See if it's a modifier key.  If so, then don't do any auto-repeat, because
--  // the X server will translate each press into a release followed by a press.
--  for (i = 0; i < 8; i++) {
--    for (k = 0; k < keyc->maxKeysPerModifier; k++) {
--      if (kc == keyc->modifierKeyMap[i * keyc->maxKeysPerModifier + k] &&
--          IS_PRESSED(keyc,kc) && down)
--        return;
--    }
--  }
--
--  ModifierState shift(ShiftMapIndex);
--  ModifierState modeSwitch(modeSwitchMapIndex);
--  if (down) {
--    if (col & 1)
--      shift.press();
--    else
--      shift.release();
--    if (modeSwitchMapIndex) {
--      if (col & 2)
--        modeSwitch.press();
--      else
--        modeSwitch.release();
--    }
--  }
--  vlog.debug("keycode %d %s", kc, down ? "down" : "up");
--  n = GetKeyboardEvents (eventq, vncKeyboardDevice, down ?
--			 KeyPress : KeyRelease, kc);
--  for (i = 0; i < n; i++) {
--    mieqEnqueue (vncKeyboardDevice,
--#if XORG == 15
--		 eventq + i
--#else
--		 (eventq + i)->event
--#endif
--    );
--  }
--
--  /*
--   * When faking a modifier we are putting a keycode (which can
--   * currently activate the desired modifier) on the input
--   * queue. A future modmap change can change the mapping so
--   * that this keycode means something else entirely. Guard
--   * against this by processing the queue now.
--   */
--  mieqProcessInputEvents();
-+	if (down)
-+		keyboardDevice->Press(keysym);
-+	else
-+		keyboardDevice->Release(keysym);
- }
--
--static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)
--{
--  register int per = keymap->mapWidth;
--  register KeySym *syms;
--  KeySym lsym, usym;
--
--  if ((col < 0) || ((col >= per) && (col > 3)) ||
--      (keycode < keymap->minKeyCode) || (keycode > keymap->maxKeyCode))
--    return NoSymbol;
--
--  syms = &keymap->map[(keycode - keymap->minKeyCode) * per];
--  if (col < 4) {
--    if (col > 1) {
--      while ((per > 2) && (syms[per - 1] == NoSymbol))
--        per--;
--      if (per < 3)
--        col -= 2;
--    }
--    if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
--      XConvertCase(syms[col&~1], &lsym, &usym);
--      if (!(col & 1))
--        return lsym;
--      // I'm commenting out this logic because it's incorrect even though it
--      // was copied from the Xlib sources.  The X protocol book quite clearly
--      // states that where a group consists of element 1 being a non-alphabetic
--      // keysym and element 2 being NoSymbol that you treat the second element
--      // as being the same as the first.  This also tallies with the behaviour
--      // produced by the installed Xlib on my linux box (I believe this is
--      // because it uses some XKB code rather than the original Xlib code -
--      // compare XKBBind.c with KeyBind.c in lib/X11).
--      // else if (usym == lsym)
--      //   return NoSymbol;
--      else
--        return usym;
--    }
--  }
--  return syms[col];
--}
--
--// KeysymToKeycode() - find the keycode and column corresponding to the given
--// keysym.  The value of col passed in should be the column determined from the
--// current shift state.  If the keysym can be found in that column we prefer
--// that to finding it in a different column (which would require fake events to
--// alter the shift state).
--
--static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col)
--{
--  register int i, j;
--
--  j = *col;
--  for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) {
--    if (KeyCodetoKeySym(keymap, i, j) == ks)
--      return i;
--  }
--
--  for (j = 0; j < keymap->mapWidth; j++) {
--    for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) {
--      if (KeyCodetoKeySym(keymap, i, j) == ks) {
--        *col = j;
--        return i;
--      }
--    }
--  }
--  return 0;
--}
--
--/* Fairly standard US PC Keyboard */
--
--#define VFB_MIN_KEY 8
--#define VFB_MAX_KEY 255
--#define VFB_MAP_LEN (VFB_MAX_KEY - VFB_MIN_KEY + 1)
--#define KEYSYMS_PER_KEY 2
--KeySym keyboardMap[VFB_MAP_LEN * KEYSYMS_PER_KEY] = {
--  NoSymbol, NoSymbol,
--  XK_Escape, NoSymbol,
--  XK_1, XK_exclam,
--  XK_2, XK_at,
--  XK_3, XK_numbersign,
--  XK_4, XK_dollar,
--  XK_5, XK_percent,
--  XK_6, XK_asciicircum,
--  XK_7, XK_ampersand,
--  XK_8, XK_asterisk,
--  XK_9, XK_parenleft,
--  XK_0, XK_parenright,
--  XK_minus, XK_underscore,
--  XK_equal, XK_plus,
--  XK_BackSpace, NoSymbol,
--  XK_Tab, NoSymbol,
--  XK_q, XK_Q,
--  XK_w, XK_W,
--  XK_e, XK_E,
--  XK_r, XK_R,
--  XK_t, XK_T,
--  XK_y, XK_Y,
--  XK_u, XK_U,
--  XK_i, XK_I,
--  XK_o, XK_O,
--  XK_p, XK_P,
--  XK_bracketleft, XK_braceleft,
--  XK_bracketright, XK_braceright,
--  XK_Return, NoSymbol,
--  XK_Control_L, NoSymbol,
--  XK_a, XK_A,
--  XK_s, XK_S,
--  XK_d, XK_D,
--  XK_f, XK_F,
--  XK_g, XK_G,
--  XK_h, XK_H,
--  XK_j, XK_J,
--  XK_k, XK_K,
--  XK_l, XK_L,
--  XK_semicolon, XK_colon,
--  XK_apostrophe, XK_quotedbl,
--  XK_grave, XK_asciitilde,
--  XK_Shift_L, NoSymbol,
--  XK_backslash, XK_bar,
--  XK_z, XK_Z,
--  XK_x, XK_X,
--  XK_c, XK_C,
--  XK_v, XK_V,
--  XK_b, XK_B,
--  XK_n, XK_N,
--  XK_m, XK_M,
--  XK_comma, XK_less,
--  XK_period, XK_greater,
--  XK_slash, XK_question,
--  XK_Shift_R, NoSymbol,
--  XK_KP_Multiply, NoSymbol,
--  XK_Alt_L, XK_Meta_L,
--  XK_space, NoSymbol,
--  /*XK_Caps_Lock*/ NoSymbol, NoSymbol,
--  XK_F1, NoSymbol,
--  XK_F2, NoSymbol,
--  XK_F3, NoSymbol,
--  XK_F4, NoSymbol,
--  XK_F5, NoSymbol,
--  XK_F6, NoSymbol,
--  XK_F7, NoSymbol,
--  XK_F8, NoSymbol,
--  XK_F9, NoSymbol,
--  XK_F10, NoSymbol,
--  XK_Num_Lock, XK_Pointer_EnableKeys,
--  XK_Scroll_Lock, NoSymbol,
--  XK_KP_Home, XK_KP_7,
--  XK_KP_Up, XK_KP_8,
--  XK_KP_Prior, XK_KP_9,
--  XK_KP_Subtract, NoSymbol,
--  XK_KP_Left, XK_KP_4,
--  XK_KP_Begin, XK_KP_5,
--  XK_KP_Right, XK_KP_6,
--  XK_KP_Add, NoSymbol,
--  XK_KP_End, XK_KP_1,
--  XK_KP_Down, XK_KP_2,
--  XK_KP_Next, XK_KP_3,
--  XK_KP_Insert, XK_KP_0,
--  XK_KP_Delete, XK_KP_Decimal,
--  NoSymbol, NoSymbol,
--  NoSymbol, NoSymbol,
--  NoSymbol, NoSymbol,
--  XK_F11, NoSymbol,
--  XK_F12, NoSymbol,
--  XK_Home, NoSymbol,
--  XK_Up, NoSymbol,
--  XK_Prior, NoSymbol,
--  XK_Left, NoSymbol,
--  NoSymbol, NoSymbol,
--  XK_Right, NoSymbol,
--  XK_End, NoSymbol,
--  XK_Down, NoSymbol,
--  XK_Next, NoSymbol,
--  XK_Insert, NoSymbol,
--  XK_Delete, NoSymbol,
--  XK_KP_Enter, NoSymbol,
--  XK_Control_R, NoSymbol,
--  XK_Pause, XK_Break,
--  XK_Print, XK_Execute,
--  XK_KP_Divide, NoSymbol,
--  XK_Alt_R, XK_Meta_R,
--};
--
--static Bool GetMappings(KeySymsPtr pKeySyms, CARD8 *pModMap)
--{
--  int i;
--
--  for (i = 0; i < MAP_LENGTH; i++)
--    pModMap[i] = NoSymbol;
--
--  for (i = 0; i < VFB_MAP_LEN; i++) {
--    if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Caps_Lock)
--      pModMap[i + VFB_MIN_KEY] = LockMask;
--    else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_L ||
--             keyboardMap[i * KEYSYMS_PER_KEY] == XK_Shift_R)
--      pModMap[i + VFB_MIN_KEY] = ShiftMask;
--    else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_L ||
--             keyboardMap[i * KEYSYMS_PER_KEY] == XK_Control_R) {
--      pModMap[i + VFB_MIN_KEY] = ControlMask;
--    }
--    else if (keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_L ||
--             keyboardMap[i * KEYSYMS_PER_KEY] == XK_Alt_R)
--      pModMap[i + VFB_MIN_KEY] = Mod1Mask;
--  }
--
--  pKeySyms->minKeyCode = VFB_MIN_KEY;
--  pKeySyms->maxKeyCode = VFB_MAX_KEY;
--  pKeySyms->mapWidth = KEYSYMS_PER_KEY;
--  pKeySyms->map = keyboardMap;
--
--  return TRUE;
--}
--
--static void vfbBell(int percent, DeviceIntPtr device, pointer ctrl, int class_)
--{
--  if (percent > 0)
--    vncBell();
--}
--
--static int vfbKeybdProc(DeviceIntPtr pDevice, int onoff)
--{
--  KeySymsRec            keySyms;
--  CARD8                 modMap[MAP_LENGTH];
--  DevicePtr pDev = (DevicePtr)pDevice;
--#ifdef XKB
--  XkbComponentNamesRec names;
--#endif
--
--  switch (onoff)
--  {
--  case DEVICE_INIT:
--    GetMappings(&keySyms, modMap);
--#ifdef XKB
--    if (!noXkbExtension) {
--      memset(&names, 0, sizeof (names));
--      XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
--      XkbInitKeyboardDeviceStruct(pDevice, &names, &keySyms, modMap,
--				  (BellProcPtr)vfbBell,
--				  (KbdCtrlProcPtr)NoopDDA);
--    } else
--#endif
--    {
--      InitKeyboardDeviceStruct(pDev, &keySyms, modMap,
--			      (BellProcPtr)vfbBell, (KbdCtrlProcPtr)NoopDDA);
--    }
--    break;
--  case DEVICE_ON:
--    pDev->on = TRUE;
--    break;
--  case DEVICE_OFF:
--    pDev->on = FALSE;
--    break;
--  case DEVICE_CLOSE:
--    break;
--  }
--  return Success;
--}
--
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index 9f300f5..6e4f609 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -123,6 +123,7 @@ private:
-   void deferUpdate();
-   ScreenPtr pScreen;
-   PointerDevice *pointerDevice;
-+  KeyboardDevice *keyboardDevice;
-   OsTimerPtr deferredUpdateTimer, dummyTimer;
-   rfb::VNCServerST* server;
-   rfb::HTTPServer* httpServer;
-
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-modkeystick.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-From c4867c83722795c55b07c0fbcbd22fe8e86b96e7 Mon Sep 17 00:00:00 2001
-From: astrand <astrand@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Wed, 9 Dec 2009 12:28:19 +0000
-Subject: [PATCH] Avoid modifiers such as shift sticking.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3924 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Input.cc |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
-index 478240c..4ad1564 100644
---- a/unix/xserver/hw/vnc/Input.cc
-+++ b/unix/xserver/hw/vnc/Input.cc
-@@ -373,6 +373,14 @@ void KeyboardDevice::keyEvent(rdr::U32 keysym, bool down)
- 	unsigned int i, n;
- 	int j, k, action;
- 
-+	/* 
-+	 * Since we are checking the current state to determine if we need
-+	 * to fake modifiers, we must make sure that everything put on the
-+	 * input queue is processed before we start. Otherwise, shift may be
-+	 * stuck down.
-+	 */ 
-+	mieqProcessInputEvents();
-+
- 	if (keysym == XK_Caps_Lock) {
- 		vlog.debug("Ignoring caps lock");
- 		return;
-@@ -506,6 +514,15 @@ ModeSwitchFound:
- 	action = down ? KeyPress : KeyRelease;
- 	n = GetKeyboardEvents(eventq, dev, action, kc);
- 	enqueueEvents(dev, n);
-+	
-+	/*
-+	 * When faking a modifier we are putting a keycode (which can
-+	 * currently activate the desired modifier) on the input
-+	 * queue. A future modmap change can change the mapping so
-+	 * that this keycode means something else entirely. Guard
-+	 * against this by processing the queue now.
-+	 */
-+	mieqProcessInputEvents();
- }
- 
- static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-port-to-1.7.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,423 +0,0 @@
-From 186235a9c04d150318b07e00ee2894b8e7817af9 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Mon, 21 Dec 2009 14:01:22 +0000
-Subject: [PATCH] [Development] Make Xvnc working when compiled against X.Org 1.7 (Thanks to adq_dvb at lidskialf dot net).
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3927 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Input.cc          |  210 +++++++++++++++++++++++++++-----
- unix/xserver/hw/vnc/XserverDesktop.cc |    7 +
- unix/xserver/hw/vnc/xorg-version.h    |    6 +-
- unix/xserver/hw/vnc/xvnc.cc           |    6 +
- 4 files changed, 195 insertions(+), 34 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
-index 4ad1564..62fca6d 100644
---- a/unix/xserver/hw/vnc/Input.cc
-+++ b/unix/xserver/hw/vnc/Input.cc
-@@ -43,9 +43,17 @@ extern "C" {
- #endif
- #if XORG >= 16
- #include "exevents.h"
-+#endif
-+#if XORG == 16
- extern void
- CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
- #endif
-+#if XORG >= 17
-+#include "xkbsrv.h"
-+#include "xkbstr.h"
-+#include "xserver-properties.h"
-+extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey;
-+#endif
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
- #undef public
-@@ -99,8 +107,10 @@ static void enqueueEvents(DeviceIntPtr dev, int n)
- 		mieqEnqueue(dev,
- #if XORG == 15
- 			    eventq + i
--#else
-+#elif XORG == 16
- 			    (eventq + i)->event
-+#else
-+			    (InternalEvent *) (eventq + i)->event
- #endif
- 			   );
- 	}
-@@ -169,18 +179,43 @@ static int pointerProc(DeviceIntPtr pDevice, int onoff)
- 	BYTE map[BUTTONS + 1];
- 	DevicePtr pDev = (DevicePtr)pDevice;
- 	int i;
-+#if XORG >= 17
-+	/*
-+	 * NOTE: map[] array is one element longer than btn_labels[] array. This
-+	 * is not a bug.
-+	 */
-+	Atom btn_labels[BUTTONS];
-+	Atom axes_labels[2];
-+#endif
- 
- 	switch (onoff) {
- 	case DEVICE_INIT:
- 		for (i = 0; i < BUTTONS + 1; i++)
- 			map[i] = i;
- 
-+#if XORG >= 17
-+		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-+		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-+		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-+		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-+		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-+
-+		axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-+		axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-+#endif
-+
- 		InitPointerDeviceStruct(pDev, map, BUTTONS,
- #if XORG == 15
- 					GetMotionHistory,
-+#elif XORG >= 17
-+					btn_labels,
- #endif
- 					(PtrCtrlProcPtr)NoopDDA,
--					GetMotionHistorySize(), 2);
-+					GetMotionHistorySize(), 2
-+#if XORG >= 17
-+					, axes_labels
-+#endif
-+					);
- 		break;
- 	case DEVICE_ON:
- 		pDev->on = TRUE;
-@@ -239,33 +274,84 @@ public:
- 
- 	void press()
- 	{
-+		int state, index, maxKeysPerMod, keycode;
-+#if XORG >= 17
-+		int ret;
-+		KeyCode *modmap = NULL;
-+
-+		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
-+#else
- 		KeyClassPtr keyc = dev->key;
--		if (!(keyc->state & (1 << modIndex))) {
--			int index = modIndex * keyc->maxKeysPerModifier;
--			tempKeyEvent(keyc->modifierKeyMap[index], true);
--			pressed = true;
-+		state = keyc->state;
-+#endif
-+		if ((state & (1 << modIndex)) != 0)
-+			return;
-+
-+#if XORG >= 17
-+		if (generate_modkeymap(serverClient, dev, &modmap,
-+				       &maxKeysPerMod) != Success) {
-+			vlog.error("generate_modkeymap failed");
-+			return;
- 		}
-+
-+		keycode = modmap[modIndex * maxKeysPerMod];
-+		xfree(modmap);
-+#else
-+		maxKeysPerMod = keyc->maxKeysPerModifier;
-+		keycode = keyc->modifierKeyMap[modIndex * maxKeysPerMod];
-+#endif
-+		tempKeyEvent(keycode, true, maxKeysPerMod);
-+		pressed = true;
- 	}
- 
- 	void release()
- 	{
--		KeyClassPtr keyc = dev->key;
--		if ((keyc->state & (1 << modIndex)) == 0)
-+		int state, maxKeysPerMod;
-+		KeyClassPtr keyc;
-+#if XORG >= 17
-+		int ret;
-+		KeyCode *modmap = NULL;
-+
-+		keyc = dev->u.master->key;
-+		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
-+#else
-+		keyc = dev->key;
-+		state = keyc->state;
-+#endif
-+		if ((state & (1 << modIndex)) == 0)
- 			return;
- 
--		for (int k = 0; k < keyc->maxKeysPerModifier; k++) {
--			int index = modIndex * keyc->maxKeysPerModifier + k;
--			int keycode = keyc->modifierKeyMap[index];
-+#if XORG >= 17
-+		if (generate_modkeymap(serverClient, dev, &modmap,
-+				       &maxKeysPerMod) != Success) {
-+			vlog.error("generate_modkeymap failed");
-+			return;
-+		}
-+#else
-+		maxKeysPerMod = keyc->maxKeysPerModifier;
-+#endif
-+
-+		for (int k = 0; k < maxKeysPerMod; k++) {
-+			int keycode;
-+			int index = modIndex * maxKeysPerMod + k;
-+#if XORG >= 17
-+			keycode = modmap[index];
-+#else
-+			keycode = keyc->modifierKeyMap[index];
-+#endif
- 			if (keycode && IS_PRESSED(keyc, keycode))
--				tempKeyEvent(keycode, false);
-+				tempKeyEvent(keycode, false, maxKeysPerMod);
- 		}
-+#if XORG >= 17
-+		xfree(modmap);
-+#endif
- 	}
- 
- private:
--	void tempKeyEvent(int keycode, bool down)
-+	void tempKeyEvent(int keycode, bool down, int maxKeysPerMod)
- 	{
- 		if (keycode) {
--			if (!keys) keys = new int[dev->key->maxKeysPerModifier];
-+			if (!keys) keys = new int[maxKeysPerMod];
- 			keys[nKeys++] = keycode;
- 			generateXKeyEvent(keycode, down);
- 		}
-@@ -361,17 +447,28 @@ static struct altKeysym_t {
-  *   synchronized with proper master device
-  */
- 
-+#if XORG >= 17
-+#define FREE_MAPS \
-+	do { \
-+	        xfree(modmap); \
-+	        xfree(keymap->map); \
-+	        xfree(keymap); \
-+	} while (0);
-+#else
-+#define FREE_MAPS
-+#endif
-+
- void KeyboardDevice::keyEvent(rdr::U32 keysym, bool down)
- {
- 	DeviceIntPtr master;
--	KeyClassPtr keyc = dev->key;
--	KeySymsPtr keymap = &keyc->curKeySyms;
--	KeySym *map = keymap->map;
--	KeyCode minKeyCode = keymap->minKeyCode;
--	KeyCode maxKeyCode = keymap->maxKeyCode;
--	int mapWidth = keymap->mapWidth;
-+	KeyClassPtr keyc;
-+	KeySymsPtr keymap = NULL;
-+	KeySym *map = NULL;
-+	KeyCode minKeyCode, maxKeyCode;
-+	KeyCode *modmap = NULL;
-+	int mapWidth;
- 	unsigned int i, n;
--	int j, k, action;
-+	int j, k, action, state, maxKeysPerMod;
- 
- 	/* 
- 	 * Since we are checking the current state to determine if we need
-@@ -385,13 +482,43 @@ void KeyboardDevice::keyEvent(rdr::U32 keysym, bool down)
- 		vlog.debug("Ignoring caps lock");
- 		return;
- 	}
-+vlog.debug("keysym %d", keysym);
-+#if XORG >= 17
-+	keyc = dev->u.master->key;
-+
-+	keymap = XkbGetCoreMap(dev);
-+	if (!keymap) {
-+		vlog.error("VNC keyboard device has no map");
-+		return;
-+	}
-+
-+	if (generate_modkeymap(serverClient, dev, &modmap, &maxKeysPerMod)
-+	    != Success) {
-+		vlog.error("generate_modkeymap failed");
-+		xfree(keymap->map);
-+		xfree(keymap);
-+		return;
-+	}
-+
-+	state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
-+#else
-+	keyc = dev->key;
-+	state = keyc->state;
-+	maxKeysPerMod = keyc->maxKeysPerModifier;
-+	keymap = &keyc->curKeySyms;
-+	modmap = keyc->modifierKeyMap;
-+#endif
-+	map = keymap->map;
-+	minKeyCode = keymap->minKeyCode;
-+	maxKeyCode = keymap->maxKeyCode;
-+	mapWidth = keymap->mapWidth;
- 
- 	/* find which modifier Mode_switch is on. */
- 	int modeSwitchMapIndex = 0;
- 	for (i = 3; i < 8; i++) {
--		for (k = 0; k < keyc->maxKeysPerModifier; k++) {
--			int index = i * keyc->maxKeysPerModifier + k;
--			int keycode = keyc->modifierKeyMap[index];
-+		for (k = 0; k < maxKeysPerMod; k++) {
-+			int index = i * maxKeysPerMod + k;
-+			int keycode = modmap[index];
- 
- 			if (keycode == 0)
- 				continue;
-@@ -408,10 +535,10 @@ void KeyboardDevice::keyEvent(rdr::U32 keysym, bool down)
- ModeSwitchFound:
- 
- 	int col = 0;
--	if ((keyc->state & (1 << ShiftMapIndex)) != 0)
-+	if ((state & (1 << ShiftMapIndex)) != 0)
- 		col |= 1;
- 	if (modeSwitchMapIndex != 0 &&
--	    ((keyc->state & (1 << modeSwitchMapIndex))) != 0)
-+	    ((state & (1 << modeSwitchMapIndex))) != 0)
- 		col |= 2;
- 
- 	int kc = KeysymToKeycode(keymap, keysym, &col);
-@@ -424,7 +551,7 @@ ModeSwitchFound:
- 	 * We never get ISO_Left_Tab here because it's already been translated
- 	 * in VNCSConnectionST.
- 	 */
--	if (keysym == XK_Tab && ((keyc->state & (1 << ShiftMapIndex))) != 0)
-+	if (keysym == XK_Tab && ((state & (1 << ShiftMapIndex))) != 0)
- 		col |= 1;
- 
- 	if (kc == 0) {
-@@ -455,6 +582,8 @@ ModeSwitchFound:
- 
- 			vlog.info("Added unknown keysym 0x%x to keycode %d",
- 				  keysym, kc);
-+
-+#if XORG < 17
- #if XORG == 15
- 			master = inputInfo.keyboard;
- #else
-@@ -471,6 +600,12 @@ ModeSwitchFound:
- 				CopyKeyClass(dev, master);
- #endif
- 			}
-+#else /* XORG < 17 */
-+			XkbApplyMappingChange(dev, keymap, minKeyCode,
-+					      maxKeyCode - minKeyCode + 1,
-+					      NULL, serverClient);
-+			XkbCopyDeviceKeymap(dev->u.master, dev);
-+#endif /* XORG < 17 */
- 			break;
- 		}
- 	}
-@@ -478,6 +613,7 @@ ModeSwitchFound:
- 	if (kc < minKeyCode) {
- 		vlog.info("Keyboard mapping full - ignoring unknown keysym "
- 			  "0x%x",keysym);
-+		FREE_MAPS;
- 		return;
- 	}
- 
-@@ -487,11 +623,12 @@ ModeSwitchFound:
- 	 * followed by a press.
- 	 */
- 	for (i = 0; i < 8; i++) {
--		for (k = 0; k < keyc->maxKeysPerModifier; k++) {
--			int index = i * keyc->maxKeysPerModifier + k;
--			if (kc == keyc->modifierKeyMap[index] &&
--			    IS_PRESSED(keyc,kc) && down)
-+		for (k = 0; k < maxKeysPerMod; k++) {
-+			int index = i * maxKeysPerMod + k;
-+			if (kc == modmap[index] && IS_PRESSED(keyc,kc) && down) {
-+				FREE_MAPS;
- 				return;
-+			}	
- 		}
- 	}
- 
-@@ -761,9 +898,16 @@ static int keyboardProc(DeviceIntPtr pDevice, int onoff)
- 
- 	switch (onoff) {
- 	case DEVICE_INIT:
-+#if XORG < 17
- 		GetMappings(&keySyms, modMap);
--		InitKeyboardDeviceStruct(pDev, &keySyms, modMap, keyboardBell,
--					 (KbdCtrlProcPtr)NoopDDA);
-+#endif
-+		InitKeyboardDeviceStruct(
-+#if XORG >= 17
-+					 pDevice, NULL,
-+#else
-+					 pDev, &keySyms, modMap,
-+#endif
-+					 keyboardBell, (KbdCtrlProcPtr)NoopDDA);
- 		break;
- 	case DEVICE_ON:
- 		pDev->on = TRUE;
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 66c92d2..b316e69 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -54,6 +54,10 @@ extern char *display;
- #ifdef RANDR
- #include "randrstr.h"
- #endif
-+#if XORG >= 17
-+#include "cursorstr.h"
-+#endif
-+
- #undef public
- #undef class
- }
-@@ -185,6 +189,9 @@ void XserverDesktop::serverReset(ScreenPtr pScreen_)
-   int i;
-   pointer retval;
- 
-+#if XORG >= 17
-+#define dixLookupResource dixLookupResourceByType
-+#endif
-   i = dixLookupResource(&retval, pScreen->defColormap, RT_COLORMAP, NullClient,
- 			DixReadAccess);
- 
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index e7eeca0..3d942fc 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -26,8 +26,12 @@
- 
- #if XORG_VERSION_CURRENT < ((1 * 10000000) + (5 * 100000) + (99 * 1000))
- #define XORG 15
--#else
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (6 * 100000) + (99 * 1000))
- #define XORG 16
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000))
-+#define XORG 17
-+#else
-+#error "X.Org newer than 1.7 is not supported"
- #endif
- 
- #endif
-diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
-index 05066fc..f21cf21 100644
---- a/unix/xserver/hw/vnc/xvnc.cc
-+++ b/unix/xserver/hw/vnc/xvnc.cc
-@@ -81,6 +81,12 @@ extern "C" {
- #endif /* RANDR */
- #include <X11/keysym.h>
-   extern char buildtime[];
-+#if XORG >= 17
-+#undef VENDOR_RELEASE
-+#undef VENDOR_STRING
-+#include "version-config.h"
-+#include "site.h"
-+#endif
- #undef class
- #undef public
- }
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-port-to-1.8.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-From 6e3dad36c1e9a71eb0ee80fd86b7c452dbf1eea9 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 22 Jan 2010 11:15:55 +0000
-Subject: [PATCH] [Development] X.Org 1.8 codebase is now supported. Add xserver18.patch.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3954 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/xorg-version.h |    4 +-
- unix/xserver18.patch               |   87 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 90 insertions(+), 1 deletions(-)
- create mode 100644 unix/xserver18.patch
-
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 3d942fc..71f8553 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -30,8 +30,10 @@
- #define XORG 16
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000))
- #define XORG 17
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000))
-+#define XORG 18
- #else
--#error "X.Org newer than 1.7 is not supported"
-+#error "X.Org newer than 1.8 is not supported"
- #endif
- 
- #endif
-diff --git a/unix/xserver18.patch b/unix/xserver18.patch
-new file mode 100644
-index 0000000..3ac7c38
---- /dev/null
-+++ b/unix/xserver18.patch
-@@ -0,0 +1,87 @@
-+diff -up xserver/configure.ac.vnc xserver/configure.ac
-+--- xserver/configure.ac.vnc	2010-01-22 11:23:04.524629373 +0100
-++++ xserver/configure.ac	2010-01-22 11:31:04.704638847 +0100
-+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.7.99.3, [https:
-+ RELEASE_DATE="(unreleased)"
-+ AC_CONFIG_SRCDIR([Makefile.am])
-+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
-+-AM_MAINTAINER_MODE
-+ 
-+ # Require xorg-macros: XORG_DEFAULT_OPTIONS
-+ m4_ifndef([XORG_MACROS_VERSION],
-+@@ -63,6 +62,7 @@ dnl forcing an entire recompile.x
-+ AC_CONFIG_HEADERS(include/version-config.h)
-+ 
-+ AC_PROG_CC
-++AC_PROG_CXX
-+ AM_PROG_AS
-+ AC_PROG_INSTALL
-+ AC_PROG_LN_S
-+@@ -1486,6 +1486,10 @@ if test "x$XVFB" = xyes; then
-+ 	AC_SUBST([XVFB_SYS_LIBS])
-+ fi
-+ 
-++dnl Xvnc DDX
-++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
-++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-++AC_SUBST([LIBVNC_LIBS], ["$XI_LIB $DIX_LIB $XKB_LIB"])
-+ 
-+ dnl Xnest DDX
-+ 
-+@@ -1524,6 +1528,8 @@ xorg_bus_linuxpci=no
-+ xorg_bus_bsdpci=no
-+ xorg_bus_sparc=no
-+ 
-++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-++
-+ if test "x$XORG" = xyes; then
-+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
-+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-+@@ -1765,7 +1771,6 @@ if test "x$XORG" = xyes; then
-+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
-+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
-+ 	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
-+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
-+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
-+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-+@@ -2195,6 +2200,7 @@ hw/dmx/input/Makefile
-+ hw/dmx/glxProxy/Makefile
-+ hw/dmx/Makefile
-+ hw/vfb/Makefile
-++hw/vnc/Makefile
-+ hw/xnest/Makefile
-+ hw/xwin/Makefile
-+ hw/xquartz/Makefile
-+diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
-+--- xserver/hw/Makefile.am.vnc	2010-01-22 11:23:04.560613962 +0100
-++++ xserver/hw/Makefile.am	2010-01-22 11:23:04.600597430 +0100
-+@@ -33,7 +33,8 @@ SUBDIRS =			\
-+ 	$(XNEST_SUBDIRS)	\
-+ 	$(DMX_SUBDIRS)		\
-+ 	$(KDRIVE_SUBDIRS)	\
-+-	$(XQUARTZ_SUBDIRS)
-++	$(XQUARTZ_SUBDIRS)	\
-++	vnc
-+ 
-+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
-+ 
-+diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
-+--- xserver/mi/miinitext.c.vnc	2010-01-22 11:23:04.564613258 +0100
-++++ xserver/mi/miinitext.c	2010-01-22 11:23:04.600597430 +0100
-+@@ -274,6 +274,7 @@ extern void DamageExtensionInit(INITARGS
-+ extern void CompositeExtensionInit(INITARGS);
-+ #endif
-+ extern void GEExtensionInit(INITARGS);
-++extern void vncExtensionInit(INITARGS);
-+ 
-+ /* The following is only a small first step towards run-time
-+  * configurable extensions.
-+@@ -454,6 +455,7 @@ InitExtensions(int argc, char *argv[])
-+ #ifdef XF86BIGFONT
-+     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
-+ #endif
-++    vncExtensionInit();
-+ #if !defined(NO_HW_ONLY_EXTS)
-+ #if defined(XF86VIDMODE)
-+     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-xkbconvertcase.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-From d11e60203e74d8b5e5a35764804ed8b9b7775c89 Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Tue, 18 May 2010 13:35:37 +0000
-Subject: [PATCH] [Bugfix] Use always XkbConvertCase instead of XConvertCase when compiling
- against X.Org 1.8.X and newer. Othewrise keysyms are not mapped correctly
- to keycodes.
-
-Reference: https://bugzilla.redhat.com/show_bug.cgi?id=586406
-
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@4057 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Input.cc |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
-index d108763..f1e4801 100644
---- a/unix/xserver/hw/vnc/Input.cc
-+++ b/unix/xserver/hw/vnc/Input.cc
-@@ -712,7 +712,12 @@ static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)
- 	}
- 
- 	if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
--		XConvertCase(syms[col&~1], &lsym, &usym);
-+#if XORG >= 18
-+		XkbConvertCase
-+#else
-+		XConvertCase
-+#endif
-+			    (syms[col&~1], &lsym, &usym);
- 		if (!(col & 1))
- 			return lsym;
- 		/*
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-xorg-1.8-closeinput.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-From 1988eda4f80eae04ccd71b7051765ed0a0967ada Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 19 Feb 2010 13:07:19 +0000
-Subject: [PATCH] [Bugfix] X.Org 1.8 series needs CloseInput function defined in xvnc.cc.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3993 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/xvnc.cc |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
-index 62564d3..1d19695 100644
---- a/unix/xserver/hw/vnc/xvnc.cc
-+++ b/unix/xserver/hw/vnc/xvnc.cc
-@@ -1345,3 +1345,9 @@ void InitInput(int argc, char *argv[])
- {
-   mieqInit ();
- }
-+
-+#if XORG > 17
-+void CloseInput(void)
-+{
-+}
-+#endif
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/upstream-xorg-version.patch	Mon May 09 10:12:33 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,455 +0,0 @@
-From 7830b1117f289c0adcc14d60318f1b950ff5fd1a Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 28 Aug 2009 12:00:32 +0000
-Subject: [PATCH] Use "XORG <version>" macro instead of "XORG_<version>" to distinguish between X.Org branches.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3883 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/XserverDesktop.cc |   38 ++++++++++++++++----------------
- unix/xserver/hw/vnc/XserverDesktop.h  |    4 +-
- unix/xserver/hw/vnc/vncHooks.cc       |   12 +++++-----
- unix/xserver/hw/vnc/xvnc.cc           |   14 ++++++------
- 4 files changed, 34 insertions(+), 34 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 9a5fb40..a36e769 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -63,7 +63,7 @@ extern char *display;
- #ifdef XKB
- #include <xkbsrv.h>
- #endif
--#ifdef XORG_16
-+#if XORG >= 16
- #include "exevents.h"
- extern void
- CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
-@@ -77,7 +77,7 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
- 
- static DeviceIntPtr vncKeyboardDevice = NULL;
- static DeviceIntPtr vncPointerDevice = NULL;
--#ifdef XORG_15
-+#if XORG == 15
- static xEvent *eventq = NULL;
- #else
- static EventList *eventq = NULL;
-@@ -194,7 +194,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-   if (httpListener)
-     httpServer = new FileHTTPServer(this);
- 
--#ifdef XORG_15
-+#if XORG == 15
-   /*
-    * XXX eventq is never free()-ed because it has to exist during server life
-    * */
-@@ -211,7 +211,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
-    */
-   if (vncKeyboardDevice == NULL) {
-     vncKeyboardDevice = AddInputDevice(
--#ifdef XORG_16
-+#if XORG >= 16
- 				       serverClient,
- #endif
- 				       vfbKeybdProc, TRUE);
-@@ -220,7 +220,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
- 
-   if (vncPointerDevice == NULL) {
-     vncPointerDevice = AddInputDevice(
--#ifdef XORG_16
-+#if XORG >= 16
- 				      serverClient,
- #endif
- 				      vfbMouseProc, TRUE);
-@@ -557,7 +557,7 @@ void XserverDesktop::positionCursor()
-   if (!cursorPos.equals(oldCursorPos)) {
-     oldCursorPos = cursorPos;
-     (*pScreen->SetCursorPosition) (
--#ifdef XORG_16
-+#if XORG >= 16
- 				   vncPointerDevice,
- #endif
- 				   pScreen, cursorPos.x, cursorPos.y, FALSE);
-@@ -569,7 +569,7 @@ void XserverDesktop::positionCursor()
- void XserverDesktop::blockHandler(fd_set* fds)
- {
-   try {
--#ifdef XORG_15
-+#if XORG == 15
-     ScreenPtr screenWithCursor = GetCurrentRootWindow()->drawable.pScreen;
- #else
-     ScreenPtr screenWithCursor =
-@@ -578,7 +578,7 @@ void XserverDesktop::blockHandler(fd_set* fds)
-     if (screenWithCursor == pScreen) {
-       int x, y;
-       GetSpritePosition(
--#ifdef XORG_16
-+#if XORG >= 16
- 			vncPointerDevice,
- #endif
- 			&x, &y);
-@@ -742,7 +742,7 @@ void XserverDesktop::pointerEvent(const Point& pos, int buttonMask)
-   //(*pScreen->SetCursorPosition) (pScreen, pos.x, pos.y, FALSE);
- 
-   NewCurrentScreen(
--#ifdef XORG_16
-+#if XORG >= 16
- 		   vncPointerDevice,
- #endif
- 		   pScreen, pos.x, pos.y);
-@@ -751,7 +751,7 @@ void XserverDesktop::pointerEvent(const Point& pos, int buttonMask)
-     valuators[0] = pos.x;
-     valuators[1] = pos.y;
- 
--#ifdef XORG_16
-+#if XORG >= 16
-     GetEventList(&eventq);
- #endif
-     n = GetPointerEvents (eventq, vncPointerDevice, MotionNotify, 0,
-@@ -759,7 +759,7 @@ void XserverDesktop::pointerEvent(const Point& pos, int buttonMask)
- 
-     for (i = 0; i < n; i++) {
-       mieqEnqueue (vncPointerDevice,
--#ifdef XORG_15
-+#if XORG == 15
- 		   eventq + i
- #else
- 		   (eventq + i)->event
-@@ -779,7 +779,7 @@ void XserverDesktop::pointerEvent(const Point& pos, int buttonMask)
- 
-       for (j = 0; j < n; j++) {
- 	mieqEnqueue (vncPointerDevice,
--#ifdef XORG_15
-+#if XORG == 15
- 		     eventq + j
- #else
- 		     (eventq + j)->event
-@@ -809,7 +809,7 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height,
-   RRModePtr         mode;
- 
-   // Make sure all RandR tables are properly populated
--#ifdef XORG_15
-+#if XORG == 15
-   ret = RRGetInfo(pScreen);
- #else
-   ret = RRGetInfo(pScreen, FALSE);
-@@ -832,7 +832,7 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height,
- 
-   // Then we have to call RRGetInfo again for it to copy the RandR
-   // 1.0 information to the 1.2 structures.
--#ifdef XORG_15
-+#if XORG == 15
-   ret = RRGetInfo(pScreen);
- #else
-   ret = RRGetInfo(pScreen, FALSE);
-@@ -1008,7 +1008,7 @@ private:
- 			   down ? KeyPress : KeyRelease, keycode);
-     for (i = 0; i < n; i++) {
-       mieqEnqueue (vncKeyboardDevice,
--#ifdef XORG_15
-+#if XORG == 15
- 		   eventq + i
- #else
- 		   (eventq + i)->event
-@@ -1161,7 +1161,7 @@ void XserverDesktop::keyEvent(rdr::U32 keysym, bool down)
- 
- 	vlog.info("Added unknown keysym 0x%x to keycode %d",keysym,kc);
- 
--#ifdef XORG_15
-+#if XORG == 15
- 	master = inputInfo.keyboard;
- #else
- 	master = vncKeyboardDevice->u.master;
-@@ -1169,7 +1169,7 @@ void XserverDesktop::keyEvent(rdr::U32 keysym, bool down)
- 	if (vncKeyboardDevice ==
- 	    dixLookupPrivate(&master->devPrivates, CoreDevicePrivateKey)) {
- 	  dixSetPrivate(&master->devPrivates, CoreDevicePrivateKey, NULL);
--#ifdef XORG_15
-+#if XORG == 15
- 	  SwitchCoreKeyboard(vncKeyboardDevice);
- #else
- 	  CopyKeyClass(vncKeyboardDevice, master);
-@@ -1213,7 +1213,7 @@ void XserverDesktop::keyEvent(rdr::U32 keysym, bool down)
- 			 KeyPress : KeyRelease, kc);
-   for (i = 0; i < n; i++) {
-     mieqEnqueue (vncKeyboardDevice,
--#ifdef XORG_15
-+#if XORG == 15
- 		 eventq + i
- #else
- 		 (eventq + i)->event
-@@ -1492,7 +1492,7 @@ static int vfbMouseProc(DeviceIntPtr pDevice, int onoff)
-     map[4] = 4;
-     map[5] = 5;
-     InitPointerDeviceStruct(pDev, map, 5,
--#ifdef XORG_15
-+#if XORG == 15
- 			    GetMotionHistory,
- #endif
- 			    (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2);
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index 6777f09..b394d16 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -29,10 +29,10 @@
- #if XORG_VERSION_CURRENT < \
- 	((1 * 10000000) + (5 * 100000) + (99 * 1000))
- /* Xorg 1.5 branch */
--#define XORG_15
-+#define XORG 15
- #else
- /* Xorg 1.6 branch */
--#define XORG_16
-+#define XORG 16
- #endif
- 
- #include <rfb/SDesktop.h>
-diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
-index 010e955..700efbb 100644
---- a/unix/xserver/hw/vnc/vncHooks.cc
-+++ b/unix/xserver/hw/vnc/vncHooks.cc
-@@ -89,7 +89,7 @@ typedef struct {
-     GCOps *wrappedOps;
- } vncHooksGCRec, *vncHooksGCPtr;
- 
--#ifdef XORG_15
-+#if XORG == 15
- static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKey;
- static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey;
- #else
-@@ -119,7 +119,7 @@ static void vncHooksInstallColormap(ColormapPtr pColormap);
- static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
-                                 xColorItem* pdef);
- static Bool vncHooksDisplayCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 				  DeviceIntPtr pDev,
- #endif
- 				  ScreenPtr pScreen, CursorPtr cursor);
-@@ -454,7 +454,7 @@ static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
- // DisplayCursor - get the cursor shape
- 
- static Bool vncHooksDisplayCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 				  DeviceIntPtr pDev,
- #endif
- 				  ScreenPtr pScreen_, CursorPtr cursor)
-@@ -462,11 +462,11 @@ static Bool vncHooksDisplayCursor(
-   SCREEN_UNWRAP(pScreen_, DisplayCursor);
- 
-   Bool ret = (*pScreen->DisplayCursor) (
--#ifdef XORG_16
-+#if XORG >= 16
- 					pDev,
- #endif
- 					pScreen, cursor);
--#ifdef XORG_16
-+#if XORG >= 16
-   /*
-    * XXX DIX calls this function with NULL argument to remove cursor sprite from
-    * screen. Should we handle this in setCursor as well?
-@@ -474,7 +474,7 @@ static Bool vncHooksDisplayCursor(
-   if (cursor != NullCursor) {
- #endif
-     vncHooksScreen->desktop->setCursor(cursor);
--#ifdef XORG_16
-+#if XORG >= 16
-   }
- #endif
- 
-diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
-index 9fdcaf3..45820ee 100644
---- a/unix/xserver/hw/vnc/xvnc.cc
-+++ b/unix/xserver/hw/vnc/xvnc.cc
-@@ -736,7 +736,7 @@ vfbCrossScreen (ScreenPtr pScreen, Bool entering)
- }
- 
- static Bool vfbRealizeCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 			     DeviceIntPtr pDev,
- #endif
- 			     ScreenPtr pScreen, CursorPtr pCursor) {
-@@ -744,7 +744,7 @@ static Bool vfbRealizeCursor(
- }
- 
- static Bool vfbUnrealizeCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 			       DeviceIntPtr pDev,
- #endif
- 			       ScreenPtr pScreen, CursorPtr pCursor) {
-@@ -752,7 +752,7 @@ static Bool vfbUnrealizeCursor(
- }
- 
- static void vfbSetCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 			 DeviceIntPtr pDev,
- #endif
- 			 ScreenPtr pScreen, CursorPtr pCursor, int x, int y) 
-@@ -760,14 +760,14 @@ static void vfbSetCursor(
- }
- 
- static void vfbMoveCursor(
--#ifdef XORG_16
-+#if XORG >= 16
- 			  DeviceIntPtr pDev,
- #endif
- 			  ScreenPtr pScreen, int x, int y) 
- {
- }
- 
--#ifdef XORG_16
-+#if XORG >= 16
- static Bool
- vfbDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
- {   
-@@ -785,7 +785,7 @@ static miPointerSpriteFuncRec vfbPointerSpriteFuncs = {
-     vfbUnrealizeCursor,
-     vfbSetCursor,
-     vfbMoveCursor
--#ifdef XORG_16
-+#if XORG >= 16
-     , vfbDeviceCursorInitialize,
-     vfbDeviceCursorCleanup
- #endif
-@@ -1303,7 +1303,7 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
- void ProcessInputEvents()
- {
-   mieqProcessInputEvents();
--#ifdef XORG_15
-+#if XORG == 15
-   miPointerUpdate();
- #endif
- }
--- 
-1.5.6.5
-
-From d8dae372b65fea70a87698861eae24d1ac4b296b Mon Sep 17 00:00:00 2001
-From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>
-Date: Fri, 28 Aug 2009 12:02:20 +0000
-Subject: [PATCH] Move definition of XORG macro to separate header.
-
-git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@3884 3789f03b-4d11-0410-bbf8-ca57d06f2519
----
- unix/xserver/hw/vnc/Makefile.am       |    2 +-
- unix/xserver/hw/vnc/XserverDesktop.cc |    1 +
- unix/xserver/hw/vnc/XserverDesktop.h  |    9 ---------
- unix/xserver/hw/vnc/vncHooks.cc       |    1 +
- unix/xserver/hw/vnc/xorg-version.h    |   33 +++++++++++++++++++++++++++++++++
- unix/xserver/hw/vnc/xvnc.cc           |    1 +
- 6 files changed, 37 insertions(+), 10 deletions(-)
- create mode 100644 unix/xserver/hw/vnc/xorg-version.h
-
-diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
-index 957612a..a39a10d 100644
---- a/unix/xserver/hw/vnc/Makefile.am
-+++ b/unix/xserver/hw/vnc/Makefile.am
-@@ -9,7 +9,7 @@ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
- 
--HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h
-+HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h
- 
- libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc
- 
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index a36e769..d6fe993 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -41,6 +41,7 @@
- #include <rfb/Configuration.h>
- #include "XserverDesktop.h"
- #include "vncExtInit.h"
-+#include "xorg-version.h"
- 
- extern "C" {
- #define public c_public
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index b394d16..7729d3f 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -26,15 +26,6 @@
- #include <dix-config.h>
- #endif
- 
--#if XORG_VERSION_CURRENT < \
--	((1 * 10000000) + (5 * 100000) + (99 * 1000))
--/* Xorg 1.5 branch */
--#define XORG 15
--#else
--/* Xorg 1.6 branch */
--#define XORG 16
--#endif
--
- #include <rfb/SDesktop.h>
- #include <rfb/HTTPServer.h>
- #include <rfb/PixelBuffer.h>
-diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
-index 700efbb..23dc4ea 100644
---- a/unix/xserver/hw/vnc/vncHooks.cc
-+++ b/unix/xserver/hw/vnc/vncHooks.cc
-@@ -25,6 +25,7 @@
- #include "XserverDesktop.h"
- #include "vncHooks.h"
- #include "vncExtInit.h"
-+#include "xorg-version.h"
- 
- extern "C" {
- #define class c_class
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-new file mode 100644
-index 0000000..e7eeca0
---- /dev/null
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -0,0 +1,33 @@
-+/* Copyright (C) 2009 TightVNC Team
-+ * Copyright (C) 2009 Red Hat, Inc.
-+ *
-+ * This is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ * 
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this software; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
-+ * USA.
-+ */
-+
-+#ifndef XORG_VERSION_H
-+#define XORG_VERSION_H
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#if XORG_VERSION_CURRENT < ((1 * 10000000) + (5 * 100000) + (99 * 1000))
-+#define XORG 15
-+#else
-+#define XORG 16
-+#endif
-+
-+#endif
-diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
-index 45820ee..05066fc 100644
---- a/unix/xserver/hw/vnc/xvnc.cc
-+++ b/unix/xserver/hw/vnc/xvnc.cc
-@@ -37,6 +37,7 @@ from the X Consortium.
- #include <rfb/LogWriter.h>
- #include <network/TcpSocket.h>
- #include "vncExtInit.h"
-+#include "xorg-version.h"
- 
- extern "C" {
- #define class c_class
--- 
-1.5.6.5
-
--- a/open-src/xserver/xvnc/vnc-nohttpd.patch	Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xvnc/vnc-nohttpd.patch	Mon May 09 14:58:28 2011 -0700
@@ -10,7 +10,7 @@
  
  &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
 +              "-httpd",0,
- 	      "-help",0,"-h",0,"--help",0,"-fp",1);
+ 	      "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0);
  
  &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
 @@ -145,6 +146,12 @@ if ($opt{'-fp'}) {
--- a/pkg/manifests/developer-opensolaris-X.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Mon May 09 14:58:28 2011 -0700
@@ -129,6 +129,9 @@
 # libXfont & libfontenc link with libz
 depend fmri=pkg:/library/zlib type=require
 
+# Mesa 7.10.2 requires libxml2 python module
+depend fmri=pkg:/python-2/libxml2-26 type=require
+
 # Build runs a number of perl scripts
 depend fmri=pkg:/runtime/perl-510 type=require
 depend fmri=pkg:/runtime/perl-584 type=require
--- a/pkg/manifests/x11-header-x11-protocols.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/x11-header-x11-protocols.p5m	Mon May 09 14:58:28 2011 -0700
@@ -205,11 +205,13 @@
 file path=usr/share/doc/scrnsaverproto/saver.xml
 file path=usr/share/doc/videoproto/xv-protocol-v2.txt
 file path=usr/share/doc/xcmiscproto/xc-misc.xml
-file path=usr/share/doc/xextproto/appgroup.xml
+file path=usr/share/doc/xextproto/appendix.xml
+file path=usr/share/doc/xextproto/appgrp.xml
 file path=usr/share/doc/xextproto/dbe.xml
 file path=usr/share/doc/xextproto/dpms.xml
 file path=usr/share/doc/xextproto/evi.xml
 file path=usr/share/doc/xextproto/geproto.xml
+file path=usr/share/doc/xextproto/lbx.xml
 file path=usr/share/doc/xextproto/multibuf.xml
 file path=usr/share/doc/xextproto/security.xml
 file path=usr/share/doc/xextproto/shape.xml
--- a/pkg/manifests/x11-library-libxext.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/x11-library-libxext.p5m	Mon May 09 14:58:28 2011 -0700
@@ -68,6 +68,7 @@
 file path=usr/share/doc/libXext/dpmslib.xml
 file path=usr/share/doc/libXext/shapelib.xml
 file path=usr/share/doc/libXext/synclib.xml
+file path=usr/share/doc/libXext/xtest1.xml
 file path=usr/share/man/man3xext/DBE.3xext
 file path=usr/share/man/man3xext/DPMSCapable.3xext
 file path=usr/share/man/man3xext/DPMSDisable.3xext
--- a/pkg/manifests/x11-library-mesa.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m	Mon May 09 14:58:28 2011 -0700
@@ -62,7 +62,6 @@
 file path=usr/include/mesa/glxext.h
 file path=usr/include/mesa/internal/dri_interface.h
 file path=usr/include/mesa/mesa_wgl.h
-file path=usr/include/mesa/mglmesa.h
 file path=usr/include/mesa/osmesa.h
 file path=usr/include/mesa/vms_x_fix.h
 file path=usr/include/mesa/wglext.h
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video.p5m	Mon May 09 14:58:28 2011 -0700
@@ -33,9 +33,8 @@
 # Nvidia driver (from outside the X gate)
 $(i386_ONLY)depend fmri=pkg:/driver/graphics/nvidia type=require
 
-# Drivers from the SPARC Graphics gate
+# driver/efb
 $(sparc_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-efb type=require
-$(sparc_ONLY)depend fmri=pkg:/x11/server/xorg/driver/xorg-kfb type=require
 
 # driver/xf86-video-ast
 depend fmri=pkg:/x11/server/xorg/driver/xorg-video-ast type=require
--- a/pkg/manifests/x11-server-xorg.p5m	Mon May 09 10:12:33 2011 -0700
+++ b/pkg/manifests/x11-server-xorg.p5m	Mon May 09 14:58:28 2011 -0700
@@ -70,11 +70,9 @@
 file path=usr/include/xorg/IBM.h
 file path=usr/include/xorg/TI.h
 file path=usr/include/xorg/XIstubs.h
-file path=usr/include/xorg/bstore.h
-file path=usr/include/xorg/bstorestr.h
+file path=usr/include/xorg/Xprintf.h
 file path=usr/include/xorg/bt829.h
 file path=usr/include/xorg/callback.h
-file path=usr/include/xorg/cfb8_16.h
 file path=usr/include/xorg/closestr.h
 file path=usr/include/xorg/closure.h
 file path=usr/include/xorg/colormap.h
@@ -138,6 +136,8 @@
 file path=usr/include/xorg/miscstruct.h
 file path=usr/include/xorg/mispans.h
 file path=usr/include/xorg/mistruct.h
+file path=usr/include/xorg/misync.h
+file path=usr/include/xorg/misyncstr.h
 file path=usr/include/xorg/miwideline.h
 file path=usr/include/xorg/mizerarc.h
 file path=usr/include/xorg/msp3430.h
@@ -157,7 +157,6 @@
 file path=usr/include/xorg/region.h
 file path=usr/include/xorg/regionstr.h
 file path=usr/include/xorg/registry.h
-file path=usr/include/xorg/renderedge.h
 file path=usr/include/xorg/resource.h
 file path=usr/include/xorg/rgb.h
 file path=usr/include/xorg/rrtransform.h
@@ -175,6 +174,7 @@
     facet.devel=true
 file path=usr/include/xorg/swaprep.h
 file path=usr/include/xorg/swapreq.h
+file path=usr/include/xorg/syncsdk.h
 file path=usr/include/xorg/tda8425.h
 file path=usr/include/xorg/tda9850.h
 file path=usr/include/xorg/tda9885.h
@@ -188,7 +188,6 @@
 file path=usr/include/xorg/window.h
 file path=usr/include/xorg/windowstr.h
 file path=usr/include/xorg/xaa.h
-file path=usr/include/xorg/xaaWrapper.h
 file path=usr/include/xorg/xaalocal.h
 file path=usr/include/xorg/xaarop.h
 file path=usr/include/xorg/xace.h
@@ -251,7 +250,6 @@
 file path=usr/lib/xorg/modules/libvgahw.so
 file path=usr/lib/xorg/modules/libwfb.so
 file path=usr/lib/xorg/modules/libxaa.so
-file path=usr/lib/xorg/modules/libxf8_16bpp.so
 file path=usr/lib/xorg/modules/multimedia/bt829_drv.so
 file path=usr/lib/xorg/modules/multimedia/fi1236_drv.so
 file path=usr/lib/xorg/modules/multimedia/msp3430_drv.so
@@ -260,12 +258,14 @@
 file path=usr/lib/xorg/modules/multimedia/tda9885_drv.so
 file path=usr/lib/xorg/modules/multimedia/uda1380_drv.so
 file path=usr/share/aclocal/xorg-server.m4
+file path=usr/share/doc/X11/Xserver-DTrace.xml
 file path=usr/share/man/man1/Xorg.1
 file path=usr/share/man/man1/cvt.1
 file path=usr/share/man/man1/gtf.1
 file path=usr/share/man/man1/xorgcfg.1
 file path=usr/share/man/man1/xorgconfig.1
 file path=usr/share/man/man4/xorg.conf.4
+file path=usr/share/man/man4/xorg.conf.d.4
 file path=usr/share/man/man7/exa.7
 file path=usr/share/man/man7/fbdevhw.7
 legacy pkg=SUNWxorg-headers \