7174952 Update X.Org modules to X11R7.7 final release
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Thu, 14 Jun 2012 17:30:31 -0700
changeset 1301 371a43cad701
parent 1300 415644304d9f
child 1302 bdcf270fda09
7174952 Update X.Org modules to X11R7.7 final release
open-src/app/transset/Makefile
open-src/app/xinput/Makefile
open-src/common/Makefile.init
open-src/doc/xorg-docs/Makefile
open-src/doc/xorg-sgml-doctools/Makefile
open-src/driver/xf86-input-synaptics/7164323.patch
open-src/driver/xf86-input-synaptics/COPYING
open-src/driver/xf86-input-synaptics/Makefile
open-src/lib/libX11/Makefile
open-src/lib/libX11/compose-en_US.UTF-8.patch
open-src/lib/libX11/lc-gb18030.patch
open-src/lib/libX11/locale.paths.patch
open-src/lib/libX11/solaris-kbd.patch
open-src/lib/libXaw/Makefile
open-src/lib/libXft/Makefile
open-src/lib/libXft/upstream-bold-fonts.patch
open-src/lib/libXi/Makefile
open-src/xserver/xorg/COPYING
open-src/xserver/xorg/Makefile
open-src/xserver/xorg/mapfile-Xorg-externs.i386
open-src/xserver/xorg/mapfile-Xorg-externs.sparc
--- a/open-src/app/transset/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/app/transset/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# transset 1.x Makefile
+# transset utility for setting window transparency properties
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, 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"),
@@ -28,29 +28,16 @@
 # Package name used in tarballs
 MODULE_NAME=transset
 
-# Package metadata - set manually since we download from somewhere
-# other than the normal X.Org site
-UPSTREAM	= $(UPSTREAM_xorg)
-UPSTREAM_URL	= $(UPSTREAM_URL_xorg)
-UPSTREAM_SET	= yes
-
 # Version number (used in path names)
-MODULE_VERSION=0.9.1
+MODULE_VERSION=1.0.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = d289dd300124c9680e9eeae83947b0cf
-TARBALL_SHA1 = 6e59ffc4f7ccca4d88bf5ec1bb7700ad611720f9
-
-# Source tarball
-SOURCE_URL=http://dlc.sun.com/osol/x/downloads/mirrors/$(SOURCE_TARBALL_NAME)
-SOURCE_URL_SET=yes
+TARBALL_MD5   = 1aac8670c17803e30885eb5911f68d3d
+TARBALL_SHA1  = 583fc57eecbb4558127805093af8cc46ec677cdd
+TARBALL_SHA256= 19ee2525c4044743c49a95e43716bc3bd1dddf527e47585ee118e650b83a7e8f
 
 # Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=transset.1
+SUNTOUCHED_MANPAGES = man/transset.man
 MODULE_STABILITY=Volatile
 
-# The configure script in the tarball adds many unnecessary dependencies,
-# ignore them for now until we get a fixed tarball from upstream
-MODULE_LDFLAGS = -z ignore
-
 include ../Makefile.inc
--- a/open-src/app/xinput/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/app/xinput/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -29,12 +29,12 @@
 MODULE_NAME=xinput
 
 # Version number (used in path names)
-MODULE_VERSION=1.5.99.901
+MODULE_VERSION=1.6.0
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 3b57cb4cbac70eb0d7a553def7dd333e
-TARBALL_SHA1  = bc99cddeac306a23ad96f35d8ff3314d7e45d460
-TARBALL_SHA256= 4765ca49af591ad5fed1af6847a16b807317212d40d5d21e5f97aa834f3e815e
+TARBALL_MD5   = d2459d35b4e0b41ded26a1d1159b7ac6
+TARBALL_SHA1  = 958b77a2acf52197b9a1e3e3d11e9bc57fbb1e6c
+TARBALL_SHA256= 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 
 # pkg(5) name we deliver the files in (override default)
 MODULE_PKGNAME=x11/x11-server-utilities
--- a/open-src/common/Makefile.init	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/common/Makefile.init	Thu Jun 14 17:30:31 2012 -0700
@@ -389,7 +389,7 @@
 # referenced in multiple places, so it's kept here for easy sharing.
 # 
 # Current Xorg server source tarball to use sources from:
-XORGSERVER_VERS=1.12.1
+XORGSERVER_VERS=1.12.2
 # Minimum Xorg server version that we expect to be ABI compatible with.
 # Usually .99 of the previous minor release series, as that's the convention
 # for the development snapshots of the next release series.
--- a/open-src/doc/xorg-docs/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/doc/xorg-docs/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -27,12 +27,12 @@
 MODULE_NAME=xorg-docs
 
 # Version number (used in path names)
-MODULE_VERSION=1.6.99.901
+MODULE_VERSION=1.7
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 4bf32718bf6bc8377f8fda43190398be
-TARBALL_SHA1  = a011c5a5190e530efe98c373691fa96cb53b3edd
-TARBALL_SHA256= 6b906cba725df441e1350e2530db7f15b95c5087a655e67bb096cca0be991338
+TARBALL_MD5   = f9405a1692671d843725b90166370e00
+TARBALL_SHA1  = 565df5219a9d72d81a84f7e75294752ba2ea0cc8
+TARBALL_SHA256= b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES += solaris-manpages.patch,-p1
--- a/open-src/doc/xorg-sgml-doctools/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/doc/xorg-sgml-doctools/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -31,12 +31,12 @@
 MODULE_PKGTAIL_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION=1.10.99.901
+MODULE_VERSION=1.11
 
 # Checksums for upstream tarball
-TARBALL_MD5   = d96d4a2cac9265d6f3638232431c75c9
-TARBALL_SHA1  = 4269ab3d0cf49a2a80503e30bb6224e0657147fe
-TARBALL_SHA256= 57666a83f1c08358bb801b17902b5ca48e85a33f733fefc1b32a99583ef19604
+TARBALL_MD5   = ee6dc0a8a693a908857af328b2462661
+TARBALL_SHA1  = 56acde359072d7ffc6627ffde5e2c698eb415ddc
+TARBALL_SHA256= e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
--- a/open-src/driver/xf86-input-synaptics/7164323.patch	Mon Jun 04 14:48:55 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- configure.ac	Wed Apr 25 12:08:23 2012
-+++ configure.ac	Wed Apr 25 12:32:52 2012
-@@ -115,6 +115,10 @@
- 	BUILD_PS2COMM="yes"
- 	BUILD_PSMCOMM="yes"
- 	;;
-+*solaris*)
-+        AC_MSG_RESULT([ps2comm alpscomm])
-+        BUILD_PS2COMM="yes"
-+	;;
- *)
- 	AC_MSG_RESULT([none])
- 	;;
--- a/open-src/driver/xf86-input-synaptics/COPYING	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/driver/xf86-input-synaptics/COPYING	Thu Jun 14 17:30:31 2012 -0700
@@ -1,140 +1,23 @@
-src/psmcomm.c:
-
  Copyright © 1997 C. Scott Ananian
  Copyright © 1998-2000 Bruce Kalk
+ Copyright © 1999 Henry Davies
  Copyright © 2001 Stefan Gmeiner
+ Copyright © 2002 S. Lehner
  Copyright © 2002 Linuxcare Inc. David Kennedy
+ Copyright © 2002-2007 Peter Osterlund
  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.
+ Copyright © 2003 Hartwig Felger
+ Copyright © 2003 Jörg Bösner
+ Copyright © 2004 Alexei Gilchrist
+ Copyright © 2004 Arne Schwabe
+ 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, 2011 Red Hat, Inc.
+ Copyright © 2011 The Chromium OS Authors
 
  Permission to use, copy, modify, distribute, and sell this software
  and its documentation for any purpose is hereby granted without
@@ -155,170 +38,27 @@
  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.
+ Trademarks are the property of their respective owners.
 
 --------------------------------------------------------------------
 
-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.
+ Copyright © 2012 Canonical, Ltd.
 
- 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:
+ 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:
 
- 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 above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
 
- 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.
-
+ 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.
--- a/open-src/driver/xf86-input-synaptics/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/driver/xf86-input-synaptics/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -29,15 +29,15 @@
 MODULE_NAME=xf86-input-synaptics
 
 # Version number (used in path names)
-MODULE_VERSION=1.5.99.903
+MODULE_VERSION=1.6.2
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 56f125403497c55e0c88130b90c1c7b2
-TARBALL_SHA1  = adb8e28a8aced2ff660a4058d35b8656ffdf46ce
-TARBALL_SHA256= d76f631e8e851ab631f9fde4ec2585be6702c5a28e2a951c9ad9545baf0fb0e2
+TARBALL_MD5   = 9914022a173e3f0ccfe7137ab84f6133
+TARBALL_SHA1  = 6e59871c0cb683a1fa84731db73a662727a76976
+TARBALL_SHA256= c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= 7164323.patch libraries.patch,-p1
+SOURCE_PATCHES= libraries.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/lib/libX11/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libX11/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -27,12 +27,12 @@
 MODULE_NAME=libX11
 
 # Version number (used in path names)
-MODULE_VERSION = 1.4.99.901
+MODULE_VERSION = 1.5.0
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 520376557363da2df412beec9b4be749
-TARBALL_SHA1  = af10b064c1c64ee9e7daae0a7f1f9719eb7e965a
-TARBALL_SHA256= bf238569e07e459651265735e093103322478e4d07265ad9eb55aba4d9db26db
+TARBALL_MD5   = 78b4b3bab4acbdf0abcfca30a8c70cc6
+TARBALL_SHA1  = 8177535c9c59d8c3ab98d55ce53520b5737ccd1a
+TARBALL_SHA256= c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
--- a/open-src/lib/libX11/compose-en_US.UTF-8.patch	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libX11/compose-en_US.UTF-8.patch	Thu Jun 14 17:30:31 2012 -0700
@@ -22,7 +22,7 @@
 #
 
 diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
-index 2eae912..3c73a1f 100644
+index bf6599a..2ef3b95 100644
 --- a/nls/en_US.UTF-8/Compose.pre
 +++ b/nls/en_US.UTF-8/Compose.pre
 @@ -1,7 +1,70 @@
@@ -97,7 +97,7 @@
  XCOMM Part 1 - Manual definitions
  
  XCOMM Spacing versions of dead accents
-@@ -863,7 +926,8 @@ XCOMM Part 3
+@@ -845,7 +908,8 @@ XCOMM Part 3
  <Multi_key> <period> <c>         	: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
  <Multi_key> <c> <period> 		: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
  <dead_caron> <C>                 	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
@@ -107,10 +107,10 @@
  <Multi_key> <less> <C> 			: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
  <Multi_key> <C> <less> 			: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
  <dead_caron> <c>                 	: "č"   U010D # LATIN SMALL LETTER C WITH CARON
-@@ -5830,3 +5894,2320 @@ XCOMM
- <Multi_key> <asciicircum> <Cyrillic_ER>		: "Р̂"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
- 
- <Multi_key> <backslash> <o> <slash>		: "🙌"		# PERSON RAISING BOTH HANDS IN CELEBRATION
+@@ -5987,3 +6051,2320 @@ XCOMM Given that no extant APLs use ⍮ I will just leave the line in place.
+ <Multi_key> <underscore> <U2373>                : "⍸"   U2378   # _ ⍳ APL FUNCTIONAL SYMBOL IOTA UNDERBAR
+ <Multi_key> <U2375> <underscore>                : "⍹"   U2379   # ⍵ _ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR
+ <Multi_key> <underscore> <U2375>                : "⍹"   U2379   # _ ⍵ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR
 +
 +XCOMM ---- Solaris added key sequences
 +
--- a/open-src/lib/libX11/lc-gb18030.patch	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libX11/lc-gb18030.patch	Thu Jun 14 17:30:31 2012 -0700
@@ -22,10 +22,10 @@
 #
 
 diff --git a/configure.ac b/configure.ac
-index 64c9f60..c2f2376 100644
+index 2371d24..a2e2bc9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -442,6 +442,7 @@ AC_CONFIG_FILES([Makefile
+@@ -460,6 +460,7 @@ AC_CONFIG_FILES([Makefile
  		modules/im/ximcp/Makefile
  		modules/lc/Makefile
  		modules/lc/def/Makefile
--- a/open-src/lib/libX11/locale.paths.patch	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libX11/locale.paths.patch	Thu Jun 14 17:30:31 2012 -0700
@@ -1,10 +1,10 @@
 Allow passing multi-directory paths to configure search for locale files
 
 diff --git a/configure.ac b/configure.ac
-index 5f82e47..b1ee4f6 100644
+index a2e2bc9..6f2e43a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -414,11 +414,16 @@ AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRING([--with-locale-lib-dir=DIR],
+@@ -418,11 +418,16 @@ AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRING([--with-locale-lib-dir=DIR],
   [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
  				[ X11_LOCALELIBDIR="$withval" ],
  				[ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])
--- a/open-src/lib/libX11/solaris-kbd.patch	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libX11/solaris-kbd.patch	Thu Jun 14 17:30:31 2012 -0700
@@ -572,10 +572,10 @@
 +}
 +#endif /* SUNSOFT_KBD */
 diff --git a/src/imConv.c b/src/imConv.c
-index e212049..35e58a3 100644
+index c3c1974..40f5328 100644
 --- a/src/imConv.c
 +++ b/src/imConv.c
-@@ -214,7 +214,9 @@ _XimLookupMBText(
+@@ -213,7 +213,9 @@ _XimLookupMBText(
  			    args, 1 ) != 0) {
  		count = 0;
  	    } else {
@@ -586,7 +586,7 @@
  	    }
  	}
      }
-@@ -284,7 +286,9 @@ _XimLookupWCText(
+@@ -283,7 +285,9 @@ _XimLookupWCText(
  			    args, 1 ) != 0) {
  		count = 0;
  	    } else {
@@ -597,7 +597,7 @@
  	    }
  	}
      } else
-@@ -345,7 +349,9 @@ _XimLookupUTF8Text(
+@@ -344,7 +348,9 @@ _XimLookupUTF8Text(
                          NULL, 0) != 0) {
  	    count = 0;
  	} else {
--- a/open-src/lib/libXaw/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libXaw/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -29,12 +29,12 @@
 MODULE_NAME=libXaw
 
 # Version number (used in path names)
-MODULE_VERSION=1.0.10
+MODULE_VERSION=1.0.11
 
 # Checksums for upstream tarball
-TARBALL_MD5   = f1ea52debce7a18cc26b21647a00ad8b
-TARBALL_SHA1  = 8caa4c692e28f9681678a22168978b7668df57be
-TARBALL_SHA256= 2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd
+TARBALL_MD5   = f39942f2cab379fc9b4c3731bf191b84
+TARBALL_SHA1  = a27556b14e2b4c250afcb98b6e99eebd7623816f
+TARBALL_SHA256= 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=
--- a/open-src/lib/libXft/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libXft/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -29,15 +29,15 @@
 MODULE_NAME=libXft
 
 # Version number (used in path names)
-MODULE_VERSION=2.3.0
+MODULE_VERSION=2.3.1
 
 # Checksums for upstream tarball
-TARBALL_MD5   = bd0a8d8cace1dfbb963250bf3eb9a19a
-TARBALL_SHA1  = 687f38a810b9ae58e1169c295d9d438370235e23
-TARBALL_SHA256= 3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
+TARBALL_MD5   = 78d64dece560c9e8699199f3faa521c0
+TARBALL_SHA1  = c7ec1361e3d4f095910f8c58988ab42e32f314d9
+TARBALL_SHA256= 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = upstream-bold-fonts.patch,-p1
+SOURCE_PATCHES = 
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=Xft
--- a/open-src/lib/libXft/upstream-bold-fonts.patch	Mon Jun 04 14:48:55 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <[email protected]>
-Date: Sun, 11 Mar 2012 02:41:55 +0100
-Subject: [PATCH:libXft 1/2] Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <[email protected]>
----
- src/xftglyphs.c |    4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
- 
- /*
-  * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
- 
- 	glyphslot = face->glyph;
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- 	/*
- 	 * Embolden if required
- 	 */
- 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
- 
- 	/*
- 	 * Compute glyph metrics from FreeType information
--- 
-1.7.9.2
-
--- a/open-src/lib/libXi/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/lib/libXi/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -29,12 +29,12 @@
 MODULE_NAME=libXi
 
 # Version number (used in path names)
-MODULE_VERSION=1.6.0
+MODULE_VERSION=1.6.1
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 2e7f84711035e672c34549eac5660a0f
-TARBALL_SHA1  = b7edf48f93e8abd13ca688fa7f597452c4b74346
-TARBALL_SHA256= b2fc65a24a269405c5bbe27152e97ed4c5987ca728b9d7e7576e4c9543c4a7af
+TARBALL_MD5   = 78ee882e1ff3b192cf54070bdb19938e
+TARBALL_SHA1  = 4b53b41fdaa3acc86606c696c68d5eed11454612
+TARBALL_SHA256= f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = solaris-abi.patch,-p1
--- a/open-src/xserver/xorg/COPYING	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/xserver/xorg/COPYING	Thu Jun 14 17:30:31 2012 -0700
@@ -1,12 +1,3 @@
-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.
@@ -118,7 +109,7 @@
 
 --------------------------------------------------------------------
 
-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:
+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/scanner.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.
 
@@ -225,33 +216,6 @@
 
 --------------------------------------------------------------------
 
-dix/getevents.c:
-
-Copyright © 2006 Nokia Corporation
-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
@@ -301,6 +265,31 @@
 
 --------------------------------------------------------------------
 
+include/client.h:
+
+Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 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
+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/strlcat.c, os/strlcpy.c:
 
 Copyright (c) 1998 Todd C. Miller <[email protected]>
@@ -319,6 +308,37 @@
 
 --------------------------------------------------------------------
 
+os/strndup.c:
+
+Copyright (c) 1988, 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.
+
+--------------------------------------------------------------------
+
 hw/dmx/input/lnx-ms.c:
 
 Portions of this file were derived from the following files:
@@ -427,7 +447,7 @@
 
 --------------------------------------------------------------------
 
-xkb/maprules.c:
+include/xkbrules.h, xkb/maprules.c:
 
 Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
 
@@ -533,6 +553,37 @@
 
 --------------------------------------------------------------------
 
+hw/xfree86/common/xf86Optionstr.h, test/fixes.c, test/list.c, test/misc.c, test/touch.c, test/xfree86.c, test/xi2/protocol-xipassivegrabdevice.c, test/xi2/xi2.c:
+
+Copyright © 2011 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/shadowfb/shadow.c:
+
+Copyright (C) 1999.  The XFree86 Project Inc.
+
+--------------------------------------------------------------------
+
 glx/glxdri.c:
 
 Copyright © 2006 Red Hat, Inc
@@ -583,7 +634,7 @@
 
 --------------------------------------------------------------------
 
-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:
+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-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.
 
@@ -608,7 +659,7 @@
 
 --------------------------------------------------------------------
 
-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:
+Xext/shape.c, Xext/shm.c, include/validate.h, mi/midispcur.c, 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
 
@@ -924,7 +975,7 @@
 
 --------------------------------------------------------------------
 
-hw/dmx/dmx-config.h, hw/xnest/xnest-config.h:
+hw/dmx/dmx-config.h:
 
 Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
 
@@ -1254,6 +1305,31 @@
 
 --------------------------------------------------------------------
 
+randr/rrcrtc.c:
+
+Copyright © 2006 Keith Packard
+Copyright 2010 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/kdrive/src/kxv.c, hw/kdrive/src/kxv.h:
 
 Copyright (C) 2000, 2001 - Nokia Home Communications
@@ -1461,35 +1537,6 @@
 
 --------------------------------------------------------------------
 
-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
@@ -1557,6 +1604,12 @@
 
 --------------------------------------------------------------------
 
+hw/xfree86/os-support/linux/int10/linux.c:
+
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2008 Egbert Eich
+
+--------------------------------------------------------------------
+
 randr/rrtransform.c, randr/rrtransform.h, render/matrix.c:
 
 Copyright © 2007 Keith Packard
@@ -1581,54 +1634,6 @@
 
 --------------------------------------------------------------------
 
-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.
@@ -1983,6 +1988,31 @@
 
 --------------------------------------------------------------------
 
+os/osaudit.c:
+
+Copyright (c) 2011, 2012, 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/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.
@@ -2065,6 +2095,31 @@
 
 --------------------------------------------------------------------
 
+include/ptrveloc.h:
+
+Copyright © 2006-2011 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.
+
+--------------------------------------------------------------------
+
 dix/inpututils.c:
 
 Copyright © 2008 Daniel Stone
@@ -2090,7 +2145,7 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/common/xf86Configure.c, hw/xfree86/common/xf86ShowOpts.c:
+hw/xfree86/common/xf86Configure.c:
 
 Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
 
@@ -2380,7 +2435,7 @@
 
 --------------------------------------------------------------------
 
-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:
+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/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/sendexev.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
 
@@ -2477,7 +2532,7 @@
 
 --------------------------------------------------------------------
 
-tsol/tsol.h, tsol/tsolextension.c, tsol/tsolinfo.h, tsol/tsolpolicy.c, tsol/tsolprotocol.c, tsol/tsolutils.c:
+tsol/tsol.h, tsol/tsolinfo.h, tsol/tsolpolicy.c, tsol/tsolprotocol.c, tsol/tsolutils.c:
 
 Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 
@@ -2555,30 +2610,6 @@
 
 --------------------------------------------------------------------
 
-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
@@ -2660,34 +2691,6 @@
 
 --------------------------------------------------------------------
 
-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
-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/ddc/edid.h, hw/xfree86/ddc/xf86DDC.h:
 
 Copyright 1998 by Egbert Eich <[email protected]>
@@ -2745,40 +2748,6 @@
 
 --------------------------------------------------------------------
 
-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.
@@ -2828,6 +2797,76 @@
 
 --------------------------------------------------------------------
 
+test/xi2/protocol-eventconvert.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.
+
+--------------------------------------------------------------------
+
+xfixes/cursor.c, xfixes/xfixes.c, xfixes/xfixesint.h:
+
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+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.
+
+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.
+
+--------------------------------------------------------------------
+
 mi/mieq.c:
 
 Copyright 1990, 1998  The Open Group
@@ -2854,35 +2893,6 @@
 
 --------------------------------------------------------------------
 
-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
@@ -3150,27 +3160,28 @@
 
 --------------------------------------------------------------------
 
-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,
+hw/xfree86/modes/xf86Cursors.c:
+
+Copyright © 2007 Keith Packard
+Copyright © 2010-2011 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 PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+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.
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
 
 --------------------------------------------------------------------
 
@@ -3276,6 +3287,17 @@
 
 --------------------------------------------------------------------
 
+include/privates.h, include/registry.h:
+
+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.
+
+--------------------------------------------------------------------
+
 hw/xfree86/common/xf86InPriv.h:
 
 Copyright (c) 1999 by The XFree86 Project, Inc.
@@ -3381,6 +3403,31 @@
 
 --------------------------------------------------------------------
 
+config/wscons.c:
+
+Copyright (c) 2011 Matthieu Herrb
+
+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/security.c:
 
 Copyright 1996, 1998  The Open Group
@@ -3493,52 +3540,10 @@
 
 --------------------------------------------------------------------
 
-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/os-support/linux/lnx_agp.c:
+
+Copyright © 2000 VA Linux Systems, Inc.
+Copyright © 2001 The XFree86 Project, Inc.
 
 --------------------------------------------------------------------
 
@@ -3682,68 +3687,33 @@
 
 --------------------------------------------------------------------
 
-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"),
-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:
+os/client.c:
+
+Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All
+rights reserved.
+Copyright (c) 1993, 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 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/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:
+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/fbtrap.c:
 
 Copyright © 2004 Keith Packard
 
@@ -3967,7 +3937,7 @@
 
 --------------------------------------------------------------------
 
-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:
+hw/xfree86/modes/xf86DiDGA.c, hw/xfree86/modes/xf86RandR12.h, hw/xfree86/modes/xf86Rename.h, 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
 
@@ -4048,51 +4018,61 @@
 
 --------------------------------------------------------------------
 
-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
+glx/glapi_gentable.c:
+
+Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+(C) Copyright IBM Corporation 2004, 2005
+(C) Copyright Apple Inc 2011
+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.
 
-Request to send an extension event.
+--------------------------------------------------------------------
+
+hw/dmx/glxProxy/compsize.h, hw/dmx/glxProxy/glxcmds.h:
+
+Copyright 2011 Apple 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.
 
 --------------------------------------------------------------------
 
@@ -4339,34 +4319,6 @@
 
 --------------------------------------------------------------------
 
-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.
@@ -4607,6 +4559,31 @@
 
 --------------------------------------------------------------------
 
+hw/xfree86/modes/xf86Crtc.h, hw/xfree86/modes/xf86Rotate.c:
+
+Copyright © 2006 Keith Packard
+Copyright © 2011 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/dmx/config/Canvas.c:
 
 Copyright 1987, 1998  The Open Group
@@ -4658,6 +4635,31 @@
 
 --------------------------------------------------------------------
 
+os/solaris/mdb/modules/Xserver_device_grabs.c:
+
+Copyright (c) 2006, 2012, 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.
+
+--------------------------------------------------------------------
+
 tsol/tsolextension.h:
 
 Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -4861,11 +4863,28 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/xaa/xaaOverlayDF.c:
-
-Copyright (c) 1999 - The XFree86 Project Inc.
-
-Written by Mark Vojkovich
+test/ddxstubs.c:
+
+Copyright © 2012 Apple 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.
 
 --------------------------------------------------------------------
 
@@ -4897,31 +4916,6 @@
 
 --------------------------------------------------------------------
 
-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.
@@ -5277,6 +5271,61 @@
 
 --------------------------------------------------------------------
 
+miext/rootless/rootlessWindow.c:
+
+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.
+
+--------------------------------------------------------------------
+
+os/solaris/mdb/modules/Xserver_mdb.h, os/solaris/mdb/modules/mdb_module.c:
+
+Copyright (c) 2010, 2012, 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_VTsw.c:
 
 Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
@@ -5554,47 +5603,28 @@
 
 --------------------------------------------------------------------
 
-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
-
-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.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
---------------------------------------------------------------------
-
-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.
+test/string.c:
+
+Copyright (c) 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.
 
 --------------------------------------------------------------------
 
@@ -5858,7 +5888,7 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/os-support/shared/bios_devmem.c, hw/xfree86/os-support/shared/bios_mmap.c:
+hw/xfree86/os-support/shared/bios_mmap.c:
 
 Copyright 1993 by David Wexelblat <[email protected]>
 
@@ -6150,6 +6180,102 @@
 
 --------------------------------------------------------------------
 
+dix/getevents.c:
+
+Copyright © 2006 Nokia Corporation
+Copyright © 2006-2007 Daniel Stone
+Copyright © 2008 Red Hat, Inc.
+Copyright © 2011 The Chromium Authors
+
+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/exevents.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.
+
+Copyright © 2010 Collabora Ltd.
+Copyright © 2011 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/xisb.c, hw/xfree86/common/xisb.h:
 
 Copyright (c) 1997  Metro Link Incorporated
@@ -6178,7 +6304,7 @@
 
 --------------------------------------------------------------------
 
-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:
+exa/exa_unaccel.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
 
@@ -6398,51 +6524,6 @@
 
 --------------------------------------------------------------------
 
-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.
@@ -6470,38 +6551,6 @@
 
 --------------------------------------------------------------------
 
-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
@@ -7014,7 +7063,7 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/vbe/vbeModes.h:
+hw/xfree86/vbe/vbeModes.c, hw/xfree86/vbe/vbeModes.h:
 
 Copyright © 2002 David Dawes
 
@@ -7091,7 +7140,7 @@
 
 --------------------------------------------------------------------
 
-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:
+glx/glxcmds.c, glx/glxcmdsswap.c, glx/glxcontext.h, glx/glxdrawable.h, glx/glxext.c, glx/glxext.h, glx/glxscreens.c, glx/glxscreens.h, glx/glxserver.h, glx/glxutil.h, 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/singlesize.h, glx/unpack.h, 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_disptab.h, hw/dmx/glxProxy/g_renderswap.c, hw/dmx/glxProxy/global.c, hw/dmx/glxProxy/glxcmds.c, hw/dmx/glxProxy/glxcmdsswap.c, hw/dmx/glxProxy/glxcontext.h, hw/dmx/glxProxy/glxdrawable.h, hw/dmx/glxProxy/glxerror.h, hw/dmx/glxProxy/glxext.c, hw/dmx/glxProxy/glxext.h, hw/dmx/glxProxy/glxfbconfig.c, hw/dmx/glxProxy/glxfbconfig.h, hw/dmx/glxProxy/glxscreens.c, hw/dmx/glxProxy/glxscreens.h, hw/dmx/glxProxy/glxserver.h, hw/dmx/glxProxy/glxsingle.c, hw/dmx/glxProxy/glxsingle.h, hw/dmx/glxProxy/glxutil.c, hw/dmx/glxProxy/glxutil.h, 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, hw/dmx/glxProxy/unpack.h:
 
 SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
 Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -7179,6 +7228,111 @@
 
 --------------------------------------------------------------------
 
+hw/dmx/input/lnx-keyboard.c:
+
+Portions of this file were derived from the following files:
+
+xfree86/common/{xf86Io.c,xf86Kbd.c,xf86Events.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.
+
+xfree86/common/xf86KbdLnx.c
+
+Linux version of keymapping setup. The kernel (since 0.99.14) has support
+for fully remapping the keyboard, but there are some differences between
+the Linux map and the SVR4 map (esp. in the extended keycodes). We also
+remove the restriction on what keycodes can be remapped.
+Orest Zborowski.
+
+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.
+
+xfree86/os-support/linux/lnx_io.c
+
+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 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.
+
+--------------------------------------------------------------------
+
 glx/glxdriswrast.c:
 
 Copyright © 2008 George Sapountzis <[email protected]>
@@ -7207,6 +7361,31 @@
 
 --------------------------------------------------------------------
 
+glx/clientinfo.c, glx/createcontext.c:
+
+Copyright © 2011 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/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.
@@ -7549,16 +7728,6 @@
 
 --------------------------------------------------------------------
 
-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
@@ -7609,6 +7778,36 @@
 
 --------------------------------------------------------------------
 
+hw/xfree86/os-support/bsd/bsd_kqueue_apm.c:
+
+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/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
@@ -7712,38 +7911,6 @@
 
 --------------------------------------------------------------------
 
-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]>
@@ -7772,6 +7939,33 @@
 
 --------------------------------------------------------------------
 
+hw/xfree86/common/xf86VGAarbiter.c:
+
+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.
+
+--------------------------------------------------------------------
+
 glx/swap_interval.c:
 
 (C) Copyright IBM Corporation 2006
@@ -7944,39 +8138,10 @@
 
 --------------------------------------------------------------------
 
-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
@@ -8030,6 +8195,17 @@
 
 --------------------------------------------------------------------
 
+include/dixaccess.h:
+
+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.
+
+--------------------------------------------------------------------
+
 config/config-backends.h, config/config.c, config/dbus-core.c, config/dbus.c, include/hotplug.h:
 
 Copyright © 2006-2007 Daniel Stone
@@ -8075,7 +8251,7 @@
 
 --------------------------------------------------------------------
 
-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:
+dix/atom.c, dix/colormap.c, dix/cursor.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
 
@@ -8173,6 +8349,14 @@
 
 --------------------------------------------------------------------
 
+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.
+
+--------------------------------------------------------------------
+
 hw/dmx/config/Canvas.h, hw/dmx/config/CanvasP.h:
 
 Copyright 1987, 1998  The Open Group
@@ -8200,9 +8384,9 @@
 
 --------------------------------------------------------------------
 
-dix/ptrveloc.c, include/ptrveloc.h:
-
-Copyright © 2006-2011 Simon Thum             simon dot thum at gmx dot de
+dix/ptrveloc.c:
+
+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"),
@@ -8225,7 +8409,7 @@
 
 --------------------------------------------------------------------
 
-fb/fbcmap_mi.c:
+fb/fbcmap_mi.c, mi/micmap.c:
 
 Copyright (c) 1987, Oracle and/or its affiliates. All rights reserved.
 
@@ -8250,6 +8434,31 @@
 
 --------------------------------------------------------------------
 
+IA/interactive.c:
+
+Copyright (c) 1993, 2012, 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.
@@ -8447,7 +8656,7 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/common/xf86Opt.h, hw/xfree86/common/xf86Option.c, hw/xfree86/common/xf86xv.h:
+hw/xfree86/common/xf86Opt.h, hw/xfree86/common/xf86Option.c, hw/xfree86/common/xf86xv.c, hw/xfree86/common/xf86xv.h:
 
 Copyright (c) 1998-2003 by The XFree86 Project, Inc.
 
@@ -8501,7 +8710,29 @@
 
 --------------------------------------------------------------------
 
-"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:
+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.
 
 --------------------------------------------------------------------
 
@@ -8600,7 +8831,7 @@
 
 --------------------------------------------------------------------
 
-miext/rootless/rootlessGC.c, miext/rootless/rootlessScreen.c:
+miext/rootless/rootlessCommon.c, 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.
@@ -8683,7 +8914,6 @@
 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)
 
 --------------------------------------------------------------------
@@ -8943,7 +9173,6 @@
 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:
@@ -9028,6 +9257,65 @@
 
 --------------------------------------------------------------------
 
+hw/dmx/input/usb-keyboard.c:
+
+Portions of this file were derived from the following files:
+
+xfree86/common/xf86KbdLnx.c
+
+Linux version of keymapping setup. The kernel (since 0.99.14) has support
+for fully remapping the keyboard, but there are some differences between
+the Linux map and the SVR4 map (esp. in the extended keycodes). We also
+remove the restriction on what keycodes can be remapped.
+Orest Zborowski.
+
+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/dixmods/extmod/xf86vmode.c:
 
 Copyright 1995  Kaleb S. KEITHLEY
@@ -9058,11 +9346,28 @@
 
 --------------------------------------------------------------------
 
-hw/xfree86/shadowfb/shadow.c:
-
-Copyright (C) 1999.  The XFree86 Project Inc.
-
-Written by Mark Vojkovich ([email protected])
+os/solaris/mdb/modules/Xserver_clients.c, tsol/tsolextension.c:
+
+Copyright (c) 2004, 2012, 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.
 
 --------------------------------------------------------------------
 
@@ -9095,7 +9400,13 @@
 
 --------------------------------------------------------------------
 
-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:
+hw/xfree86/xaa/xaaOverlayDF.c:
+
+Copyright (c) 1999 - The XFree86 Project Inc.
+
+--------------------------------------------------------------------
+
+IA/interactive_srv.h, include/Xprintf.h:
 
 Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
@@ -9149,31 +9460,6 @@
 
 --------------------------------------------------------------------
 
-IA/interactive.c:
-
-Copyright (c) 1993, 2012, 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.
@@ -9272,6 +9558,32 @@
 
 --------------------------------------------------------------------
 
+dix/touch.c:
+
+Copyright © 2011 Collabra Ltd.
+Copyright © 2011 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/os-support/linux/lnx_init.c, hw/xfree86/os-support/linux/lnx_video.c:
 
 Copyright 1992 by Orest Zborowski <[email protected]>
@@ -9352,80 +9664,3 @@
 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-2007 Daniel Stone
-Copyright © 2008 Red Hat, Inc.
-Copyright © 2011 The Chromium Authors
-
-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/touch.c
-
-Copyright © 2011 Collabra Ltd.
-Copyright © 2011 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/osaudit.c
-
-Copyright (c) 2011, 2012, 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.
--- a/open-src/xserver/xorg/Makefile	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/xserver/xorg/Makefile	Thu Jun 14 17:30:31 2012 -0700
@@ -32,9 +32,9 @@
 MODULE_VERSION=$(XORGSERVER_VERS)
 
 # Checksums for upstream tarball
-TARBALL_MD5   = 20e73b422bda6f0d1405af676983cc70
-TARBALL_SHA1  = 922b963901f4711449b53fb32ce3e14f5b642766
-TARBALL_SHA256= d21dc1dac767975cf9872984c78dd0bff928a74420fbcb415267c6bdbd41b45a
+TARBALL_MD5   = 791f0323b886abb7954de7f042bb7dc6
+TARBALL_SHA1  = 2edb151d39571dc0fcdedc299ea0a77fe6bfc076
+TARBALL_SHA256= ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
 
 # Patches to apply to source after unpacking, in order
 # *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds
--- a/open-src/xserver/xorg/mapfile-Xorg-externs.i386	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/xserver/xorg/mapfile-Xorg-externs.i386	Thu Jun 14 17:30:31 2012 -0700
@@ -1151,6 +1151,7 @@
 		XkmReadFile                              { FLAGS = EXTERN };
 		Xprintf                                  { FLAGS = EXTERN };
 		Xrealloc                                 { FLAGS = EXTERN };
+		Xscnprintf                               { FLAGS = EXTERN };
 		Xstrdup                                  { FLAGS = EXTERN };
 		XvGetRTPortProc                          { FLAGS = EXTERN };
 		XvGetScreenKeyProc                       { FLAGS = EXTERN };
@@ -1158,6 +1159,7 @@
 		XvScreenInitProc                         { FLAGS = EXTERN };
 		Xvasprintf                               { FLAGS = EXTERN };
 		Xvprintf                                 { FLAGS = EXTERN };
+		Xvscnprintf                              { FLAGS = EXTERN };
 		_CallCallbacks                           { FLAGS = EXTERN };
 		_XkbKSCheckCase                          { FLAGS = EXTERN };
 		_XkbLookupAnyDevice                      { FLAGS = EXTERN };
--- a/open-src/xserver/xorg/mapfile-Xorg-externs.sparc	Mon Jun 04 14:48:55 2012 -0700
+++ b/open-src/xserver/xorg/mapfile-Xorg-externs.sparc	Thu Jun 14 17:30:31 2012 -0700
@@ -1151,6 +1151,7 @@
 		XkmReadFile                              { FLAGS = EXTERN };
 		Xprintf                                  { FLAGS = EXTERN };
 		Xrealloc                                 { FLAGS = EXTERN };
+		Xscnprintf                               { FLAGS = EXTERN };
 		Xstrdup                                  { FLAGS = EXTERN };
 		XvGetRTPortProc                          { FLAGS = EXTERN };
 		XvGetScreenKeyProc                       { FLAGS = EXTERN };
@@ -1158,6 +1159,7 @@
 		XvScreenInitProc                         { FLAGS = EXTERN };
 		Xvasprintf                               { FLAGS = EXTERN };
 		Xvprintf                                 { FLAGS = EXTERN };
+		Xvscnprintf                              { FLAGS = EXTERN };
 		_CallCallbacks                           { FLAGS = EXTERN };
 		_XkbKSCheckCase                          { FLAGS = EXTERN };
 		_XkbLookupAnyDevice                      { FLAGS = EXTERN };