6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
6837131 Can't bring up dtlogin with AST2000 driver on nvx_114
Includes fix contributed by Juergen Keil for OpenSolaris Bug #8687:
german keyboard layout: umlaut keys not accepted by Xvnc
http://defect.opensolaris.org/bz/show_bug.cgi?id=8687
--- a/buildit Thu May 14 20:00:54 2009 -0700
+++ b/buildit Fri May 15 09:36:46 2009 -0700
@@ -34,7 +34,7 @@
#
###########################################################################
#
-# ident "@(#)buildit 1.7 09/02/26 SMI"
+# ident "@(#)buildit 1.8 09/05/15 SMI"
#
MAKE_PKGS=0
@@ -78,6 +78,9 @@
print $_ ; print "*** Compiler too old!\n" if ( ($1 != 5) || ($2 < 9) ) }'
gcc -v
+# Exported to reduce number of times it's evaluated in makefiles
+export POUND_SIGN='#'
+
echo "Using these environment variables: "
env
echo "------------------------------------------------------------------------------"
--- a/make_release_packages Thu May 14 20:00:54 2009 -0700
+++ b/make_release_packages Fri May 15 09:36:46 2009 -0700
@@ -27,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)make_release_packages 1.70 09/05/13
+# @(#)make_release_packages 1.71 09/05/15
#
# Create and fill a package staging area for X
#
@@ -57,7 +57,7 @@
XW_PACKAGE_LIST="SUNWfontconfig SUNWfontconfig-docs SUNWfontconfig-root
SUNWttf-google-droid
SUNWpciaccess SUNWpixman SUNWfreetype2 SUNWvncviewer SUNWxcursor-themes
- SUNWxorg-cfg SUNWxorg-client-docs SUNWxorg-client-programs
+ SUNWxorg-client-docs SUNWxorg-client-programs
SUNWxorg-clientlibs SUNWxorg-compatlinks
SUNWxorg-graphics-ddx SUNWxorg-headers
SUNWxorg-server SUNWxorg-tsol-module
--- a/open-src/app/installalias/sun-src/installalias.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/app/installalias/sun-src/installalias.c Fri May 15 09:36:46 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, 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
@@ -67,6 +67,8 @@
#include <ctype.h>
#include <limits.h>
#include <stdarg.h>
+#include <stdlib.h>
+#include <X11/keysym.h>
#define EBadFontPath 0
#define EBadFontName 0
@@ -89,7 +91,7 @@
va_end(args);
}
-/* Provide psuedo renderers for font file formats we may find in fonts.dir
+/* Provide pseudo renderers for font file formats we may find in fonts.dir
files during installation, but which libXfont does not support */
/* ARGSUSED */
static int
@@ -138,8 +140,8 @@
FontDirectoryPtr dir = NullFontDirectory;
- strlcpy(dir_file, directory, sizeof(dir_file));
- if (directory[strlen(directory) - 1] != '/')
+ i = strlcpy(dir_file, directory, sizeof(dir_file));
+ if (directory[i - 1] != '/')
strlcat(dir_file, "/", sizeof(dir_file));
strlcat(dir_file, FontDirFile, sizeof(dir_file));
file = fopen(dir_file, "r");
@@ -220,7 +222,7 @@
char *nbuf;
nsize = tokenSize ? (tokenSize << 1) : 64;
- nbuf = (char *) xrealloc(tokenBuf, nsize);
+ nbuf = realloc(tokenBuf, nsize);
if (!nbuf)
return EALLOC;
tokenBuf = nbuf;
@@ -310,6 +312,27 @@
return c;
}
+static inline unsigned char
+ISOLatin1ToLower(unsigned char source)
+{
+ if (source >= XK_A && source <= XK_Z)
+ return source + (XK_a - XK_A);
+ if (source >= XK_Agrave && source <= XK_Odiaeresis)
+ return source + (XK_agrave - XK_Agrave);
+ if (source >= XK_Ooblique && source <= XK_Thorn)
+ return source + (XK_oslash - XK_Ooblique);
+ return source;
+}
+
+static void
+copyISOLatin1Lowered(char *dest, char *source, int length)
+{
+ int i;
+ for (i = 0; i < length; i++, source++, dest++)
+ *dest = ISOLatin1ToLower(*source);
+ *dest = '\0';
+}
+
static int
ReadAliases(
FILE *file,
@@ -344,8 +367,8 @@
status = EAllocError;
break;
case NAME:
- CopyISOLatin1Lowered(alias, alias, strlen(alias));
- CopyISOLatin1Lowered(font_name, lexToken, strlen(lexToken));
+ copyISOLatin1Lowered(alias, alias, strlen(alias));
+ copyISOLatin1Lowered(font_name, lexToken, strlen(lexToken));
return status;
}
}
@@ -375,7 +398,7 @@
if (namelen >= MAXFONTNAMELEN)
return EAllocError;
- CopyISOLatin1Lowered (lowerName, name, namelen);
+ copyISOLatin1Lowered (lowerName, name, namelen);
lowerName[namelen] = '\0';
tmpName.name = lowerName;
tmpName.length = namelen;
--- a/open-src/app/mesa-demos/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/app/mesa-demos/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,14 +28,12 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.12 09/03/04
-#
# Package name used in tarballs
MODULE_NAME=MesaDemos
# Version number (used in path names)
-MODULE_VERSION=7.2
+MODULE_VERSION=7.4.1
# Directory created by unpacking source
SOURCE_DIRNAME=Mesa-$(MODULE_VERSION)
--- a/open-src/app/mesa-demos/Xorg-6.9-changes.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/app/mesa-demos/Xorg-6.9-changes.patch Fri May 15 09:36:46 2009 -0700
@@ -682,7 +682,7 @@
+ usage();
}
-- make_window(dpy, "glxgears", 0, 0, winWidth, winHeight, &win, &ctx);
+- make_window(dpy, "glxgears", x, y, winWidth, winHeight, &win, &ctx);
- XMapWindow(dpy, win);
- glXMakeCurrent(dpy, win, ctx);
+ if (doPrint) {
--- a/open-src/common/Makefile.inc Thu May 14 20:00:54 2009 -0700
+++ b/open-src/common/Makefile.inc Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.98 09/01/14
+# @(#)Makefile.inc 1.99 09/05/15
#
### Default rules
@@ -107,10 +107,10 @@
# Additional flags to pass to make in 32-bit & 64-bit builds
BUILD_32_FLAGS= BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" \
- $(MODTYPE_BUILD_32_FLAGS) $(MODULE_BUILD_32_FLAGS)
+ BUILD_TYPE=32 $(MODTYPE_BUILD_32_FLAGS) $(MODULE_BUILD_32_FLAGS)
BUILD_64_FLAGS= BUILD_DIR=$(BUILD_DIR_64) ARCH_FLAGS="$(ARCH64_FLAGS)" \
- $(MODTYPE_BUILD_64_FLAGS) $(MODULE_BUILD_64_FLAGS)
+ BUILD_TYPE=64 $(MODTYPE_BUILD_64_FLAGS) $(MODULE_BUILD_64_FLAGS)
all: $(BUILD_TYPES:%=source_%) $(BUILD_TYPES:%=build_%)
all_32: source_32 configure_32 build_32
@@ -168,6 +168,10 @@
DEBUG_BUILD_FLAGS = BUILD_DEBUG=yes
+debug-build: debug
+debug-build_32: debug_32
+debug-build_64: debug_64
+
debug:
$(MAKE) $(MAKEFLAGS) all $(DEBUG_BUILD_FLAGS)
@@ -195,7 +199,7 @@
# Download if SOURCE_TARBALL_NAME is not set to NONE and the file either
# doesn't exist or is empty
-# If MODULE_VERSION is xgit, checkout source from git repo instead of
+# If MODULE_VERSION is git, checkout source from git repo instead of
# a tarball
download:
@case '$(MAKEFLAGS)' in *[ik]*) set +e;; esac; set -x ; \
@@ -347,7 +351,7 @@
$(AUTOCONF_TARGET): $(CONFIGURE_DEPS)
cd $(SOURCE_DIR) ; \
- if [[ "$(AUTORECONF)" = "yes" ]] ; then \
+ if [[ "$(AUTORECONF)" = "yes" || "$(MODULE_VERSION)" = "git" ]] ; then \
$(AUTORECONF_ENV) autoreconf -v --install --force ; \
fi ; \
chmod a+x configure ; \
@@ -434,9 +438,10 @@
# Adjust paths in pkg-config files for -uninstalled variants used during build
UNINSTALLED_PC_OPS= \
- -e 's|(-[LI]\s*)\$$|$$1$(PROTODIR)\$$|g;' \
- -e 's|^sdkdir=|sdkdir=$(PROTODIR)|g;' \
- -e 's|$(PROTODIR)\$${sdkdir}|\$${sdkdir}|g;'
+ -e 'BEGIN {use Cwd; $$protodir=Cwd::realpath("$(PROTODIR)");}' \
+ -e 's|(-[LI]\s*)\$$|$$1$$protodir\$$|g;' \
+ -e 's|^sdkdir=|sdkdir=$$protodir|g;' \
+ -e 's|$$protodir\$${sdkdir}|\$${sdkdir}|g;'
install_pkgconfig_uninstalled:
@ if [[ ! -z "$(FIX_PC_FILES)" ]] ; then \
@@ -453,6 +458,10 @@
ELF_COMMENTS = $(MODULE_NAME) $(MODULE_VERSION)
ELF_COMMENTS += $(MODTYPE_ELF_COMMENTS)$(MODULE_ELF_COMMENTS)
+$(BUILD_DEBUG:yes=) DEBUG_ELF_COMMENTS=(DEBUG)
+$(BUILD_DEBUG:yes=$(POUND_SIGN)) DEBUG_ELF_COMMENTS=
+ELF_COMMENTS += $(DEBUG_ELF_COMMENTS)
+
set-elf-comments:
$(TOP)/common/set-elf-comments.pl -B $(TOP)/../packages/pkgversion \
-M '$(ELF_COMMENTS)' $(SOURCE_DIR)
--- a/open-src/common/Makefile.init Thu May 14 20:00:54 2009 -0700
+++ b/open-src/common/Makefile.init Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.init 1.9 09/04/16
+# @(#)Makefile.init 1.10 09/05/15
#
# Use ksh93 for shell commands in Makefiles so that builds are the same
@@ -45,7 +45,11 @@
# widely included into other makefiles, as the resulting shell executions can
# cause a noticable slowdown in build times.
#
-POUND_SIGN:sh= echo \\043
+# The extra $(POUND_SIGN) in front keeps us from spending time doing
+# additional shell executions once it's already defined. (See CR 6589104,
+# credit to Casper Dik for the idea.)
+#
+$(POUND_SIGN)POUND_SIGN:sh= echo \\043
# Set default build target to all
default:: all
@@ -101,7 +105,7 @@
CFLAGS_suncc = $(DEBUG_OR_OPT_FLAGS_suncc) -v -mc -xstrconst \
-features=extensions
-CXXFLAGS_suncc = $(DEBUG_OR_OPT_FLAGS_suncc) +w -mc -norunpath \
+CXXFLAGS_suncc = $(DEBUG_OR_OPT_FLAGS_suncc) +w2 -mc -norunpath \
-features=extensions
ARCH32_FLAGS_sparc_suncc = -m32 -xarch=sparc
@@ -152,6 +156,7 @@
# Flags for specific binary types
LIB_CPPFLAGS = -D_REENTRANT
LIB_CFLAGS = $(CFLAGS) $(ARCH_LIB_FLAGS)
+LIB_CXXFLAGS = $(CXXFLAGS) $(ARCH_LIB_FLAGS)
PROG_CFLAGS = $(CFLAGS)
PROG_CXXFLAGS = $(CXXFLAGS)
@@ -226,6 +231,7 @@
X11_DIR=/usr/X11
X11_INCLUDES_DIR=$(X11_DIR)/include
+XORG_SDK_INCLUDES_DIR=$(X11_INCLUDES_DIR)/xorg
X11_X11LIB_DIR=$(X11_DIR)/lib/X11
X11_FONT_DIR=$(X11_X11LIB_DIR)/fonts
X11_TRUETYPE_DIR=$(X11_FONT_DIR)/TTF
--- a/open-src/common/Makefile.subdirs Thu May 14 20:00:54 2009 -0700
+++ b/open-src/common/Makefile.subdirs Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.subdirs 1.2 09/01/14
+# @(#)Makefile.subdirs 1.3 09/05/15
#
# Need to set $MACH
@@ -37,8 +37,8 @@
OS_SUBDIRS=$(OS_SUBDIRS_$(MACH))
-all:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=all
+.DEFAULT:
+ $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=$@
World: clean all
@@ -46,29 +46,6 @@
$(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=clean
$(MAKE) $(MAKEFLAGS) clean-obsolete-subdirs
-install:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=install
-
-download:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=download
-
-source:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=source
-
-git-update:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=git-update
-
-# Build debuggable versions
-debug-build:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=debug
-
-# Build & install debuggable versions
-debug-install:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=debug-install
-
-list-patches:
- $(MAKE) $(MAKEFLAGS) subdirs OS_TARGET=list-patches
-
subdirs:
@case '${MAKEFLAGS}' in *[ik]*) set +e;; esac; \
for i in $(OS_SUBDIRS) ; do \
--- a/open-src/data/xbitmaps/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/data/xbitmaps/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/14
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
@@ -56,9 +56,3 @@
install_gen:: $(ADDITIONAL_BITMAPS)
mkdir -p $(BITMAP_INST_DIR)
$(INSTALL_SCRIPT) -m 0444 $(ADDITIONAL_BITMAPS) $(BITMAP_INST_DIR)
-
-# Extra install for bootstrapping the old monolith
-install_gen:: $(SOURCE_DIR)/Makefile
- @if [ -d $(PROTODIR)/../xc/include ] ; then \
- (set -x ; cd $(SOURCE_DIR) ; $(MAKE) $(MAKEFLAGS) -e DESTDIR=$(PROTODIR) bitmapdir=/../xc/include/bitmaps install) ;\
- fi
--- a/open-src/driver/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.12 09/04/17
+# @(#)Makefile 1.13 09/05/15
#
###############################################################################
@@ -44,23 +44,12 @@
OS_SUBDIRS_i386 = $(OS_SUBDIRS_common) \
xf86-input-acecad \
- xf86-input-calcomp \
xf86-input-citron \
- xf86-input-digitaledge \
- xf86-input-dmc \
- xf86-input-dynapro \
xf86-input-elographics \
xf86-input-fpit \
xf86-input-hyperpen \
- xf86-input-jamstudio \
- xf86-input-magellan \
- xf86-input-microtouch \
xf86-input-mutouch \
- xf86-input-palmax \
xf86-input-penmount \
- xf86-input-spaceorb \
- xf86-input-summa \
- xf86-input-tek4957 \
xf86-input-vmmouse \
xf86-video-apm \
xf86-video-ark \
@@ -93,6 +82,17 @@
# Subdirs we used to build, but now just need to clean up
OBSOLETE_SUBDIRS = \
+ xf86-input-calcomp \
+ xf86-input-digitaledge \
+ xf86-input-dmc \
+ xf86-input-dynapro \
+ xf86-input-jamstudio \
+ xf86-input-magellan \
+ xf86-input-microtouch \
+ xf86-input-palmax \
+ xf86-input-spaceorb \
+ xf86-input-summa \
+ xf86-input-tek4957 \
xf86-video-cyrix \
xf86-video-i810 \
xf86-video-nsc \
--- a/open-src/driver/Makefile.inc Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/Makefile.inc Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to all X.Org drivers
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.14 09/01/10
+# @(#)Makefile.inc 1.15 09/05/15
#
PWD:sh=pwd
@@ -58,19 +58,20 @@
MODTYPE_CPPFLAGS= \
-I$(PROTODIR)/usr/include \
-I$(PROTODIR)/usr/include/pixman-1 \
- -I$(PROTODIR)/usr/X11/include/xorg \
- -I$(PROTODIR)/usr/X11/include/drm \
- -I$(PROTODIR)/usr/X11/include/X11/dri
-
-# Inline assembly in i386 requires gcc until we move to Studio 12 or later
-MODTYPE_COMPILER_sparc=suncc
-MODTYPE_COMPILER_i386=gcc
-MODTYPE_COMPILER=$(MODTYPE_COMPILER_$(MACH))
-MODTYPE_COMPILER_SET=yes
+ -I$(PROTODIR)$(XORG_SDK_INCLUDES_DIR) \
+ -I$(PROTODIR)$(X11_INCLUDES_DIR)/drm \
+ -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri
MODTYPE_CFLAGS=$(PROG_CFLAGS)
-MODTYPE_LDFLAGS_cc=
+ASM_IL_DIR = $(PROTODIR)$(XORG_SDK_INCLUDES_DIR)
+MODTYPE_CFLAGS_suncc_i386_32 = $(ASM_IL_DIR)/solaris-ia32.il
+MODTYPE_CFLAGS_suncc_i386_64 = $(ASM_IL_DIR)/solaris-amd64.il
+MODTYPE_CFLAGS_suncc_sparc_32 = $(ASM_IL_DIR)/solaris-sparcv8plus.il
+MODTYPE_CFLAGS_suncc_sparc_64 = $(ASM_IL_DIR)/solaris-sparcv8plus.il
+MODTYPE_CFLAGS += $(MODTYPE_CFLAGS_$(MODULE_COMPILER)_$(MACH)_$(BUILD_TYPE))
+
+MODTYPE_LDFLAGS_suncc=
MODTYPE_LDFLAGS_gcc=-R/usr/sfw/lib$(ARCHLIBSUBDIR)
MODTYPE_LDFLAGS=$(LDFLAGS) -Wl,-B,direct $(MODTYPE_LDFLAGS_$(MODULE_COMPILER))
--- a/open-src/driver/xf86-input-acecad/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-acecad/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,47 +1,21 @@
- * Copyright (c) 2001 Edouard TISSERANT <[email protected]>
- * Parts inspired from Shane Watts <[email protected]> XFree86 3 Acecad Driver
- * Thanks to Emily, from AceCad, For giving me documents.
- *
- * 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.
- *
- *
-
- * Copyright (c) 2001 Edouard TISSERANT <[email protected]>
- * Parts inspired from Shane Watts <[email protected]> Xfree 3 Acecad Driver
- * Thanks to Emily, from AceCad, For giving me documents.
- *
- * 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.
- *
- *
+Copyright (c) 2001 Edouard TISSERANT <[email protected]>
+Parts inspired from Shane Watts <[email protected]> XFree86 3 Acecad Driver
+Thanks to Emily, from AceCad, For giving me documents.
+
+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.
--- a/open-src/driver/xf86-input-acecad/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-acecad/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-acecad 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,17 +30,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/10
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-acecad
# Version number (used in path names)
-MODULE_VERSION=1.2.2
+MODULE_VERSION=1.3.0
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = usleep.patch,-p1
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-acecad/usleep.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-From 33e64334db17ed3d2307e3ac465450c5c9b39ad9 Mon Sep 17 00:00:00 2001
-From: Paulo Cesar Pereira de Andrade <[email protected]>
-Date: Sun, 16 Mar 2008 03:01:23 -0300
-Subject: [PATCH] Compile warning fixes.
-
-Don't call xf86usleep, just call usleep directly.
-Remove unused variables.
-
-Signed-off-by: Peter Hutterer <[email protected]>
----
- src/acecad.c | 3 +--
- src/acecad.h | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/acecad.c b/src/acecad.c
-index 41caa8c..71d2578 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -245,10 +245,9 @@ #ifdef LINUX_SYSFS
- char *link = NULL;
- struct dlist *devs = NULL;
- struct dlist *links = NULL;
-- unsigned int major = 0, minor = 0;
- void *libsysfs = NULL;
-
-- if (libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL)) {
-+ if ((libsysfs = dlopen("libsysfs.so", RTLD_NOW | RTLD_GLOBAL))) {
- xf86MsgVerb(X_INFO, verb, "%s: querying sysfs for Acecad tablets\n", local->name);
- usb_bus = sysfs_open_bus(usb_bus_name);
- if (usb_bus) {
-diff --git a/src/acecad.h b/src/acecad.h
-index 2f910ea..9acfca2 100644
---- a/src/acecad.h
-+++ b/src/acecad.h
-@@ -63,7 +63,7 @@ #define AVAIL_FLAG 8
-
- #define NOTAVAIL ((errno == ENODEV) || (errno == ENXIO) || (errno == ENOENT))
-
--#define milisleep(ms) xf86usleep (ms * 1000)
-+#define milisleep(ms) usleep (ms * 1000)
-
- #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))
-
---
-1.4.1
-
--- a/open-src/driver/xf86-input-calcomp/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-
- * Copyright (c) 2000,2001 Martin Kroeker ([email protected])
- * sample driver used :
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
- * Except as contained in this notice, the names of Martin Kroeker and/or
- * Daveg GmbH shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization from Martin Kroeker or Daveg GmbH.
- *
-
-
- * Copyright (c) 2000-2001 Martin Kroeker ([email protected])
- * code derived from sample driver
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-calcomp/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-calcomp 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-calcomp
-
-# Version number (used in path names)
-MODULE_VERSION=1.1.2
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-citron/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-citron/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,99 +1,47 @@
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
- * Based, in part, on code with the following copyright notice:
- *
- * Copyright 1999-2001 by Thomas Thanner, Citron GmbH, Germany. <[email protected]>
- * Copyright 1999-2006 by Peter Kunzmann, Citron GmbH, Germany. <[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 Thomas Thanner and Citron GmbH not be used in advertising or
- * publicity pertaining to distribution of the software without specific, written
- * prior permission. Thomas Thanner and Citron GmbH makes no representations about
- * the suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * THOMAS THANNER AND CITRON GMBH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL THOMAS THANNER OR CITRON GMBH BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RSULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
+Copyright (c) 1998 Metro Link Incorporated
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, cpy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
- * Based, in part, on code with the following copyright notice:
- *
- * Copyright 1999-2001 by Thomas Thanner, Citron GmbH, Germany. <[email protected]>
- * Copyright 2002-2005 Citron GmbH, Augsburg <[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 Thomas Thanner and Citron GmbH not be used in advertising or
- * publicity pertaining to distribution of the software without specific, written
- * prior permission. Thomas Thanner and Citron GmbH makes no representations about
- * the suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * THOMAS THANNER AND CITRON GMBH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL THOMAS THANNER OR CITRON GMBH 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.
- *
-
+
+Based, in part, on code with the following copyright notice:
+
+Copyright 1999-2001 by Thomas Thanner, Citron GmbH, Germany. <[email protected]>
+Copyright 1999-2006 by Peter Kunzmann, Citron GmbH, Germany. <[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 Thomas Thanner and Citron GmbH not be used in advertising or
+publicity pertaining to distribution of the software without specific, written
+prior permission. Thomas Thanner and Citron GmbH makes no representations about
+the suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+THOMAS THANNER AND CITRON GMBH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL THOMAS THANNER OR CITRON GMBH BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RSULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
--- a/open-src/driver/xf86-input-citron/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-citron/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-citron 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,17 +30,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/10
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-citron
# Version number (used in path names)
-MODULE_VERSION=2.2.1
+MODULE_VERSION=2.2.2
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = input-abi.patch,-p1
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-citron/input-abi.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-From a59ffb3cdc9d68a0ad21f04831e4255ad0e985d8 Mon Sep 17 00:00:00 2001
-From: Paulo Cesar Pereira de Andrade <[email protected]>
-Date: Mon, 4 Feb 2008 01:10:27 -0200
-Subject: [PATCH] Don't call xf86SoundKbdBell and xf86XInputSetSendCoreEvents
-
-Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
-
-Signed-off-by: Peter Hutterer <[email protected]>
----
- src/citron.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/citron.c b/src/citron.c
-index 42152b5..38e5067 100644
---- a/src/citron.c
-+++ b/src/citron.c
-@@ -2058,12 +2058,14 @@ SwitchMode (ClientPtr client, DeviceIntP
- DBG(6, ErrorF("%s\treporting mode = %s\n", CI_INFO, mode==TS_Raw?"raw":"scaled"));
- return (Success);
- }
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
- {
- xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents));
- DBG(6, ErrorF("%s\tmode = %sSend Core Events\n", CI_INFO, mode==DontSendCoreEvents?"Don\'t ":""));
- return (Success);
- }
-+#endif
- #ifdef CIT_MODE_EXT
- else if (mode == ClickMode_Enter)
- {
-@@ -2466,6 +2468,7 @@ #ifdef CIT_BEEP
- if(priv->beep == 0)
- return;
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- /* ring release bell */
- if(press == 0)
-
-@@ -2492,6 +2495,7 @@ #ifdef CIT_BEEP
- else
- /* ring press bell */
- xf86SoundKbdBell(priv->press_vol,priv->press_pitch, priv->press_dur);
-+#endif
-
- DBG(7, ErrorF("%scit_Beep called - %s\n", CI_INFO, (press == 0) ? "release" : "press"));
- #endif
-@@ -2508,6 +2512,7 @@ #ifdef CIT_BEEP
- if(priv->beepkey == 0)
- return;
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- /* ring release bell */
- if(press <= 0)
-
-@@ -2532,6 +2537,7 @@ #ifdef CIT_BEEP
- else
- /* ring press bell */
- xf86SoundKbdBell(priv->presskey_vol,priv->presskey_pitch, priv->presskey_dur);
-+#endif
-
- DBG(7, ErrorF("%scit_BeepKey called - %s\n", CI_INFO, (press == 0) ? "release" : "press"));
- #endif
---
-1.4.1
-
--- a/open-src/driver/xf86-input-digitaledge/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
- * Copyright 1996 by Steven Lang <[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 Steven Lang not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Steven Lang makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * STEVEN LANG DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL STEVEN LANG 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
--- a/open-src/driver/xf86-input-digitaledge/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-digitaledge 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-digitaledge
-
-# Version number (used in path names)
-MODULE_VERSION=1.1.1
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-#SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-dmc/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: Mayk Langer <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: Mayk Langer <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-dmc/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-dmc 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-dmc
-
-# Version number (used in path names)
-MODULE_VERSION=1.1.2
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-dynapro/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: David Woodhouse <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: David Woodhouse <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-dynapro/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-dynapro 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-dynapro
-
-# Version number (used in path names)
-MODULE_VERSION=1.1.2
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-fpit/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-fpit/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,51 +1,28 @@
+Copyright 1995, 1999 by Patrick Lecoanet, France. <[email protected]>
+Copyright 2002, Red Hat <[email protected]>
- * Copyright 1995, 1999 by Patrick Lecoanet, France. <[email protected]>
- * Copyright 2002, Red Hat <[email protected]>
- *
- * This driver is a merge of the Elographics driver (from Patrick Lecoanet) and
- * the driver for Fujitsu Pen Computers from Rob Tsuk and John Apfelbaum.
- *
- * Modified for Stylistic 3400 passive pen support by David Clay
- * Fixed processing of all packets
- * Detangled and simplified if-statement logic
- * Fixed hover-mode pointer movement
- * Added Passive parameter for passive displays
- * Added switch 3 for "right" mouse button
- * I might have broken active pen support. I can't test it.
- * January 2005 <dave at claysrus.com>
- *
- * Stylistic 500, 1000, 1200, 2300 Support fixed by John Apfelbaum
- * June 2001 <[email protected]>
- *
- * Richard Miller-Smith <[email protected]>
- *
- * Fixed up for XFree86 4.2, cleaned up the junk, cured crash on pointer
- * setting.
- *
- * 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 Patrick Lecoanet not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The Authors make no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
+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 Patrick Lecoanet not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The Authors make no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
--- a/open-src/driver/xf86-input-fpit/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-fpit/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-fpit 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/10
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-fpit
# Version number (used in path names)
-MODULE_VERSION=1.2.0
+MODULE_VERSION=1.3.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-input-hyperpen/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-hyperpen/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,20 +1,21 @@
- * Copyright 1996 by Steven Lang <[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 Steven Lang not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Steven Lang makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * STEVEN LANG DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL STEVEN LANG 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+(c) 2000 Roland Jansen <[email protected]>
+(c) 2000 Christian Herzog <[email protected]>
+Copyright 1996 by Steven Lang <[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 Steven Lang not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. Steven Lang makes no representations about the
+suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+STEVEN LANG DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL STEVEN LANG 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
--- a/open-src/driver/xf86-input-hyperpen/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-hyperpen/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-hyperpen 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/10
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-hyperpen
# Version number (used in path names)
-MODULE_VERSION=1.2.0
+MODULE_VERSION=1.3.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-input-jamstudio/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
- * Copyright 2002 by Brian Goines ([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 Brian Goines not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Brian Goines makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * BRIAN GOINES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
--- a/open-src/driver/xf86-input-jamstudio/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-jamstudio 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-jamstudio
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-keyboard/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-keyboard/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 09/05/01
+# @(#)Makefile 1.8 09/05/15
#
# Package name used in tarballs
@@ -43,7 +43,7 @@
SOURCE_PATCHES = \
hal-man-page.patch,-p1 \
hal-hotplug.patch,-p1 \
- sun-keymappings.patch \
+ sun-keymappings.patch,-p1 \
sun-kb-autodetect.patch
# Regenerate files after patching Makefile.am in sun-kb-autodetect.patch
--- a/open-src/driver/xf86-input-keyboard/sun-keymappings.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-keyboard/sun-keymappings.patch Fri May 15 09:36:46 2009 -0700
@@ -1,46 +1,36 @@
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
+From 7a4d6f396597c4b96e1402dadfcd2c0e5b7b0579 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 1 May 2009 14:47:59 -0700
+Subject: [PATCH] Override HKTG & BSlash2 keycodes on Solaris
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ src/sun_kbdMap.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+diff --git a/src/sun_kbdMap.c b/src/sun_kbdMap.c
+index 0b4b99c..50d7585 100644
+--- a/src/sun_kbdMap.c
++++ b/src/sun_kbdMap.c
+@@ -36,10 +36,17 @@
+
+ /* Map the Solaris keycodes to the "XFree86" keycodes. */
+
+-/* Additional Sun Japanese Keyboard Keys not defined in common/atKeynames.h */
++/* Additional Sun Japanese Keyboard Keys not defined in atKeynames.h */
+ #define KEY_Kanji 0x82
+ #define KEY_Execute 0x83
+
++/* Override atKeynames.h values with unique keycodes, so we can distinguish
++ KEY_F15 from KEY_HKTG & KEY_KP_DEC from KEY_BSlash2 */
++#undef KEY_HKTG
++#define KEY_HKTG /* Hirugana/Katakana tog 0xC8 */ 200 /* was 112 */
++#undef KEY_BSlash2
++#define KEY_BSlash2 /* \ _ 0xCB */ 203 /* was 115 */
++
+ static unsigned char sunmap[256] = {
+ #if defined(i386) || defined(__i386) || defined(__i386__) || defined(__x86)
+ KEY_NOTUSED, /* 0 */
+--
+1.5.6.5
-diff -urp -x '*~' -x '*.orig' src/atKeynames.h src/atKeynames.h
---- src/atKeynames.h 2009-01-07 08:35:10.000000000 -0800
-+++ src/atKeynames.h 2009-01-11 17:32:33.059998000 -0800
-@@ -213,11 +213,11 @@
- #define KEY_F13 /* F13 0x6e */ 110
- #define KEY_F14 /* F14 0x6f */ 111
- #define KEY_F15 /* F15 0x70 */ 112
--#define KEY_HKTG /* Hirugana/Katakana tog 0x70 */ 112
-+#define KEY_HKTG /* Hirugana/Katakana tog 0x70 */ 200 /* was 112 */
- #define KEY_F16 /* F16 0x71 */ 113
- #define KEY_F17 /* F17 0x72 */ 114
- #define KEY_KP_DEC /* KP_DEC 0x73 */ 115
--#define KEY_BSlash2 /* \ _ 0x73 */ 115
-+#define KEY_BSlash2 /* \ _ 0x73 */ 203 /* was 115 */
- #define KEY_KP_Equal /* Equal (Keypad) 0x76 */ 118
- #define KEY_XFER /* Kanji Transfer 0x79 */ 121
- #define KEY_NFER /* No Kanji Transfer 0x7b */ 123
--- a/open-src/driver/xf86-input-magellan/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * port to XFree4.2.0 Copyright (c) 2002 Christoph Koulen
- * [email protected]
- *
- * port based on pre-XFree4.2.0 driver code v1.10 and XFree4.2.0 SpaceOrb driver code
-
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-magellan/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-magellan 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-magellan
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-#SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-microtouch/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Based, in part, on code with the following copyright notice:
- *
- * Copyright 1996 by Patrick Lecoanet, France. <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Patrick Lecoanet not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Patrick Lecoanet makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-microtouch/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-microtouch 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-microtouch
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-palmax/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-
-opyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION 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 deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
--- a/open-src/driver/xf86-input-palmax/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-palmax 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-palmax
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-penmount/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-penmount/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,65 +1,24 @@
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: David Woodhouse <[email protected]>
- * CoAuthor: Mayk Langer <[email protected]>
- *
- * History:
- * 09/16/2005: Jaya Kumar <[email protected]>
- * - Added DMC9000 controller protocol support
- * - DMC9000 support work was sponsored by CIS(M) Sdn Bhd
- * 09/15/2005: Original code from David and Mark
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Copyright (c) 1999 Machine Vision Holdings Incorporated
- * Author: David Woodhouse <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
+Copyright (c) 1999 Machine Vision Holdings Incorporated
+Template driver used: Copyright (c) 1998 Metro Link Incorporated
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, cpy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
--- a/open-src/driver/xf86-input-penmount/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-penmount/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-penmount 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/10
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-penmount
# Version number (used in path names)
-MODULE_VERSION=1.3.0
+MODULE_VERSION=1.4.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-input-spaceorb/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-
- * Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, cpy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Author: Guido Heumer <[email protected]>
- *
- * Template driver used: Copyright (c) 1998 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
--- a/open-src/driver/xf86-input-spaceorb/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-spaceorb 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-spaceorb
-
-# Version number (used in path names)
-MODULE_VERSION=1.1.1
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-#SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-summa/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-
- * Copyright 1996 by Steven Lang <[email protected]>
- *
- * AceCad tablet support ported by Arpad Gereoffy <[email protected]>
- * originally written by Shane Watts <[email protected]>
- * and Fredrik Chabot <[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 Steven Lang not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Steven Lang makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * STEVEN LANG DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL STEVEN LANG 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
--- a/open-src/driver/xf86-input-summa/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-summa 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-summa
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-#SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-tek4957/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
- * Copyright 2002 by Olivier DANET <[email protected]>
- *
- * Designed for XFree86 version >= 4.0
- *
- * 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 O. DANET may not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. O.DANET makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * O. DANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL O. DANET 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 ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
--- a/open-src/driver/xf86-input-tek4957/Makefile Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###############################################################################
-#
-# xf86-input-tek4957 1.x Makefile
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.5 09/01/10
-#
-
-# Package name used in tarballs
-MODULE_NAME=xf86-input-tek4957
-
-# Version number (used in path names)
-MODULE_VERSION=1.2.0
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUN_PACKAGE=SUNWxorg-server
-MODULE_STABILITY=Volatile
-
-include ../Makefile.inc
--- a/open-src/driver/xf86-input-vmmouse/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,20 +30,21 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)Makefile 1.3 09/01/15 SMI"
+# ident "@(#)Makefile 1.4 09/05/15 SMI"
#
# Package name used in tarballs
MODULE_NAME=xf86-input-vmmouse
# Version number (used in path names)
-MODULE_VERSION=12.6.3
+MODULE_VERSION=12.6.4
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = hal-configure-options.patch,-p1
+SOURCE_PATCHES =
-# Rebuild configure after patching configure.ac in hal-configure-options.patch
-AUTORECONF=yes
+# vmmouse_client code won't build with Sun compiler
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
@@ -59,7 +60,11 @@
--bindir=$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
# Libraries/modules to link with
-MODULE_LD_OPTIONS=
+MODULE_LD_OPTIONS= mouse_drv.so
include ../Makefile.inc
+source_gen::
+ ln -s $(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)/input/mouse_drv.so $(SOURCE_DIR)/src/mouse_drv.so
+ ln -s $(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)/input/mouse_drv.so $(SOURCE_DIR)/tools/mouse_drv.so
+
--- a/open-src/driver/xf86-input-vmmouse/hal-configure-options.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-From 9719534fa3a184b848ef9e9c3a755703b8708fd2 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 15 Jan 2009 07:29:44 -0800
-Subject: [PATCH] Make --with-hal* configure options match their help output
-
----
- configure.ac | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5c5f639..118ae84 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,7 @@ AC_ARG_WITH(xorg-module-dir,
- inputdir=${moduledir}/input
- AC_SUBST(inputdir)
-
--AC_ARG_WITH(hal_bin_dir,
-+AC_ARG_WITH(hal-bin-dir,
- AC_HELP_STRING([--with-hal-bin-dir=DIR],
- [Directory where HAL binaries where installed [[default=$bindir]]]),
- [halbindir="$withval"],
-@@ -78,7 +78,7 @@ AC_ARG_WITH(hal_bin_dir,
- HAL_BIN_DIR=${halbindir}
- AC_SUBST(HAL_BIN_DIR)
-
--AC_ARG_WITH(hal_callouts_dir,
-+AC_ARG_WITH(hal-callouts-dir,
- AC_HELP_STRING([--with-hal-callouts-dir=DIR],
- [Directory where HAL expects its callout scripts to be located
- [[default=$libdir/hal]]]),
-@@ -87,7 +87,7 @@ AC_ARG_WITH(hal_callouts_dir,
- HAL_CALLOUTS_DIR=${halcalloutsdir}
- AC_SUBST(HAL_CALLOUTS_DIR)
-
--AC_ARG_WITH(hal_fdi_dir,
-+AC_ARG_WITH(hal-fdi-dir,
- AC_HELP_STRING([--with-hal-fdi-dir=DIR],
- [Directory where HAL expects its fdi files to be located
- [[default=$datadir/hal/fdi/policy/20thirdparty]]]),
---
-1.5.6.5
-
--- a/open-src/driver/xf86-input-void/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
- * Copyright 1999 by Frederic Lepied, France. <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Frederic Lepied not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Frederic Lepied makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
--- a/open-src/driver/xf86-input-void/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-input-void/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-input-void 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 08/08/08
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-input-void
# Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION=1.2.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-ast/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.11 09/04/17
+# @(#)Makefile 1.12 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-ast
# Version number (used in path names)
-MODULE_VERSION=0.88.8
+MODULE_VERSION=0.89.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = sparc-ast.patch
--- a/open-src/driver/xf86-video-ast/sparc-ast.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-ast/sparc-ast.patch Fri May 15 09:36:46 2009 -0700
@@ -1,37 +1,179 @@
-diff -ur orig/Makefile.am src/Makefile.am
---- orig/Makefile.am Thu Apr 16 17:04:09 2009
-+++ src/Makefile.am Fri Apr 17 09:25:40 2009
-@@ -42,4 +42,5 @@
+diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am 2009-04-13 18:32:28.000000000 -0700
++++ src/Makefile.am 2009-04-24 02:03:07.532962000 -0700
+@@ -42,4 +42,5 @@ ast_drv_la_SOURCES = \
ast_pcirename.h \
ast_tool.c \
ast_vgatool.c \
- ast_vgatool.h
+ ast_vgatool.h \
+ ast_sparc_driver.c
-diff -ur orig/ast_2dtool.c src/ast_2dtool.c
---- orig/ast_2dtool.c Thu Apr 16 17:04:51 2009
-+++ src/ast_2dtool.c Thu Apr 9 18:39:12 2009
-@@ -190,7 +190,8 @@
+diff -urp -x '*~' -x '*.orig' src/ast.h src/ast.h
+--- src/ast.h 2009-04-13 18:32:28.000000000 -0700
++++ src/ast.h 2009-04-24 02:03:07.534004000 -0700
+@@ -20,8 +20,17 @@
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#ifndef AST_H
++#define AST_H
++
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/visual_io.h>
++
++#ifdef __sparc
++#define __sparc__ 1
++#endif
++
+
+ #include "ast_pcirename.h"
+
+@@ -83,6 +92,15 @@ typedef CARD32 ULONG;
+ typedef struct _ASTRegRec {
+ UCHAR ExtCRTC[0x50];
+
++#if (defined(__sparc__))
++ UCHAR MISC;
++ UCHAR SEQ[4];
++ UCHAR CRTC[25];
++ UCHAR AR[20];
++ UCHAR GR[9];
++ UCHAR DAC[256][3];
++#endif
++
+ } ASTRegRec, *ASTRegPtr;
+
+ typedef struct _VIDEOMODE {
+@@ -187,12 +205,108 @@ typedef struct _ASTRec {
+ ULONG ulCMDReg;
+ Bool EnableClip;
+
++#if defined(__sparc__)
++ char *deviceName;
++ int fd;
++#endif /* __sparc__ */
++
+ } ASTRec, *ASTRecPtr;
+
+ #define ASTPTR(p) ((ASTRecPtr)((p)->driverPrivate))
+
++#if defined(__sparc__)
++#define ASTDECL \
++ ASTRecPtr pAST = ASTPTR(pScrn); \
++ int fd = pAST->fd;
++
++#define ASTDECL_FD \
++ int fd = pAST->fd;
++
++#ifndef VIS_GETPCICONFIG
++
++/*
++ * These definitions will be removed when they are included in the
++ * visual_io.h
++ */
++#define VIS_GETVIDEOMODENAME (VIOC | 12)
++#define VIS_STOREVIDEOMODENAME (VIOC | 13)
++#define VIS_MAX_VMODE_LEN 48
++
++typedef struct vis_video_mode {
++ char mode_name[VIS_MAX_VMODE_LEN];
++ uint32_t vRefresh;
++ char pad[96];
++} vis_video_mode_t;
++
++
++#define VIS_GETPCICONFIG (VIOC | 14)
++
++typedef struct vis_pci_cfg {
++ uint16_t VendorID;
++ uint16_t DeviceID;
++ uint16_t Command;
++ uint16_t Status;
++ uint8_t RevisionID;
++ uint8_t ProgIF;
++ uint8_t SubClass;
++ uint8_t BaseClass;
++
++ uint8_t CacheLineSize;
++ uint8_t LatencyTimer;
++ uint8_t HeaderType;
++ uint8_t BIST;
++
++ uint32_t bar[6];
++ uint32_t CIS;
++ uint16_t SubVendorID;
++ uint16_t SubSystemID;
++ uint32_t ROMBaseAddress;
++
++ uint8_t CapabilitiesPtr;
++ uint8_t Reserved_1[3];
++ uint32_t Reserved_2;
++
++ uint8_t InterruptLine;
++ uint8_t InterruptPin;
++ uint8_t MinimumGrant;
++ uint8_t MaximumLatency;
++
++ uint8_t pad[100];
++} vis_pci_cfg_t;
++
++
++#define VIS_SETIOREG (VIOC | 17)
++#define VIS_GETIOREG (VIOC | 18)
++
++typedef struct vis_io_reg {
++ uchar_t offset;
++ uchar_t value;
++} vis_io_reg_t;
++#endif
++
++
++extern struct pci_device *ASTGetPciInfo(ASTRecPtr);
++extern ScrnInfoPtr ASTAllocScreen(DriverPtr, GDevPtr);
++extern pointer ASTMapVidMem(ScrnInfoPtr, unsigned int, PCITAG,
++ unsigned long, unsigned long);
++extern void ASTUnmapVidMem(ScrnInfoPtr, pointer, unsigned long);
++extern void ASTNotifyModeChanged(ScrnInfoPtr);
++extern void ASTSaveHW(ScrnInfoPtr);
++extern void ASTRestoreHW(ScrnInfoPtr);
++
++#else
++
++#define ASTDECL \
++ ASTRecPtr pAST = ASTPTR(pScrn);
++
++#define ASTDECL_FD
++
++#endif
++
+ /* Include Files */
+ #include "ast_mode.h"
+ #include "ast_vgatool.h"
+ #include "ast_2dtool.h"
+ #include "ast_cursor.h"
++
++#endif /* AST_H */
+diff -urp -x '*~' -x '*.orig' src/ast_2dtool.c src/ast_2dtool.c
+--- src/ast_2dtool.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_2dtool.c 2009-04-24 02:03:07.534955000 -0700
+@@ -190,6 +190,7 @@ Bool
bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST)
{
ULONG ulData;
--
+ ASTDECL_FD
-+
+
switch (pAST->jChipType)
{
- case AST2100:
-@@ -225,7 +226,8 @@
+@@ -225,6 +226,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
void
vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST)
{
--
+ ASTDECL_FD
-+
+
vWaitEngIdle(pScrn, pAST);
vWaitEngIdle(pScrn, pAST);
-
-@@ -240,6 +242,7 @@
+@@ -240,6 +242,7 @@ vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPt
ULONG ulEngState, ulEngState2;
UCHAR jReg;
ULONG ulEngCheckSetting;
@@ -39,10 +181,29 @@
if (pAST->MMIO2D)
ulEngCheckSetting = 0x10000000;
-diff -ur orig/ast_accel.c src/ast_accel.c
---- orig/ast_accel.c Thu Apr 16 17:05:00 2009
-+++ src/ast_accel.c Wed Apr 8 14:35:39 2009
-@@ -184,7 +184,12 @@
+diff -urp -x '*~' -x '*.orig' src/ast_2dtool.h src/ast_2dtool.h
+--- src/ast_2dtool.h 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_2dtool.h 2009-04-24 02:03:07.535695000 -0700
+@@ -20,6 +20,9 @@
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#ifndef AST2DTOOL_H
++#define AST2DTOOL_H
++
+ /* Eng Capability Definition */
+ #define ENG_CAP_Sync 0x0001
+ #define ENG_CAP_ScreenToScreenCopy 0x0002
+@@ -482,3 +485,5 @@ typedef struct {
+ addr->PKT_SC_dwHeader = (ULONG) (PKT_NULL_CMD); \
+ addr->PKT_SC_dwData[0] = (ULONG) 0; \
+ }
++
++#endif /* AST2DTOOL_H */
+diff -urp -x '*~' -x '*.orig' src/ast_accel.c src/ast_accel.c
+--- src/ast_accel.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_accel.c 2009-04-24 02:03:07.537053000 -0700
+@@ -184,7 +184,12 @@ ASTAccelInit(ScreenPtr pScreen)
{
infoPtr->SetupForSolidFill = ASTSetupForSolidFill;
infoPtr->SubsequentSolidFillRect = ASTSubsequentSolidFillRect;
@@ -55,10 +216,10 @@
}
/* Solid Lines */
-diff -ur orig/ast_cursor.c src/ast_cursor.c
---- orig/ast_cursor.c Thu Apr 16 17:05:33 2009
-+++ src/ast_cursor.c Wed Apr 8 15:03:05 2009
-@@ -84,9 +84,14 @@
+diff -urp -x '*~' -x '*.orig' src/ast_cursor.c src/ast_cursor.c
+--- src/ast_cursor.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_cursor.c 2009-04-24 02:03:07.538408000 -0700
+@@ -84,9 +84,14 @@ ASTCursorInit(ScreenPtr pScreen)
pAST->HWCInfoPtr = infoPtr;
@@ -73,7 +234,7 @@
infoPtr->MaxWidth = MAX_HWC_WIDTH;
infoPtr->MaxHeight = MAX_HWC_HEIGHT;
-@@ -137,6 +142,7 @@
+@@ -137,6 +142,7 @@ ASTShowCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
UCHAR jReg;
@@ -81,17 +242,15 @@
jReg= 0x02;
if (pAST->HWCInfo.cursortype ==HWC_COLOR)
-@@ -150,7 +156,8 @@
+@@ -150,6 +156,7 @@ void
ASTHideCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
--
+ ASTDECL_FD
-+
+
SetIndexRegMask(CRTC_PORT, 0xCB, 0xFC, 0x00); /* disable HWC */
- }
-@@ -162,6 +169,7 @@
+@@ -162,6 +169,7 @@ ASTSetCursorPosition(ScrnInfoPtr pScrn,
DisplayModePtr mode = pAST->ModePtr;
int x_offset, y_offset;
UCHAR *pjSignature;
@@ -99,7 +258,7 @@
/* Set cursor info to Offscreen */
pjSignature = (UCHAR *) pAST->HWCInfo.pjHWCVirtualAddr + (HWC_SIZE+HWC_SIGNATURE_SIZE)*pAST->HWCInfo.HWC_NUM_Next + HWC_SIZE;
-@@ -215,6 +223,7 @@
+@@ -219,6 +227,7 @@ ASTLoadCursorImage(ScrnInfoPtr pScrn, UC
UCHAR jTempSrcAnd32, jTempSrcXor32;
ULONG ulCheckSum = 0;
ULONG ulPatternAddr;
@@ -107,7 +266,7 @@
/* init cursor info. */
pAST->HWCInfo.cursortype = HWC_MONO;
-@@ -309,6 +318,7 @@
+@@ -317,6 +326,7 @@ ASTLoadCursorARGB(ScrnInfoPtr pScrn, Cur
} usData16;
ULONG ulCheckSum = 0;
ULONG ulPatternAddr;
@@ -115,7 +274,7 @@
/* init cursor info. */
pAST->HWCInfo.cursortype = HWC_COLOR;
-@@ -396,6 +406,7 @@
+@@ -404,6 +414,7 @@ static void
ASTFireCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -123,10 +282,29 @@
SetIndexRegMask(CRTC_PORT, 0xCB, 0xFF, 0x00); /* dummp write to fire HWC */
-diff -ur orig/ast_driver.c src/ast_driver.c
---- orig/ast_driver.c Thu Apr 16 17:05:56 2009
-+++ src/ast_driver.c Thu Apr 9 18:32:00 2009
-@@ -74,6 +74,14 @@
+diff -urp -x '*~' -x '*.orig' src/ast_cursor.h src/ast_cursor.h
+--- src/ast_cursor.h 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_cursor.h 2009-04-24 02:03:07.538932000 -0700
+@@ -20,6 +20,9 @@
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#ifndef ASTCURSOR_H
++#define ASTCURSOR_H
++
+ #define MAX_HWC_WIDTH 64
+ #define MAX_HWC_HEIGHT 64
+ #define HWC_SIZE (MAX_HWC_WIDTH*MAX_HWC_HEIGHT*2)
+@@ -37,3 +40,5 @@
+ #define HWC_SIGNATURE_Y 0x10
+ #define HWC_SIGNATURE_HOTSPOTX 0x14
+ #define HWC_SIGNATURE_HOTSPOTY 0x18
++
++#endif /* ASTCURSOR_H */
+diff -urp -x '*~' -x '*.orig' src/ast_driver.c src/ast_driver.c
+--- src/ast_driver.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_driver.c 2009-04-24 02:03:07.541179000 -0700
+@@ -74,6 +74,14 @@ extern Bool ASTSetMode(ScrnInfoPtr pScrn
extern Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
extern void vInitDRAMReg(ScrnInfoPtr pScrn);
@@ -141,7 +319,7 @@
extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
-@@ -97,7 +105,7 @@
+@@ -97,7 +105,7 @@ static void ASTFreeScreen(int scrnIndex,
static ModeStatus ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags);
/* Internally used functions */
@@ -150,18 +328,7 @@
static void ASTFreeRec(ScrnInfoPtr pScrn);
static Bool ASTSaveScreen(ScreenPtr pScreen, Bool unblack);
static Bool ASTCloseScreen(int scrnIndex, ScreenPtr pScreen);
-@@ -151,8 +159,8 @@
- {OPTION_MMIO2D, "MMIO2D", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_SW_CURSOR, "SWCursor", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_HWC_NUM, "HWCNumber", OPTV_INTEGER, {0}, FALSE},
-- {OPTION_ENG_CAPS, "ENGCaps", OPTV_INTEGER, {0}, FALSE},
-- {OPTION_DBG_SELECT, "DBGSelect", OPTV_INTEGER, {0}, FALSE},
-+ {OPTION_ENG_CAPS, "ENGCaps", OPTV_INTEGER, {0}, FALSE},
-+ {OPTION_DBG_SELECT, "DBGSelect", OPTV_INTEGER, {0}, FALSE},
- {OPTION_NO_DDC, "NoDDC", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_VGA2_CLONE, "VGA2Clone", OPTV_BOOLEAN, {0}, FALSE},
- {-1, NULL, OPTV_NONE, {0}, FALSE}
-@@ -283,10 +291,14 @@
+@@ -283,10 +291,14 @@ astSetup(pointer module, pointer opts, i
* Tell the loader about symbols from other modules that this module
* might refer to.
*/
@@ -176,7 +343,7 @@
/*
* The return value must be non-NULL on success even though there
-@@ -347,7 +359,7 @@
+@@ -347,7 +359,7 @@ ASTProbe(DriverPtr drv, int flags)
return FALSE;
}
@@ -185,7 +352,7 @@
/*
* This probing is just checking the PCI data the server already
* collected.
-@@ -357,6 +369,7 @@
+@@ -357,6 +369,7 @@ ASTProbe(DriverPtr drv, int flags)
}
#endif
@@ -193,12 +360,12 @@
numUsed = xf86MatchPciInstances(AST_NAME, PCI_VENDOR_AST,
ASTChipsets, ASTPciChipsets,
devSections, numDevSections,
-@@ -400,7 +413,34 @@
+@@ -400,6 +413,33 @@ ASTProbe(DriverPtr drv, int flags)
} /* end of if flags */
xfree(usedChips);
+#else
-
++
+ for (i = 0; i < numDevSections; i++) {
+
+ ScrnInfoPtr pScrn = NULL;
@@ -222,13 +389,12 @@
+ foundScreen = TRUE;
+ }
+ }
++ xfree(devSections);
+#endif
-+ xfree(devSections);
-+
+
return foundScreen;
}
-
-@@ -415,7 +455,9 @@
+@@ -415,7 +455,9 @@ static Bool
ASTPreInit(ScrnInfoPtr pScrn, int flags)
{
EntityInfoPtr pEnt;
@@ -238,7 +404,7 @@
int flags24;
rgb defaultWeight = { 0, 0, 0 };
-@@ -431,6 +473,10 @@
+@@ -431,6 +473,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -249,7 +415,7 @@
if (flags & PROBE_DETECT) {
ASTProbeDDC(pScrn, pEnt->index);
return TRUE;
-@@ -442,21 +488,25 @@
+@@ -442,20 +488,24 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86RegisterResources(pEnt->index, 0, ResExclusive))
return FALSE;
@@ -264,20 +430,17 @@
if (!xf86LoadSubModule(pScrn, "fb"))
return FALSE;
xf86LoaderReqSymLists(fbSymbols, NULL);
--
-+
+
+#if !(defined(__sparc__))
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn))
return FALSE;
hwp = VGAHWPTR(pScrn);
--
+#endif
-+
+
/* Color Depth Check */
flags24 = Support32bppFb;
- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) {
-@@ -526,7 +576,12 @@
+@@ -526,7 +576,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Fill AST Info */
pAST = ASTPTR(pScrn);
pAST->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -290,7 +453,7 @@
#ifndef XSERVER_LIBPCIACCESS
pAST->PciTag = pciTag(pAST->PciInfo->bus, pAST->PciInfo->device,
pAST->PciInfo->func);
-@@ -573,10 +628,13 @@
+@@ -573,10 +628,13 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Resource Allocation */
pAST->IODBase = pScrn->domainIOBase;
@@ -304,7 +467,7 @@
pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
-@@ -602,7 +660,11 @@
+@@ -602,7 +660,11 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
} else {
if (PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM)) {
@@ -317,7 +480,7 @@
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-@@ -624,6 +686,9 @@
+@@ -624,6 +686,9 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
/* Init VGA Adapter */
if (!xf86IsPrimaryPci(pAST->PciInfo))
{
@@ -327,7 +490,7 @@
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr pInt10;
xf86LoaderReqSymLists(int10Symbols, NULL);
-@@ -631,6 +696,7 @@
+@@ -631,6 +696,7 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
pInt10 = xf86InitInt10(pAST->pEnt->index);
xf86FreeInt10(pInt10);
}
@@ -335,7 +498,7 @@
}
vASTOpenKey(pScrn);
-@@ -787,7 +853,6 @@
+@@ -789,7 +855,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
{
ScrnInfoPtr pScrn;
ASTRecPtr pAST;
@@ -343,29 +506,19 @@
VisualPtr visual;
/* for FB Manager */
-@@ -796,7 +861,6 @@
+@@ -798,7 +863,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
pScrn = xf86Screens[pScreen->myNum];
pAST = ASTPTR(pScrn);
- hwp = VGAHWPTR(pScrn);
-
- /* if (!pAST->noAccel) */
- {
-@@ -805,6 +869,7 @@
-
- FBMemBox.x1 = 0;
- FBMemBox.y1 = 0;
-+
- FBMemBox.x2 = pScrn->displayWidth;
- FBMemBox.y2 = (AvailFBSize / (pScrn->displayWidth * ((pScrn->bitsPerPixel+1)/8))) - 1;
-@@ -814,9 +879,16 @@
- }
+ if (!ASTMapMem(pScrn)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n");
+@@ -822,7 +886,14 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
}
--
+
- vgaHWGetIOBase(hwp);
-
+#if (!defined(__sparc__))
+ {
+ vgaHWPtr hwp;
@@ -374,11 +527,10 @@
+ vgaHWGetIOBase(hwp);
+ }
+#endif
-+
+
vFillASTModeInfo (pScrn);
- ASTSave(pScrn);
-@@ -856,6 +928,10 @@
+@@ -863,6 +934,10 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
}
@@ -389,7 +541,7 @@
if (pScrn->bitsPerPixel > 8) {
/* Fixup RGB ordering */
visual = pScreen->visuals + pScreen->numVisuals;
-@@ -984,8 +1060,10 @@
+@@ -991,8 +1066,10 @@ ASTLeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -401,12 +553,10 @@
#ifdef HWC
if (pAST->pHWCPtr) {
-@@ -1003,8 +1081,11 @@
- vDisable2D(pScrn, pAST);
+@@ -1011,7 +1088,10 @@ ASTLeaveVT(int scrnIndex, int flags)
#endif
-- ASTRestore(pScrn);
-+ ASTRestore(pScrn);
+ ASTRestore(pScrn);
+
+#if (!defined(__sparc__))
vgaHWLock(hwp);
@@ -414,7 +564,7 @@
}
-@@ -1012,8 +1093,11 @@
+@@ -1019,8 +1099,11 @@ static void
ASTFreeScreen(int scrnIndex, int flags)
{
ASTFreeRec(xf86Screens[scrnIndex]);
@@ -426,7 +576,7 @@
}
-@@ -1074,7 +1158,6 @@
+@@ -1081,7 +1164,6 @@ ASTValidMode(int scrnIndex, DisplayModeP
}
@@ -434,7 +584,7 @@
/*
* ASTGetRec and ASTFreeRec --
*
-@@ -1082,7 +1165,7 @@
+@@ -1089,7 +1171,7 @@ ASTValidMode(int scrnIndex, DisplayModeP
* These two functions create and destroy that private data.
*
*/
@@ -443,7 +593,7 @@
ASTGetRec(ScrnInfoPtr pScrn)
{
if (pScrn->driverPrivate)
-@@ -1092,6 +1175,8 @@
+@@ -1099,6 +1181,8 @@ ASTGetRec(ScrnInfoPtr pScrn)
return TRUE;
}
@@ -452,7 +602,7 @@
static void
ASTFreeRec(ScrnInfoPtr pScrn)
{
-@@ -1106,7 +1191,9 @@
+@@ -1113,16 +1197,21 @@ ASTFreeRec(ScrnInfoPtr pScrn)
static Bool
ASTSaveScreen(ScreenPtr pScreen, Bool unblack)
{
@@ -462,7 +612,6 @@
}
static Bool
-@@ -1113,9 +1200,12 @@
ASTCloseScreen(int scrnIndex, ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@@ -476,7 +625,7 @@
if (pScrn->vtSema == TRUE)
{
#ifdef HWC
-@@ -1135,11 +1225,15 @@
+@@ -1142,11 +1231,15 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
#endif
ASTRestore(pScrn);
@@ -492,7 +641,7 @@
if(pAST->AccelInfoPtr) {
XAADestroyInfoRec(pAST->AccelInfoPtr);
-@@ -1159,15 +1253,15 @@
+@@ -1166,12 +1259,12 @@ ASTCloseScreen(int scrnIndex, ScreenPtr
static void
ASTSave(ScrnInfoPtr pScrn)
{
@@ -507,12 +656,8 @@
+ vgaRegPtr vgaReg;
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
astReg = &pAST->SavedReg;
--
-+
- /* do save */
- if (xf86IsPrimaryPci(pAST->PciInfo)) {
- vgaHWSave(pScrn, vgaReg, VGA_SR_ALL);
-@@ -1175,6 +1269,10 @@
+
+@@ -1182,6 +1275,10 @@ ASTSave(ScrnInfoPtr pScrn)
else {
vgaHWSave(pScrn, vgaReg, VGA_SR_MODE);
}
@@ -523,7 +668,7 @@
/* Ext. Save */
vASTOpenKey(pScrn);
-@@ -1191,13 +1289,14 @@
+@@ -1198,12 +1295,12 @@ ASTSave(ScrnInfoPtr pScrn)
static void
ASTRestore(ScrnInfoPtr pScrn)
{
@@ -537,25 +682,21 @@
+#if !defined(__sparc__)
+ vgaRegPtr vgaReg;
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
-+
astReg = &pAST->SavedReg;
- /* do restore */
-@@ -1207,7 +1306,12 @@
+@@ -1214,6 +1311,11 @@ ASTRestore(ScrnInfoPtr pScrn)
else
vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
vgaHWProtect(pScrn, FALSE);
--
+#else
+
+ astReg = &pAST->SavedReg;
+ ASTRestoreHW(pScrn);
+#endif
-+
+
/* Ext. restore */
vASTOpenKey(pScrn);
-
-@@ -1223,6 +1327,19 @@
+@@ -1230,6 +1332,19 @@ ASTRestore(ScrnInfoPtr pScrn)
static void
ASTProbeDDC(ScrnInfoPtr pScrn, int index)
{
@@ -575,7 +716,7 @@
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
-@@ -1230,6 +1347,7 @@
+@@ -1237,6 +1352,7 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
}
@@ -583,7 +724,7 @@
}
#define SkipDT 0x00
-@@ -1239,15 +1357,18 @@
+@@ -1246,15 +1362,18 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
static xf86MonPtr
ASTDoDDC(ScrnInfoPtr pScrn, int index)
{
@@ -605,7 +746,7 @@
/* Honour Option "noDDC" */
if (xf86ReturnOptValBool(pAST->Options, OPTION_NO_DDC, FALSE)) {
return MonInfo;
-@@ -1259,7 +1380,7 @@
+@@ -1266,7 +1385,7 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
MonInfo = MonInfo1;
/* For VGA2 CLONE Support, ycchen@012508 */
@@ -614,7 +755,7 @@
if (GetVGA2EDID(pScrn, DDC_data) == TRUE) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Get VGA2 EDID Correctly!! \n");
MonInfo2 = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
-@@ -1406,6 +1527,31 @@
+@@ -1413,6 +1532,31 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"this driver cannot do DDC without VBE\n");
}
@@ -646,7 +787,7 @@
return MonInfo;
}
-@@ -1431,9 +1577,14 @@
+@@ -1438,9 +1582,14 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
vgaHWPtr hwp;
ASTRecPtr pAST;
@@ -662,7 +803,7 @@
vgaHWUnlock(hwp);
if (!vgaHWInit(pScrn, mode))
-@@ -1446,6 +1597,10 @@
+@@ -1453,6 +1602,10 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
return FALSE;
vgaHWProtect(pScrn, FALSE);
@@ -673,10 +814,10 @@
return TRUE;
}
-diff -ur orig/ast_mode.c src/ast_mode.c
---- orig/ast_mode.c Thu Apr 16 17:06:05 2009
-+++ src/ast_mode.c Thu Apr 9 13:57:22 2009
-@@ -392,11 +392,9 @@
+diff -urp -x '*~' -x '*.orig' src/ast_mode.c src/ast_mode.c
+--- src/ast_mode.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_mode.c 2009-04-24 02:03:07.543155000 -0700
+@@ -392,11 +392,9 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayMod
Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -689,24 +830,22 @@
switch (pScrn->bitsPerPixel)
{
-@@ -489,14 +487,12 @@
-
+@@ -490,13 +488,12 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr
void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
--
+
+ ASTDECL
PVBIOS_STDTABLE_STRUCT pStdModePtr;
- ASTRecPtr pAST;
ULONG i;
UCHAR jReg;
--
-+
+
pStdModePtr = pVGAModeInfo->pStdTableEntry;
- pAST = ASTPTR(pScrn);
/* Set Misc */
jReg = pStdModePtr->MISC;
-@@ -520,7 +516,7 @@
+@@ -520,7 +517,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
}
/* Set AR */
@@ -715,7 +854,7 @@
for (i=0; i<20; i++)
{
jReg = pStdModePtr->AR[i];
-@@ -530,7 +526,7 @@
+@@ -530,7 +527,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
SetReg(AR_PORT_WRITE, 0x14);
SetReg(AR_PORT_WRITE, 0x00);
@@ -724,7 +863,7 @@
SetReg (AR_PORT_WRITE, 0x20); /* set POS */
/* Set GR */
-@@ -547,11 +543,10 @@
+@@ -547,11 +544,10 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
void
vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -737,7 +876,7 @@
jReg05 = jReg07 = jReg09 = jRegAC = jRegAD = jRegAE = 0;
/* unlock CRTC */
-@@ -621,11 +616,9 @@
+@@ -621,11 +617,9 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayMo
void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -750,7 +889,7 @@
usOffset = pAST->VideoModeInfo.ScreenPitch >> 3; /* Unit: char */
SetIndexReg(CRTC_PORT,0x13, (UCHAR) (usOffset & 0xFF));
-@@ -635,11 +628,9 @@
+@@ -635,11 +629,9 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, Di
void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -763,11 +902,10 @@
pEnhModePtr = pVGAModeInfo->pEnhTableEntry;
pDCLKPtr = &DCLKTable[pEnhModePtr->DCLKIndex];
-@@ -653,12 +644,10 @@
-
+@@ -654,11 +646,10 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, Disp
void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
--
+
- ASTRecPtr pAST;
+ ASTDECL
UCHAR jRegA0, jRegA3, jRegA8;
@@ -778,7 +916,7 @@
jRegA0=jRegA3=jRegA8=0;
/* Mode Type Setting */
switch (pScrn->bitsPerPixel) {
-@@ -683,6 +672,14 @@
+@@ -683,6 +674,14 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
SetIndexRegMask(CRTC_PORT,0xA3, 0xF0, (UCHAR) jRegA3);
SetIndexRegMask(CRTC_PORT,0xA8, 0xFD, (UCHAR) jRegA8);
@@ -793,7 +931,7 @@
/* Set Threshold */
if ((pAST->jChipType == AST2100) || (pAST->jChipType == AST1100) || (pAST->jChipType == AST2200) || (pAST->jChipType == AST2150) )
{
-@@ -699,14 +696,13 @@
+@@ -699,14 +698,13 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -810,7 +948,7 @@
jReg |= (UCHAR) (pEnhModePtr->Flags & SyncNN);
SetReg(MISC_PORT_WRITE,jReg);
-@@ -714,13 +710,11 @@
+@@ -714,13 +712,11 @@ void vSetSyncReg(ScrnInfoPtr pScrn, Disp
Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
{
@@ -825,10 +963,29 @@
switch (pScrn->bitsPerPixel)
{
case 8:
-diff -ur orig/ast_tool.c src/ast_tool.c
---- orig/ast_tool.c Thu Apr 16 17:06:15 2009
-+++ src/ast_tool.c Fri Apr 10 11:44:50 2009
-@@ -62,16 +62,29 @@
+diff -urp -x '*~' -x '*.orig' src/ast_mode.h src/ast_mode.h
+--- src/ast_mode.h 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_mode.h 2009-04-24 02:03:07.544063000 -0700
+@@ -20,6 +20,9 @@
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#ifndef ASTMODE_H
++#define ASTMODE_H
++
+ /* Mode Limitation */
+ #define MAX_HResolution 1920
+ #define MAX_VResolution 1200
+@@ -115,3 +118,5 @@ typedef struct {
+ PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
+
+ } VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
++
++#endif /* ASTMODE_H */
+diff -urp -x '*~' -x '*.orig' src/ast_tool.c src/ast_tool.c
+--- src/ast_tool.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_tool.c 2009-04-24 02:03:07.544930000 -0700
+@@ -62,16 +62,29 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn);
Bool ASTMapMMIO(ScrnInfoPtr pScrn);
void ASTUnmapMMIO(ScrnInfoPtr pScrn);
@@ -859,7 +1016,7 @@
{
void** result = (void**)&pAST->FBVirtualAddr;
int err = pci_device_map_range(pAST->PciInfo,
-@@ -97,10 +110,14 @@
+@@ -97,10 +110,14 @@ ASTUnmapMem(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -875,7 +1032,7 @@
pci_device_unmap_range(pAST->PciInfo, pAST->FBVirtualAddr, pAST->FbMapSize);
#endif
-@@ -113,7 +130,7 @@
+@@ -113,7 +130,7 @@ Bool
ASTMapMMIO(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -884,11 +1041,10 @@
int mmioFlags;
#if !defined(__alpha__)
-@@ -122,10 +139,15 @@
- mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT | VIDMEM_SPARSE;
+@@ -123,9 +140,15 @@ ASTMapMMIO(ScrnInfoPtr pScrn)
#endif
--
+
+#if !defined(__sparc__)
pAST->MMIOVirtualAddr = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
pAST->PciTag,
@@ -901,7 +1057,7 @@
#else
{
-@@ -152,10 +174,14 @@
+@@ -152,10 +175,14 @@ ASTUnmapMMIO(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -917,10 +1073,10 @@
pci_device_unmap_range(pAST->PciInfo, pAST->MMIOVirtualAddr, pAST->MMIOMapSize);
#endif
pAST->MMIOVirtualAddr = 0;
-diff -ur orig/ast_vgatool.c src/ast_vgatool.c
---- orig/ast_vgatool.c Thu Apr 16 17:07:11 2009
-+++ src/ast_vgatool.c Thu Apr 9 18:34:02 2009
-@@ -69,24 +69,47 @@
+diff -urp -x '*~' -x '*.orig' src/ast_vgatool.c src/ast_vgatool.c
+--- src/ast_vgatool.c 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_vgatool.c 2009-04-24 02:03:07.548007000 -0700
+@@ -69,11 +69,15 @@ void vASTLoadPalette(ScrnInfoPtr pScrn,
void ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
void vInitDRAMReg(ScrnInfoPtr pScrn);
@@ -933,13 +1089,11 @@
vASTOpenKey(ScrnInfoPtr pScrn)
{
- ASTRecPtr pAST = ASTPTR(pScrn);
--
+ ASTDECL
-+
+
SetIndexReg(CRTC_PORT,0x80, 0xA8);
--
- }
-
+
+@@ -82,11 +86,31 @@ vASTOpenKey(ScrnInfoPtr pScrn)
Bool
bASTRegInit(ScrnInfoPtr pScrn)
{
@@ -972,7 +1126,7 @@
return (TRUE);
}
-@@ -94,7 +117,7 @@
+@@ -94,7 +118,7 @@ bASTRegInit(ScrnInfoPtr pScrn)
ULONG
GetVRAMInfo(ScrnInfoPtr pScrn)
{
@@ -981,7 +1135,7 @@
UCHAR jReg;
vASTOpenKey(pScrn);
-@@ -120,13 +143,13 @@
+@@ -120,7 +144,7 @@ GetVRAMInfo(ScrnInfoPtr pScrn)
ULONG
GetMaxDCLK(ScrnInfoPtr pScrn)
{
@@ -990,14 +1144,7 @@
UCHAR jReg;
ULONG ulData, ulData2;
ULONG ulRefPLL, ulDeNumerator, ulNumerator, ulDivider;
- ULONG ulDRAMBusWidth, ulMCLK, ulDRAMBandwidth, ActualDRAMBandwidth, DRAMEfficiency = 500;
- ULONG ulDCLK;
--
-+
- vASTOpenKey(pScrn);
-
- *(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000;
-@@ -209,7 +232,7 @@
+@@ -209,7 +233,7 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
void
GetChipType(ScrnInfoPtr pScrn)
{
@@ -1006,47 +1153,33 @@
ULONG ulData;
UCHAR jReg;
-@@ -253,9 +276,11 @@
+@@ -253,6 +277,8 @@ GetChipType(ScrnInfoPtr pScrn)
void
vSetStartAddressCRT1(ASTRecPtr pAST, ULONG base)
{
-- SetIndexReg(CRTC_PORT,0x0D, (UCHAR) (base & 0xFF));
-- SetIndexReg(CRTC_PORT,0x0C, (UCHAR) ((base >> 8) & 0xFF));
-- SetIndexReg(CRTC_PORT,0xAF, (UCHAR) ((base >> 16) & 0xFF));
-+ ASTDECL_FD
++ ASTDECL_FD
+
-+ SetIndexReg(CRTC_PORT,0x0D, (UCHAR) (base & 0xFF));
-+ SetIndexReg(CRTC_PORT,0x0C, (UCHAR) ((base >> 8) & 0xFF));
-+ SetIndexReg(CRTC_PORT,0xAF, (UCHAR) ((base >> 16) & 0xFF));
-
- }
-
-@@ -262,8 +287,9 @@
+ SetIndexReg(CRTC_PORT,0x0D, (UCHAR) (base & 0xFF));
+ SetIndexReg(CRTC_PORT,0x0C, (UCHAR) ((base >> 8) & 0xFF));
+ SetIndexReg(CRTC_PORT,0xAF, (UCHAR) ((base >> 16) & 0xFF));
+@@ -262,6 +288,8 @@ vSetStartAddressCRT1(ASTRecPtr pAST, ULO
void
vAST1000DisplayOff(ASTRecPtr pAST)
{
-- SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x20);
--
-+ ASTDECL_FD
++ ASTDECL_FD
+
-+ SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x20);
+ SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x20);
+
}
-
-
-@@ -270,9 +296,9 @@
+@@ -270,6 +298,7 @@ vAST1000DisplayOff(ASTRecPtr pAST)
void
vAST1000DisplayOn(ASTRecPtr pAST)
{
--
-- SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x00);
--
-+ ASTDECL_FD
-+
-+ SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x00);
- }
-
-
-@@ -280,11 +306,10 @@
++ ASTDECL_FD
+
+ SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x00);
+
+@@ -280,8 +309,7 @@ void
vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
VisualPtr pVisual)
{
@@ -1055,12 +1188,8 @@
+ ASTDECL
int i, j, index;
UCHAR DACIndex, DACR, DACG, DACB;
--
-+
- switch (pScrn->bitsPerPixel) {
- case 15:
- for(i=0; i<numColors; i++) {
-@@ -344,10 +369,10 @@
+
+@@ -344,10 +372,10 @@ vASTLoadPalette(ScrnInfoPtr pScrn, int n
void
ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
{
@@ -1073,17 +1202,15 @@
SEQ01=CRB6=0;
vASTOpenKey(pScrn);
-@@ -377,8 +402,8 @@
+@@ -377,6 +405,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
SetIndexRegMask(SEQ_PORT,0x01, 0xDF, SEQ01);
SetIndexRegMask(CRTC_PORT,0xB6, 0xFC, CRB6);
+#endif
--
+
}
-
- #define I2C_BASE 0x1e780000
-@@ -557,7 +582,7 @@
+@@ -557,7 +586,7 @@ AST_DRAMStruct AST1100DRAMTableData[] =
{ 0x0030, 0x00000040 },
{ 0x0028, 0x00000003 },
{ 0x000C, 0x00005a21 },
@@ -1092,7 +1219,7 @@
{ 0x0120, 0x00004c41 },
{ 0xffff, 0xffffffff },
};
-@@ -610,7 +635,7 @@
+@@ -610,15 +639,15 @@ AST_DRAMStruct AST2100DRAMTableData[] =
{ 0x0030, 0x00000040 },
{ 0x0028, 0x00000003 },
{ 0x000C, 0x00005a21 },
@@ -1101,7 +1228,6 @@
{ 0x0120, 0x00005061 },
{ 0xffff, 0xffffffff },
};
-@@ -617,8 +642,8 @@
void vInitDRAMReg(ScrnInfoPtr pScrn)
{
@@ -1111,7 +1237,7 @@
ULONG i, ulTemp;
UCHAR jReg;
-@@ -708,3 +733,334 @@
+@@ -708,3 +737,334 @@ void vInitDRAMReg(ScrnInfoPtr pScrn)
} while ((jReg & 0x40) == 0);
} /* vInitDRAMReg */
@@ -1446,9 +1572,9 @@
+
+} /* GetVGAEDID */
+#endif /* __sparc__ */
-diff -ur orig/ast_vgatool.h src/ast_vgatool.h
---- orig/ast_vgatool.h Thu Apr 16 17:07:25 2009
-+++ src/ast_vgatool.h Mon Apr 20 15:04:07 2009
+diff -urp -x '*~' -x '*.orig' src/ast_vgatool.h src/ast_vgatool.h
+--- src/ast_vgatool.h 2009-04-13 18:32:28.000000000 -0700
++++ src/ast_vgatool.h 2009-04-24 02:03:07.549164000 -0700
@@ -20,6 +20,12 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
@@ -1594,211 +1720,3 @@
+}
+
+#endif /* ASTVGATOOL_H */
-diff -ur orig/ast.h src/ast.h
---- orig/ast.h Thu Apr 16 17:04:42 2009
-+++ src/ast.h Tue Apr 21 09:18:02 2009
-@@ -20,9 +20,18 @@
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#ifndef AST_H
-+#define AST_H
-+
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/visual_io.h>
-
-+#ifdef __sparc
-+#define __sparc__ 1
-+#endif
-+
-+
- #include "ast_pcirename.h"
-
- /* Compiler Options */
-@@ -82,7 +91,16 @@
- /* Data Structure Definition */
- typedef struct _ASTRegRec {
- UCHAR ExtCRTC[0x50];
--
-+
-+#if (defined(__sparc__))
-+ UCHAR MISC;
-+ UCHAR SEQ[4];
-+ UCHAR CRTC[25];
-+ UCHAR AR[20];
-+ UCHAR GR[9];
-+ UCHAR DAC[256][3];
-+#endif
-+
- } ASTRegRec, *ASTRegPtr;
-
- typedef struct _VIDEOMODE {
-@@ -185,13 +203,109 @@
- HWCINFO HWCInfo;
- ULONG ulCMDReg;
- Bool EnableClip;
--
-+
-+#if defined(__sparc__)
-+ char *deviceName;
-+ int fd;
-+#endif /* __sparc__ */
-+
- } ASTRec, *ASTRecPtr;
-
- #define ASTPTR(p) ((ASTRecPtr)((p)->driverPrivate))
-
-+#if defined(__sparc__)
-+#define ASTDECL \
-+ ASTRecPtr pAST = ASTPTR(pScrn); \
-+ int fd = pAST->fd;
-+
-+#define ASTDECL_FD \
-+ int fd = pAST->fd;
-+
-+#ifndef VIS_GETPCICONFIG
-+
-+/*
-+ * These definitions will be removed when they are included in the
-+ * visual_io.h
-+ */
-+#define VIS_GETVIDEOMODENAME (VIOC | 12)
-+#define VIS_STOREVIDEOMODENAME (VIOC | 13)
-+#define VIS_MAX_VMODE_LEN 48
-+
-+typedef struct vis_video_mode {
-+ char mode_name[VIS_MAX_VMODE_LEN];
-+ uint32_t vRefresh;
-+ char pad[96];
-+} vis_video_mode_t;
-+
-+
-+#define VIS_GETPCICONFIG (VIOC | 14)
-+
-+typedef struct vis_pci_cfg {
-+ uint16_t VendorID;
-+ uint16_t DeviceID;
-+ uint16_t Command;
-+ uint16_t Status;
-+ uint8_t RevisionID;
-+ uint8_t ProgIF;
-+ uint8_t SubClass;
-+ uint8_t BaseClass;
-+
-+ uint8_t CacheLineSize;
-+ uint8_t LatencyTimer;
-+ uint8_t HeaderType;
-+ uint8_t BIST;
-+
-+ uint32_t bar[6];
-+ uint32_t CIS;
-+ uint16_t SubVendorID;
-+ uint16_t SubSystemID;
-+ uint32_t ROMBaseAddress;
-+
-+ uint8_t CapabilitiesPtr;
-+ uint8_t Reserved_1[3];
-+ uint32_t Reserved_2;
-+
-+ uint8_t InterruptLine;
-+ uint8_t InterruptPin;
-+ uint8_t MinimumGrant;
-+ uint8_t MaximumLatency;
-+
-+ uint8_t pad[100];
-+} vis_pci_cfg_t;
-+
-+
-+#define VIS_SETIOREG (VIOC | 17)
-+#define VIS_GETIOREG (VIOC | 18)
-+
-+typedef struct vis_io_reg {
-+ uchar_t offset;
-+ uchar_t value;
-+} vis_io_reg_t;
-+#endif
-+
-+
-+extern struct pci_device *ASTGetPciInfo(ASTRecPtr);
-+extern ScrnInfoPtr ASTAllocScreen(DriverPtr, GDevPtr);
-+extern pointer ASTMapVidMem(ScrnInfoPtr, unsigned int, PCITAG,
-+ unsigned long, unsigned long);
-+extern void ASTUnmapVidMem(ScrnInfoPtr, pointer, unsigned long);
-+extern void ASTNotifyModeChanged(ScrnInfoPtr);
-+extern void ASTSaveHW(ScrnInfoPtr);
-+extern void ASTRestoreHW(ScrnInfoPtr);
-+
-+#else
-+
-+#define ASTDECL \
-+ ASTRecPtr pAST = ASTPTR(pScrn);
-+
-+#define ASTDECL_FD
-+
-+#endif
-+
- /* Include Files */
- #include "ast_mode.h"
- #include "ast_vgatool.h"
- #include "ast_2dtool.h"
- #include "ast_cursor.h"
-+
-+#endif /* AST_H */
-diff -ur orig/ast_2dtool.h src/ast_2dtool.h
---- orig/ast_2dtool.h Thu Apr 16 17:04:10 2009
-+++ src/ast_2dtool.h Mon Apr 20 15:03:14 2009
-@@ -20,6 +20,9 @@
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#ifndef AST2DTOOL_H
-+#define AST2DTOOL_H
-+
- /* Eng Capability Definition */
- #define ENG_CAP_Sync 0x0001
- #define ENG_CAP_ScreenToScreenCopy 0x0002
-@@ -482,3 +485,5 @@
- addr->PKT_SC_dwHeader = (ULONG) (PKT_NULL_CMD); \
- addr->PKT_SC_dwData[0] = (ULONG) 0; \
- }
-+
-+#endif /* AST2DTOOL_H */
-diff -ur orig/ast_cursor.c src/ast_cursor.h
---- orig/ast_cursor.h Thu Apr 16 17:05:42 2009
-+++ src/ast_cursor.h Mon Apr 20 15:03:30 2009
-@@ -20,6 +20,9 @@
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#ifndef ASTCURSOR_H
-+#define ASTCURSOR_H
-+
- #define MAX_HWC_WIDTH 64
- #define MAX_HWC_HEIGHT 64
- #define HWC_SIZE (MAX_HWC_WIDTH*MAX_HWC_HEIGHT*2)
-@@ -37,3 +40,5 @@
- #define HWC_SIGNATURE_Y 0x10
- #define HWC_SIGNATURE_HOTSPOTX 0x14
- #define HWC_SIGNATURE_HOTSPOTY 0x18
-+
-+#endif /* ASTCURSOR_H */
-diff -ur orig/ast_mode.c src/ast_mode.h
---- orig/ast_mode.h Thu Apr 16 17:04:10 2009
-+++ src/ast_mode.h Mon Apr 20 15:03:45 2009
-@@ -20,6 +20,9 @@
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#ifndef ASTMODE_H
-+#define ASTMODE_H
-+
- /* Mode Limitation */
- #define MAX_HResolution 1920
- #define MAX_VResolution 1200
-@@ -115,3 +118,5 @@
- PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
-
- } VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
-+
-+#endif /* ASTMODE_H */
--- a/open-src/driver/xf86-video-ati/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-ati/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,3579 +1,259 @@
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+Copyright (c) 1995-2003 by The XFree86 Project, Inc.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS 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.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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).
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Manuel Teira
- * Leif Delgass <[email protected]>
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+Copyright 2004, 2005 Eric Anholt
+Copyright 2005 Benjamin Herrenschmidt
+Copyright 2006 Tungsten Graphics, Inc.
+All Rights Reserved.
+Copyright � 2006 Intel Corporation
+Copyright 2006 Luc Verhaegen.
+Copyright 2007 George Sapountzis
+Copyright 2007, 2008 Red Hat, Inc.
+Copyright 2007, 2008 Advanced Micro Devices, Inc.
+Copyright 2008 Alex Deucher
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION 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 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION 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 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2004 Adam Jackson.
- *
- * 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 AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2004 Adam Jackson.
- *
- * 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 AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
+Copyright 2005-2007 Luc Verhaegen.
+Copyright 2006-2007 Advanced Micro Devices, Inc.
+Copyright 2007 Egbert Eich <[email protected]>
+Copyright 2007 Matthias Hopf <[email protected]>
+Copyright (C) 2008-2009 Advanced Micro Devices, Inc.
+Copyright (C) 2008-2009 Matthias Hopf
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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-2000 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- * Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS 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.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Manuel Teira
- * Leif Delgass <[email protected]>
-
+Copyright (C) 2008-2009 Alexander Deucher
+Copyright (C) 2008-2009 Matthias Hopf
- * Copyright 2006 George Sapountzis
- * All Rights Reserved.
- *
- * Based on the mach64 DRI and DRM drivers:
- * Copyright 2000 Gareth Hughes
- * Copyright 2002-2003 Leif Delgass
- * All Rights Reserved.
- *
- * Based on the ati hw/kdrive driver:
- * Copyright 2003 Eric Anholt, Anders Carlsson
- *
- * Based on the via hw/xfree86 driver:
- * Copyright 2006 Thomas Hellstrom. 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.
- *
- * Authors:
- * George Sapountzis <[email protected]>
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[email protected]>
-
+------------------------------------------------------------------------
+Copyright (C) 2005 Bogdan D. [email protected]
- * Copyright (c) 1995-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Acknowledgements:
- * Jake Richter, Panacea Inc., Londonderry, New Hampshire, U.S.A.
- * Kevin E. Martin, [email protected]
- * Tiago Gons, [email protected]
- * Rickard E. Faith, [email protected]
- * Scott Laird, [email protected]
- *
- * The intent here is to list all I/O ports for VGA (and its predecessors),
- * ATI VGA Wonder, 8514/A, ATI Mach8, ATI Mach32 and ATI Mach64 video adapters,
- * not just the ones in use by the ATI driver.
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Gareth Hughes <[email protected]>
- * José Fonseca <[email protected]>
- * Leif Delgass <[email protected]>
-
+Except as contained in this notice, the name of the author shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+author.
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Gareth Hughes <[email protected]>
- * Leif Delgass <[email protected]>
-
+------------------------------------------------------------------------
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2006, 2007 Keith Packard
+Copyright © 2008 Red Hat, Inc.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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.
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- mach64_common.h -- common header definitions for Rage Pro 2D/3D/DRM suite
- * Created: Sun Dec 03 11:34:16 2000 by [email protected]
- *
- * Copyright 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author:
- * Gareth Hughes <[email protected]>
- * Leif Delgass <[email protected]>
-
-
- * Copyright 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION 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 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION 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 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of Marc Aurele La France not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. Marc Aurele La France makes no representations
+about the suitability of this software for any purpose. It is provided
+"as-is" without express or implied warranty.
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS 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.
-
- r128_common.h -- common header definitions for R128 2D/3D/DRM suite
- * Created: Sun Apr 9 18:16:28 2000 by [email protected]
- *
- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author:
- * Gareth Hughes <[email protected]>
- * Kevin E. Martin <[email protected]>
- *
- * Converted to common header format:
- * Jens Owen <[email protected]>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h,v 1.2 2002/12/16 16:19:10 dawes Exp $
- *
-
+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
+Copyright (c) 1997 Metro Link Incorporated
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+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, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS 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.
-
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
- * Precision Insight, Inc., Cedar Park, Texas, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, PRECISION INSIGHT, VA LINUX
- * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+THE SOFTWARE IS PROVIDED "AS 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.
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
+------------------------------------------------------------------------
- * Copyright 2004 ATI Technologies Inc., Markham, Ontario
- *
- * 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 ATI, VA LINUX SYSTEMS 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.
-
- radeon_common.h -- common header definitions for Radeon 2D/3D/DRM suite
- *
- * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author:
- * Gareth Hughes <[email protected]>
- * Kevin E. Martin <[email protected]>
- * Keith Whitwell <[email protected]>
- *
- * Converted to common header format:
- * Jens Owen <[email protected]>
- *
- * $XdotOrg: driver/xf86-video-ati/src/radeon_common.h,v 1.7 2005/09/11 08:51:38 airlied Exp $
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8tsi Exp $
- *
-
+Copyright 2000 ATI Technologies Inc., Markham, Ontario,
+ VA Linux Systems Inc., Fremont, California.
+Copyright 2004 ATI Technologies Inc., Markham, Ontario
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS 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.
-
+All Rights Reserved.
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario,
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
+Permission 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:
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario,
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario,
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2005 Eric Anholt
- * Copyright 2005 Benjamin Herrenschmidt
- * 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.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- * Zack Rusin <[email protected]>
- * Benjamin Herrenschmidt <[email protected]>
- *
-
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
- * Copyright 2005 Eric Anholt
- * Copyright 2005 Benjamin Herrenschmidt
- * Copyright 2006 Tungsten Graphics, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- * Zack Rusin <[email protected]>
- * Benjamin Herrenschmidt <[email protected]>
- * Michel Dänzer <[email protected]>
- *
-
-
- * Copyright 2005 Eric Anholt
- * Copyright 2005 Benjamin Herrenschmidt
- * 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.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- * Zack Rusin <[email protected]>
- * Benjamin Herrenschmidt <[email protected]>
- *
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS 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.
-
+THE SOFTWARE IS PROVIDED "AS 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 ATI, VA LINUX SYSTEMS AND/OR
+THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
- * Copyright 2003 Alex Deucher.
- *
- * 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 ALEX DEUCHER, OR ANY OTHER
- * CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2003 Alex Deucher.
- *
- * 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 ALEX DEUCHER, OR ANY OTHER
- * CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION 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 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
+Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+All rights reserved.
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2004 Eric Anholt
- * 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.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- * Hui Yu <[email protected]>
- *
-
-
- * Copyright 2000 ATI Technologies Inc., Markham, Ontario,
- * VA Linux Systems Inc., Fremont, California.
- *
- * 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 ATI, VA LINUX SYSTEMS AND/OR
- * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
+Permission 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 2000 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-************************************************************************************
- * $Id$
- *
- * Copyright (C) 2005 Bogdan D. [email protected]
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this Software without prior written
- * authorization from the author.
- *
- * $Log$
- * Revision 1.6 2006/03/22 22:30:14 krh
- * 2006-03-22 Kristian Høgsberg <[email protected]>
- *
- * * src/theatre200.c: Convert use of xf86fopen() and other xf86
- * wrapped libc symbols to use libc symbols directly. The xf86*
- * versions aren't supposed to be used directly.
- *
- * * src/ *.c: Drop libc wrapper; don't include xf86_ansic.h and add
- * includes now missing.
- *
- * Revision 1.4 2005/08/28 18:00:23 bogdand
- * Modified the licens type from GPL to a X/MIT one
- *
- * Revision 1.3 2005/07/11 02:29:45 ajax
- * Prep for modular builds by adding guarded #include "config.h" everywhere.
- *
- * Revision 1.2 2005/07/01 22:43:11 daniels
- * Change all misc.h and os.h references to <X11/foo.h>.
- *
- *
- ***********************************************************************************
-************************************************************************************
- * $Id$
- *
- * Copyright (C) 2005 Bogdan D. [email protected]
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this Software without prior written
- * authorization from the author.
- *
- * $Log$
- * Revision 1.5 2005/12/08 17:54:40 kem
- * Allow hard-coded paths to be configurable.
- *
- * Revision 1.4 2005/11/07 19:28:40 bogdand
- * Replaced the variadic macros(gcc) by macros according to C99 standard
- *
- * Revision 1.3 2005/08/28 18:00:23 bogdand
- * Modified the licens type from GPL to a X/MIT one
- *
- * Revision 1.2 2005/07/01 22:43:11 daniels
- * Change all misc.h and os.h references to <X11/foo.h>.
- *
- *
- ***********************************************************************************
-************************************************************************************
- * $Id$
- *
- * Copyright (C) 2005 Bogdan D. [email protected]
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this Software without prior written
- * authorization from the author.
- *
- * $Log$
- * Revision 1.4 2005/08/28 18:00:23 bogdand
- * Modified the licens type from GPL to a X/MIT one
- *
- * Revision 1.3 2005/07/11 02:29:45 ajax
- * Prep for modular builds by adding guarded #include "config.h" everywhere.
- *
- * Revision 1.2 2005/07/01 22:43:11 daniels
- * Change all misc.h and os.h references to <X11/foo.h>.
- *
- *
- ***********************************************************************************
-************************************************************************************
- * $Id$
- *
- * Copyright (C) 2005 Bogdan D. [email protected]
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this Software without prior written
- * authorization from the author.
- *
- * $Log$
- * Revision 1.3 2005/08/28 18:00:23 bogdand
- * Modified the licens type from GPL to a X/MIT one
- *
- * Revision 1.2 2005/07/01 22:43:11 daniels
- * Change all misc.h and os.h references to <X11/foo.h>.
- *
- *
- ***********************************************************************************
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
--- a/open-src/driver/xf86-video-ati/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.17 09/01/14
+# @(#)Makefile 1.18 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-ati
# Version number (used in path names)
-MODULE_VERSION=6.10.0
+MODULE_VERSION=6.12.2
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
@@ -53,6 +53,10 @@
SUN_PACKAGE=SUNWxorg-graphics-ddx
MODULE_STABILITY=Volatile
+# AtomBios code won't build with Sun compiler
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
+
# Extra flags to pass to configure script
MODULE_CONFIG_OPTS=--enable-dri
--- a/open-src/driver/xf86-video-ati/mapfiles.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-ati/mapfiles.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am 2008-12-26 16:48:57.000000000 -0800
-+++ src/Makefile.am 2009-01-10 19:09:03.425329000 -0800
-@@ -159,3 +159,32 @@ EXTRA_DIST = \
+--- src/Makefile.am 2009-03-31 12:11:10.000000000 -0700
++++ src/Makefile.am 2009-04-08 13:19:15.269540000 -0700
+@@ -165,3 +165,30 @@ EXTRA_DIST = \
pcidb/ati_pciids.csv \
pcidb/parse_pci_ids.pl \
radeon_atombios.h
@@ -42,10 +42,8 @@
+ mapfile-theatre_detect_drv-external \
+ mapfile-theatre_drv-external
+
-+ati_drv_la_LDFLAGS += -lpciaccess
-+
+radeon_drv_la_LDFLAGS += $(radeon_MAPFILES:%=-Wl,-M,%) \
-+ -lexa -lfb -lint10 -lpciaccess -lvbe -lvgahw -lxaa -lshadow \
++ -lexa -lfb -lint10 -lvbe -lvgahw -lxaa -lshadow \
+ -ldrm -ldri -lglx -lm
+
+radeon_drv_la_DEPENDENCIES = $(radeon_MAPFILES)
--- a/open-src/driver/xf86-video-chips/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-chips/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-chips 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 09/01/10
+# @(#)Makefile 1.9 09/05/15
#
# Package name used in tarballs
@@ -54,7 +54,7 @@
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-lfb -lint10 -lpciaccess -lshadowfb -lvbe -lvgahw -lxaa \
- -lxf1bpp -lxf4bpp -lxf8_16bpp
+ -lxf8_16bpp
include ../Makefile.inc
--- a/open-src/driver/xf86-video-cirrus/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
- * Copyright 2000 by Egbert Eich
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * EGBERT EICH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Adapted from: Alan Hourihane, <[email protected]>
- * by: Egbert Eich
-
- Copyright (c) 1999,2000 The XFree86 Project Inc.
- based on code written by Mark Vojkovich <[email protected]>
--- a/open-src/driver/xf86-video-cirrus/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-cirrus/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-cirrus 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 09/01/10
+# @(#)Makefile 1.8 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-cirrus
# Version number (used in path names)
-MODULE_VERSION=1.2.1
+MODULE_VERSION=1.3.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = mapfiles.patch
--- a/open-src/driver/xf86-video-cirrus/mapfiles.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-cirrus/mapfiles.patch Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am 2008-03-19 07:29:23.000000000 -0700
+++ src/Makefile.am 2009-01-10 19:15:45.025364000 -0800
-@@ -57,3 +57,42 @@ cirrus_laguna_la_SOURCES = \
+@@ -57,3 +57,41 @@ cirrus_laguna_la_SOURCES = \
lg_i2c.c \
lg_xaa.c \
lg_xaa.h
@@ -52,8 +52,7 @@
+
+cirrus_alpine_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
-+ -lfb -lint10 -lpciaccess -lshadowfb -lvgahw -lxaa \
-+ -lxf1bpp -lxf4bpp
++ -lfb -lint10 -lpciaccess -lshadowfb -lvgahw -lxaa
+
+cirrus_laguna_la_LDFLAGS += \
+ -Wl,-M,mapfile-cirrus_drv-external \
--- a/open-src/driver/xf86-video-dummy/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-dummy/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-dummy 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 09/01/10
+# @(#)Makefile 1.9 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-dummy
# Version number (used in path names)
-MODULE_VERSION=0.3.0
+MODULE_VERSION=0.3.1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-glint/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-glint/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 09/01/14
+# @(#)Makefile 1.8 09/05/15
#
# Package name used in tarballs
@@ -56,7 +56,7 @@
-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-lfb -lint10 -lpciaccess -lshadowfb -lvbe \
- -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw
+ -lvgahw -lxaa -lfbdevhw
# Extra flags to pass to configure script
# - Disable DRI since the kernel module isn't ported
--- a/open-src/driver/xf86-video-i740/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-i740/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,57 +1,3 @@
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
All Rights Reserved.
@@ -77,220 +23,46 @@
*************************************************************************
- * Copyright 2001 by Patrick LERDA
- *
- * 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 Patrick LERDA not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Patrick LERDA makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LERDA 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: Patrick LERDA
-
+Copyright 2001 by Patrick LERDA
+Portions Copyright by Stephen Blackheath
- * Copyright 2001 by Patrick LERDA
- *
- * 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 Patrick LERDA not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Patrick LERDA makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LERDA 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: Patrick LERDA
-
-*************************************************************************
+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 Patrick LERDA not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Patrick LERDA makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PATRICK LERDA 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 by Patrick LERDA
- *
- * 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 Patrick LERDA not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Patrick LERDA makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LERDA 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: Patrick LERDA
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
+Copyright 2007 George Sapountzis
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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.
- * Copyright 2001 by Patrick LERDA
- * Portions Copyright by Stephen Blackheath
- *
- * 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 Patrick LERDA not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Patrick LERDA makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * PATRICK LERDA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PATRICK LERDA 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: Patrick LERDA
- * with modifications by Stephen Blackheath (Aug 2002)
- *
- * REVISION HISTORY:
- * December 2001 - Patrick LERDA's original i740fb project on SourceForge.
- * 27 August 2002 - Patrick's version would run for an hour or two on my
- * machine, then the screen would go blank (no signal to monitor) and for
- * some reason I sometimes couldn't even log in through the network. I had
- * to re-boot my machine. This version fixes that and makes a few other
- * unnecessary tweaks. I am not certain, but I think the problem is that
- * Patrick's code was reading a value from XRX register 0xD0, and or'ing
- * with 0x10. When I removed this from the main loop, it became reliable.
- * I suspect the hardware (whether just my cheap clone board only I'm not
- * sure) was sometimes returning bogus values, which were then programmed
- * back in - but I never checked this. This register is related to
- * powering on or off certain subsystems of the i740 chip, so that might
- * explain the blank screen. - Stephen Blackheath
- * 3 September 2002 - Added software scaling in the situation where the
- * screen size is smaller than the original video size, since scaling down
- * is not supported by the hardware. The implementation of this is not
- * quite complete.
- * 12 September 2002 - Better software scaling with some averaging, giving a
- * nicer picture.
+THE SOFTWARE IS PROVIDED "AS 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-video-i740/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-i740/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-i740 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 09/01/10
+# @(#)Makefile 1.9 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-i740
# Version number (used in path names)
-MODULE_VERSION=1.2.0
+MODULE_VERSION=1.3.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-intel/6538497_6554161.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-intel/6538497_6554161.patch Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,6 @@
diff -urp -x '*~' -x '*.orig' src/i830_common.h src/i830_common.h
---- src/i830_common.h 2008-07-22 23:14:09.000000000 -0700
-+++ src/i830_common.h 2009-01-10 20:01:43.664950000 -0800
+--- src/i830_common.h 2009-01-21 14:02:00.000000000 -0800
++++ src/i830_common.h 2009-05-08 20:47:59.370445000 -0700
@@ -94,6 +94,7 @@ typedef struct {
int pf_current_page; /* which buffer is being displayed? */
int perf_boxes; /* performance boxes to be displayed */
@@ -10,8 +10,8 @@
drm_handle_t front_handle;
int front_offset;
diff -urp -x '*~' -x '*.orig' src/i830_dri.h src/i830_dri.h
---- src/i830_dri.h 2008-08-25 18:25:53.000000000 -0700
-+++ src/i830_dri.h 2009-01-10 20:01:43.652983000 -0800
+--- src/i830_dri.h 2009-01-21 14:02:00.000000000 -0800
++++ src/i830_dri.h 2009-05-08 20:47:59.375897000 -0700
@@ -22,16 +22,20 @@ typedef struct _I830DRIRec {
drm_handle_t unused2; /* backbuffer */
@@ -35,9 +35,9 @@
int deviceID;
int width;
diff -urp -x '*~' -x '*.orig' src/modes/xf86RandR12.c src/modes/xf86RandR12.c
---- src/modes/xf86RandR12.c 2008-04-13 18:57:30.000000000 -0700
-+++ src/modes/xf86RandR12.c 2009-01-10 20:01:43.666024000 -0800
-@@ -207,6 +207,11 @@ xf86RandR12SetMode (ScreenPtr pScree
+--- src/modes/xf86RandR12.c 2009-01-09 17:21:53.000000000 -0800
++++ src/modes/xf86RandR12.c 2009-05-08 20:47:59.383378000 -0700
+@@ -341,6 +341,11 @@ xf86RandR12SetMode (ScreenPtr pScree
/* Reset, just so we ensure the drivers SwitchMode is called */
scrp->currentMode = NULL;
}
--- a/open-src/driver/xf86-video-intel/6810801.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- src/i830_bios.c Thu Feb 26 08:49:38 2009
-+++ src/i830_bios.c Thu Feb 26 08:54:07 2009
-@@ -88,8 +88,8 @@
- parse_panel_data(I830Ptr pI830, struct bdb_header *bdb)
- {
- struct bdb_lvds_options *lvds_options;
-- struct bdb_lvds_lfp_data *lvds_lfp_data;
-- struct bdb_lvds_lfp_data_entry *entry;
-+ struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
-+ int timing_offset;
- DisplayModePtr fixed_mode;
- unsigned char *timing_ptr;
-
-@@ -104,12 +104,13 @@
- if (lvds_options->panel_type == 0xff)
- return;
-
-- lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);
-- if (!lvds_lfp_data)
-+ lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
-+ if (!lvds_lfp_data_ptrs)
- return;
-
-- entry = &lvds_lfp_data->data[lvds_options->panel_type];
-- timing_ptr = (unsigned char *)&entry->dvo_timing;
-+ timing_offset =
-+ lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
-+ timing_ptr = (unsigned char *)bdb + timing_offset;
-
- fixed_mode = xnfalloc(sizeof(DisplayModeRec));
- memset(fixed_mode, 0, sizeof(*fixed_mode));
--- a/open-src/driver/xf86-video-intel/6819154.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- src/i830_driver.c Tue Mar 17 12:19:57 2009
-+++ src/i830_driver.c Tue Mar 17 13:32:09 2009
-@@ -2869,7 +2869,8 @@
- }
-
- /* Enable FB compression if possible */
-- if (i830_fb_compression_supported(pI830))
-+ if (i830_fb_compression_supported(pI830) && !IS_GM45(pI830)
-+ && !IS_G4X(pI830))
- pI830->fb_compression = TRUE;
- else
- pI830->fb_compression = FALSE;
--- a/open-src/driver/xf86-video-intel/845_workaround.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -urp -x '*~' -x '*.orig' src/i830_driver.c src/i830_driver.c
---- src/i830_driver.c 2008-08-25 18:25:53.000000000 -0700
-+++ src/i830_driver.c 2009-01-10 20:01:46.246642000 -0800
-@@ -1589,6 +1589,9 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
- pI830->useEXA = FALSE;
- }
- }
-+ if (DEVICE_ID(pI830->PciInfo) == PCI_CHIP_845_G) {
-+ pI830->useEXA = FALSE;
-+ }
- #endif
- xf86DrvMsg(pScrn->scrnIndex, from, "Using %s for acceleration\n",
- pI830->useEXA ? "EXA" : "XAA");
--- a/open-src/driver/xf86-video-intel/Add-support-for-G41-chipset.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-From ec17c88a0ed7c9cf4ad68aa52a7a891946a1c0f4 Mon Sep 17 00:00:00 2001
-From: Zhenyu Wang <[email protected]>
-Date: Thu, 11 Sep 2008 16:14:47 +0800
-Subject: [PATCH] Add support for G41 chipset
-
-G41 is another 4 series chipset like G45/43.
----
- src/common.h | 7 ++++++-
- src/i810_driver.c | 4 ++++
- src/i830_driver.c | 5 +++++
- 3 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/src/common.h b/src/common.h
-index ece1def..840d30a 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -323,6 +323,11 @@ extern int I810_DEBUG;
- #define PCI_CHIP_Q45_G_BRIDGE 0x2E10
- #endif
-
-+#ifndef PCI_CHIP_G41_G
-+#define PCI_CHIP_G41_G 0x2E32
-+#define PCI_CHIP_G41_G_BRIDGE 0x2E30
-+#endif
-+
- #if XSERVER_LIBPCIACCESS
- #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
- #define VENDOR_ID(p) (p)->vendor_id
-@@ -355,7 +360,7 @@ extern int I810_DEBUG;
- #define IS_I945G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_G)
- #define IS_I945GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I945_GME)
- #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
--#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G)
-+#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G)
- #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
- #define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_GM45(pI810) || IS_G4X(pI810))
- #define IS_G33CLASS(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G33_G ||\
-diff --git a/src/i810_driver.c b/src/i810_driver.c
-index 856f5ec..a7f408c 100644
---- a/src/i810_driver.c
-+++ b/src/i810_driver.c
-@@ -156,6 +156,7 @@ static const struct pci_id_match intel_device_match[] = {
- INTEL_DEVICE_MATCH (PCI_CHIP_IGD_E_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
-+ INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
- { 0, 0, 0 },
- };
-
-@@ -212,6 +213,7 @@ static SymTabRec I810Chipsets[] = {
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
- {PCI_CHIP_G45_G, "G45/G43"},
- {PCI_CHIP_Q45_G, "Q45/Q43"},
-+ {PCI_CHIP_G41_G, "G41"},
- {-1, NULL}
- };
-
-@@ -245,6 +247,7 @@ static PciChipsets I810PciChipsets[] = {
- {PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
- {PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
-+ {PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED }
- };
-
-@@ -812,6 +815,7 @@ I810Probe(DriverPtr drv, int flags)
- case PCI_CHIP_IGD_E_G:
- case PCI_CHIP_G45_G:
- case PCI_CHIP_Q45_G:
-+ case PCI_CHIP_G41_G:
- xf86SetEntitySharable(usedChips[i]);
-
- /* Allocate an entity private if necessary */
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index bab86a5..e48e20e 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -254,6 +254,7 @@ static SymTabRec I830Chipsets[] = {
- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"},
- {PCI_CHIP_G45_G, "G45/G43"},
- {PCI_CHIP_Q45_G, "Q45/Q43"},
-+ {PCI_CHIP_G41_G, "G41"},
- {-1, NULL}
- };
-
-@@ -281,6 +282,7 @@ static PciChipsets I830PciChipsets[] = {
- {PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, RES_SHARED_VGA},
- {PCI_CHIP_G45_G, PCI_CHIP_G45_G, RES_SHARED_VGA},
- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, RES_SHARED_VGA},
-+ {PCI_CHIP_G41_G, PCI_CHIP_G41_G, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED}
- };
-
-@@ -1267,6 +1269,9 @@ i830_detect_chipset(ScrnInfoPtr pScrn)
- case PCI_CHIP_Q45_G:
- chipname = "Q45/Q43";
- break;
-+ case PCI_CHIP_G41_G:
-+ chipname = "G41";
-+ break;
- default:
- chipname = "unknown chipset";
- break;
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-intel/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-intel/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,155 +1,131 @@
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
+Copyright 2000, 2001 Intel Corporation. All Rights Reserved.
+Copyright © 2002 by Alan Hourihane and David Dawes
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+Copyright © 2006, 2007, 2008 Intel Corporation
+Copyright 2007, 2008 Red Hat, Inc.
+Copyright 2006 Luc Verhaegen.
+Copyright © 2007 Dave Mueller
+
+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 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
+
+Copyright � 1999 Keith Packard
+
+Copyright � 2001 Keith Packard
+Partly based on code that is Copyright � The XFree86 Project Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Keith Packard makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
*************************************************************************
- *
- * Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
+
+Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2000, 2006, 2007, 2008 Keith Packard
+ 2004 Eric Anholt
+ 2005 Zack Rusin, Trolltech
+Copyright © 2006 Eric Anholt
+Copyright © 2008 Red Hat, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holders make no representations
+about the suitability of this software for any purpose. It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+*************************************************************************
+
+Copyright 2001 VA Linux Systems Inc., Fremont, California.
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas
+Copyright © 2002 by David Dawes
+
+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
+ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
*************************************************************************
Copyright © 2006 Dave Airlie
@@ -177,34 +153,61 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*************************************************************************
+
+Copyright 2003, 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+************************************************************************
+
+Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Alan Hourihane makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
*************************************************************************
- Copyright 2006 Dave Airlie <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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.
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2001 VA Linux Systems Inc., Fremont, California.
+Copyright © 2002 by David Dawes
+Copyright 2006 Dave Airlie <[email protected]>
-THE SOFTWARE IS PROVIDED "AS 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.
+All Rights Reserved.
-*************************************************************************
-*************************************************************************
-
- Copyright 2006 Dave Airlie <[email protected]>
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
@@ -227,187 +230,11 @@
*************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
Copyright © 2002 David Dawes
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
- * Copyright © 2006 Eric Anholt
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 David Dawes
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
+Copyright (c) 2005 Jesse Barnes <[email protected]>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
- i810_common.h -- common header definitions for I810 2D/3D/DRM suite
- *
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Converted to common header format:
- * Jens Owen <[email protected]>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_common.h,v 1.1 2002/09/11 00:29:31 dawes Exp $
- *
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
- * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Alan Hourihane, <[email protected]>
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -432,528 +259,107 @@
*************************************************************************
-Copyright 2000 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-**************************************************************************
-
-Copyright 2000 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
+Copyright 2005-2006 Luc Verhaegen.
Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 David Dawes
-
-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.
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
- *
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
+THE SOFTWARE IS PROVIDED "AS 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.
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
+**************************************************************************
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
-
-Copyright 2001 VA Linux Systems Inc., Fremont, California.
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
+Copyright (c) 1997 Metro Link Incorporated
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
-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 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 above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, VA LINUX SYSTEMS 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.
-
-*************************************************************************
+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.
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 David Dawes
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Except as contained in this notice, the name of the Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
*************************************************************************
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
-
-Copyright 2001 VA Linux Systems Inc., Fremont, California.
-Copyright © 2002 by David Dawes
-
-All Rights Reserved.
+Copyright � 2002 David Dawes
+Copyright � 2006 Intel Corporation
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
-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 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 above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, VA LINUX SYSTEMS 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.
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of the author(s) shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from
+the author(s).
*************************************************************************
-*************************************************************************
-Copyright 2001 VA Linux Systems Inc., Fremont, California.
-Copyright © 2002 by David Dawes
-
-All Rights Reserved.
+Copyright (c) 1997-2003 by The XFree86 Project, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
-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 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 above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-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.
+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).
+
*************************************************************************
Copyright 2006 Dave Airlie <[email protected]>
@@ -978,62 +384,71 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-******
-*******************************************************************
*************************************************************************
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-Copyright (c) 2005 Jesse Barnes <[email protected]>
- Based on code from i830_xaa.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, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
- Copyright 2006 Dave Airlie <[email protected]>
-
-All Rights Reserved.
+Copyright (c) 2004 Alexander Gottwald
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
-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 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 above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-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.
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
*************************************************************************
+
+Copyright © 2008 Red Hat, Inc.
+Partly based on code Copyright © 2000 SuSE, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Red Hat not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. Red Hat makes no representations about the
+suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Red Hat
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of SuSE not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. SuSE makes no representations about the
+suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
*************************************************************************
Copyright 2005 Red Hat, Inc.
@@ -1059,1296 +474,5 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*************************************************************************
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 by David Dawes.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
- * Copyright � 2002 David Dawes
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the author(s) shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from
- * the author(s).
- *
- * Authors: David Dawes <[email protected]>
- * Eric Anholt <[email protected]>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.c,v 1.6 2002/11/02 01:38:25 dawes Exp $
-
-
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Zhenyu Wang <[email protected]>
- *
-
-*************************************************************************
- *
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Wang Zhenyu <[email protected]>
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
-
- Copyright 2006 Dave Airlie <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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.
-
-*************************************************************************
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-**************************************************************************
-
- Copyright 2000 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- *************************************************************************
-
- * i830_video.c: i830/i845 Xv driver.
- *
- * Copyright © 2002 by Alan Hourihane and David Dawes
- *
- * Authors:
- * Alan Hourihane <[email protected]>
- * David Dawes <[email protected]>
- *
- * Derived from i810 Xv driver:
- *
- * Authors of i810 code:
- * Jonathan Bian <[email protected]>
- * Offscreen Images:
- * Matt Sottek <[email protected]>
-
-**************************************************************************
-
-Copyright 2000 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
- *
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-*************************************************************************
- *
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *************************************************************************
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Wang Zhenyu <[email protected]>
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Wang Zhenyu <[email protected]>
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- * Keith Packard <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright © 2007 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright 2006 Luc Verhaegen.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright 2005-2006 Luc Verhaegen.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- *
- * Copyright (c) 1997 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Copyright (c) 1997-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).
-
-
- *
- * Copyright (c) 1997 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- *
-
-
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <[email protected]>
- *
-
-
- * Copyright (c) 2004 Alexander Gottwald
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-*************************************************************************
-
-Copyright © 2006 Dave Airlie
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-*************************************************************************
-
- Copyright 2006 Dave Airlie <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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.
-
-*************************************************************************
-*************************************************************************
-
- Copyright 2006 Dave Airlie <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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.
-
-*************************************************************************
-
- * Copyright © 2007 Dave Mueller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Dave Mueller <[email protected]>
- *
-
-
- * Copyright © 2007 Dave Mueller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Dave Mueller <[email protected]>
- *
-
-
- * Copyright © 2007 Dave Mueller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Dave Mueller <[email protected]>
- *
-
-**************************************************************************
-
-Copyright 2001 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-**************************************************************************
-
-Copyright 2001 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
--- a/open-src/driver/xf86-video-intel/Do-force-CRT-detect-sequence-twice-on-4-series-chips.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-From d6b2696f9ac14a81598e0147698209ad428fd45d Mon Sep 17 00:00:00 2001
-From: Zhenyu Wang <[email protected]>
-Date: Fri, 26 Sep 2008 09:53:03 +0800
-Subject: [PATCH] Do force CRT detect sequence twice on 4 series chipset
-
----
- src/i830_crt.c | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/src/i830_crt.c b/src/i830_crt.c
-index 5812e2b..2e70eb8 100644
---- a/src/i830_crt.c
-+++ b/src/i830_crt.c
-@@ -161,6 +161,14 @@ i830_crt_detect_hotplug(xf86OutputPtr output)
- uint32_t temp;
- const int timeout_ms = 1000;
- int starttime, curtime;
-+ int tries = 1;
-+
-+ /* On 4 series, CRT detect sequence need to be done twice for safe. */
-+ if (IS_G4X(pI830))
-+ tries = 2;
-+
-+retry:
-+ tries--;
-
- temp = INREG(PORT_HOTPLUG_EN);
-
-@@ -173,6 +181,9 @@ i830_crt_detect_hotplug(xf86OutputPtr output)
- break;
- }
-
-+ if (tries > 0)
-+ goto retry;
-+
- if ((INREG(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) ==
- CRT_HOTPLUG_MONITOR_COLOR)
- {
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-intel/Fix-broken-stolen-memory-counting-on-G4X.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-From 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <[email protected]>
-Date: Tue, 14 Oct 2008 11:33:33 -0700
-Subject: [PATCH] Fix broken stolen memory counting on G4X.
-
-On the GM45 we were assuming too little stolen memory (mostly harmless,
-except when it wasn't, until the AGP fix), and on the G45 we were assuming too
-much stolen memory, which was quite harmful when we touched the page that
-didn't get mapped.
-
-Future stolen memory accounting should use src/reg_dumper/intel_gtt before and
-after enabling AGP on the chipset to confirm that only the GTT entries not
-mapped to stolen are replaced, and that all of the unmapped GTT entries are
-replaced with the constant scratch page.
----
- src/i830_driver.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index c1d61f4..eaf5d27 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -502,8 +502,8 @@ I830DetectMemory(ScrnInfoPtr pScrn)
- range = gtt_size + 4;
-
- /* new 4 series hardware has seperate GTT stolen with GFX stolen */
-- if (IS_G4X(pI830))
-- range = 0;
-+ if (IS_G4X(pI830) || IS_GM45(pI830))
-+ range = 4;
-
- if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
- switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
---
-1.5.6.5
-
--- a/open-src/driver/xf86-video-intel/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,29 +30,28 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.22 09/03/18
+# @(#)Makefile 1.23 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-intel
# Version number (used in path names)
-MODULE_VERSION=2.4.2
+MODULE_VERSION=2.6.1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= build-dri.patch libraries.patch \
- 6538497_6554161.patch 845_workaround.patch \
- Add-support-for-G41-chipset.patch,-p1 \
- Fix-broken-stolen-memory-counting-on-G4X.patch,-p1 \
- Render-register-clock-gating-disable-fix-on-4-series.patch,-p1 \
- Do-force-CRT-detect-sequence-twice-on-4-series-chips.patch,-p1 \
- 6810801.patch 6819154.patch
+ 6538497_6554161.patch bugs.patch
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
SUN_PACKAGE=SUNWxorg-graphics-ddx
MODULE_STABILITY=Volatile
+# Intel driver doesn't work on some chipsets if built with Sun compiler
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
+
# Extra flags to pass to configure script
MODULE_CONFIG_OPTS=--enable-dri
--- a/open-src/driver/xf86-video-intel/Render-register-clock-gating-disable-fix-on-4-series.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-From 1cc15ba454fdf54a7dea9da066e0a023a4742fab Mon Sep 17 00:00:00 2001
-From: Zhenyu Wang <[email protected]>
-Date: Fri, 26 Sep 2008 10:01:52 +0800
-Subject: [PATCH] Render register clock gating disable fix on 4 series chipset
-
----
- src/i810_reg.h | 3 +++
- src/i830_driver.c | 14 ++++++++++----
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/i810_reg.h b/src/i810_reg.h
-index 5b90e12..6458008 100644
---- a/src/i810_reg.h
-+++ b/src/i810_reg.h
-@@ -1167,6 +1167,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- # define I965_DM_CLOCK_GATE_DISABLE (1 << 0)
-
- #define RENCLK_GATE_D2 0x6208
-+#define VF_UNIT_CLOCK_GATE_DISABLE (1 << 9)
-+#define GS_UNIT_CLOCK_GATE_DISABLE (1 << 7)
-+#define CL_UNIT_CLOCK_GATE_DISABLE (1 << 6)
- #define RAMCLK_GATE_D 0x6210 /* CRL only */
- #define DEUC 0x6214 /* CRL only */
-
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 1317c1d..389775f 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -965,12 +965,18 @@ i830_init_clock_gating(ScrnInfoPtr pScrn)
- /* Disable clock gating reported to work incorrectly according to the specs.
- */
- if (IS_GM45(pI830) || IS_G4X(pI830)) {
-+ uint32_t dspclk_gate;
- OUTREG(RENCLK_GATE_D1, 0);
-- OUTREG(RENCLK_GATE_D2, 0);
-+ OUTREG(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |
-+ GS_UNIT_CLOCK_GATE_DISABLE |
-+ CL_UNIT_CLOCK_GATE_DISABLE);
- OUTREG(RAMCLK_GATE_D, 0);
-- OUTREG(DSPCLK_GATE_D, VRHUNIT_CLOCK_GATE_DISABLE |
-- OVRUNIT_CLOCK_GATE_DISABLE |
-- OVCUNIT_CLOCK_GATE_DISABLE);
-+ dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE |
-+ OVRUNIT_CLOCK_GATE_DISABLE |
-+ OVCUNIT_CLOCK_GATE_DISABLE;
-+ if (IS_GM45(pI830))
-+ dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE;
-+ OUTREG(DSPCLK_GATE_D, dspclk_gate);
- } else if (IS_I965GM(pI830)) {
- OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
- OUTREG(RENCLK_GATE_D2, 0);
---
-1.5.6.5
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/bugs.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,38 @@
+diff -urp -x '*~' -x '*.orig' src/i830_display.c src/i830_display.c
+--- src/i830_display.c 2009-01-21 14:02:00.000000000 -0800
++++ src/i830_display.c 2009-05-08 20:48:03.095075000 -0700
+@@ -801,10 +801,6 @@ i830_disable_vga_plane (xf86CrtcPtr crtc
+
+ vgacntrl |= VGA_DISP_DISABLE;
+
+- /* disable center mode */
+- if (IS_I9XX(pI830))
+- vgacntrl &= ~(3 << 24);
+-
+ OUTREG(VGACNTRL, vgacntrl);
+ i830WaitForVblank(pScrn);
+
+diff -urp -x '*~' -x '*.orig' src/i830_driver.c src/i830_driver.c
+--- src/i830_driver.c 2009-01-21 14:02:00.000000000 -0800
++++ src/i830_driver.c 2009-05-08 20:48:03.093998000 -0700
+@@ -501,7 +501,7 @@ I830DetectMemory(ScrnInfoPtr pScrn)
+ range = gtt_size + 4;
+
+ /* new 4 series hardware has seperate GTT stolen with GFX stolen */
+- if (IS_G4X(pI830))
++ if (IS_G4X(pI830) || IS_GM45(pI830))
+ range = 4;
+
+ if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
+@@ -1540,6 +1540,11 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
+ }
+ }
+ #endif
++
++ if (DEVICE_ID(pI830->PciInfo) == PCI_CHIP_845_G) {
++ pI830->accel = ACCEL_XAA;
++ }
++
+ xf86DrvMsg(pScrn->scrnIndex, from, "Using %s for acceleration\n",
+ accel_name[pI830->accel]);
+ }
--- a/open-src/driver/xf86-video-intel/build-dri.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-intel/build-dri.patch Fri May 15 09:36:46 2009 -0700
@@ -27,8 +27,8 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2008-08-25 18:28:31.000000000 -0700
-+++ configure.ac 2009-01-10 20:01:38.516058000 -0800
+--- configure.ac 2009-01-21 11:55:53.000000000 -0800
++++ configure.ac 2009-05-08 20:47:52.030497000 -0700
@@ -37,7 +37,7 @@ AM_MAINTAINER_MODE
# Checks for programs.
AC_DISABLE_STATIC
@@ -38,16 +38,29 @@
AC_PROG_CC
AM_PROG_CC_C_O
-@@ -84,7 +84,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
+@@ -84,9 +84,14 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+-PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no])
++PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=no], [BUILD_UXA=no])
++
+AC_ARG_WITH(xorg-sdk-dir,
-+ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
-+ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
-+ [sdkdir="$withval"],
-+ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
++ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
++ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
++ [sdkdir="$withval"],
++ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
+
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ drm_cflags=$(pkg-config --cflags libdrm)
# Checks for libraries.
+@@ -222,7 +227,7 @@ fi
+ dnl exaGetPixmapDriverPrivate required for DRM_MODE.
+ PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5],
+- [DRM_MODE=yes], [DRM_MODE=no])
++ [DRM_MODE=no], [DRM_MODE=no])
+ if test "x$DRM_MODE" = xyes; then
+ AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
+ fi
--- a/open-src/driver/xf86-video-intel/libraries.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-intel/libraries.patch Fri May 15 09:36:46 2009 -0700
@@ -1,20 +1,20 @@
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am 2008-08-25 18:25:53.000000000 -0700
-+++ src/Makefile.am 2009-01-10 20:01:41.033942000 -0800
-@@ -34,7 +34,9 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@
+--- src/Makefile.am 2009-01-21 14:02:00.000000000 -0800
++++ src/Makefile.am 2009-05-08 20:47:55.817701000 -0700
+@@ -35,7 +35,9 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@
@XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
intel_drv_la_LTLIBRARIES = intel_drv.la
-intel_drv_la_LDFLAGS = -module -avoid-version
+intel_drv_la_LDFLAGS = -module -avoid-version \
-+ -ldrm -lfb -lint10 -lpciaccess -lshadow -lshadowfb \
-+ -lvbe -lvgahw -lxaa -lexa -ldri -lglx -lm
++ -ldrm -lfb -lint10 -lshadow -lshadowfb \
++ -lvbe -lvgahw -lxaa -lexa -ldri -ldri2 -lglx -lm
intel_drv_ladir = @moduledir@/drivers
- intel_drv_la_LIBADD =
- if XSERVER_LIBPCIACCESS
+ intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel
+ if BUILD_UXA
diff -urp -x '*~' -x '*.orig' src/ch7017/Makefile.am src/ch7017/Makefile.am
---- src/ch7017/Makefile.am 2008-07-22 23:14:09.000000000 -0700
-+++ src/ch7017/Makefile.am 2009-01-10 20:01:41.042690000 -0800
+--- src/ch7017/Makefile.am 2009-01-21 14:02:00.000000000 -0800
++++ src/ch7017/Makefile.am 2009-05-08 20:47:55.811627000 -0700
@@ -7,7 +7,9 @@ AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS
@PCIACCESS_CFLAGS@
@@ -27,15 +27,15 @@
ch7017_la_SOURCES = \
diff -urp -x '*~' -x '*.orig' src/xvmc/Makefile.am src/xvmc/Makefile.am
---- src/xvmc/Makefile.am 2008-08-25 18:25:53.000000000 -0700
-+++ src/xvmc/Makefile.am 2009-01-10 20:01:41.036760000 -0800
+--- src/xvmc/Makefile.am 2009-01-21 14:02:00.000000000 -0800
++++ src/xvmc/Makefile.am 2009-05-08 20:47:55.806902000 -0700
@@ -6,7 +6,8 @@ libI810XvMC_la_SOURCES = I810XvMC.c \
- libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
-libI810XvMC_la_LDFLAGS = -version-number 1:0:0
+libI810XvMC_la_LDFLAGS = -version-number 1:0:0 \
+ -lXvMC -lXv -lX11 -ldrm
- libI810XvMC_la_LIBADD = @DRI_LIBS@
+ libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
libIntelXvMC_la_SOURCES = intel_xvmc.c \
--- a/open-src/driver/xf86-video-mach64/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-mach64/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,128 +1,105 @@
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
+Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+that the name of Marc Aurele La France not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. Marc Aurele La France makes no representations
+about the suitability of this software for any purpose. It is provided
+"as-is" without express or implied warranty.
+
+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+*************************************************************************
+
+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
+ Precision Insight, Inc., Cedar Park, Texas, and
+ VA Linux Systems Inc., Fremont, California.
- * Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+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 ATI, PRECISION INSIGHT, VA LINUX
+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+Copyright 2000 Gareth Hughes
+All Rights Reserved.
- * Copyright 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+Permission 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
+GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION 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 2006, 2007 George Sapountzis
+All Rights Reserved.
- * Copyright 2006 George Sapountzis
- * All Rights Reserved.
- *
- * Based on the mach64 DRI and DRM drivers:
- * Copyright 2000 Gareth Hughes
- * Copyright 2002-2003 Leif Delgass
- * All Rights Reserved.
- *
- * Based on the ati hw/kdrive driver:
- * Copyright 2003 Eric Anholt, Anders Carlsson
- *
- * Based on the via hw/xfree86 driver:
- * Copyright 2006 Thomas Hellstrom. 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.
- *
- * Authors:
- * George Sapountzis <[email protected]>
-
+Based on the mach64 DRI and DRM drivers:
+Copyright 2000 Gareth Hughes
+Copyright 2002-2003 Leif Delgass
+All Rights Reserved.
+
+Based on the ati hw/kdrive driver:
+Copyright 2003 Eric Anholt, Anders Carlsson
+
+Based on the via hw/xfree86 driver:
+Copyright 2006 Thomas Hellstrom. All Rights Reserved.
- * Copyright (c) 1995-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
+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/driver/xf86-video-mach64/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-mach64/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.1 09/01/14
+# @(#)Makefile 1.2 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-mach64
# Version number (used in path names)
-MODULE_VERSION=6.8.0
+MODULE_VERSION=6.8.1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6205248.patch
--- a/open-src/driver/xf86-video-mga/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-mga/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,38 +1,27 @@
-*************************************************************************************
-
- @doc MGA MGA_STRUCT
-
- @module MGA Structures | Structure of The MGA Layer
- @normal Copyright © 1997, Matrox Graphics Inc.
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
- All Rights Reserved.
-
- @head3 MGA Structures |
- @index struct | MGA_STRUCT
+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 fur-
+nished to do so, subject to the following conditions:
- @end
-
-**************************************************************************************
-*****************************************************************************\
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- clientlx.c
-
- Copyright © 1997, Matrox Graphics Inc.
-
- All Rights Reserved.
-
-\*****************************************************************************
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * MGA Millennium (MGA2064W) functions
- *
- * Copyright 1996 The XFree86 Project, Inc.
- *
- * Authors
- * Dirk Hohndel
- * [email protected]
- * David Dawes
- * [email protected]
-
+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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
***********************************************************
Copyright 1989, 1998 The Open Group
@@ -57,273 +46,192 @@
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 1994 by Robin Cutshaw <[email protected]>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Robin Cutshaw not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Robin Cutshaw makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ROBIN CUTSHAW BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+***********************************************************
+
+Copyright 2000 VA Linux Systems Inc., Fremont, California.
+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
+VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * 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
- * 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.
-
- mga_common.h -- common header definitions for MGA 2D/3D/DRM suite
- *
- * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Converted to common header format:
- * Jens Owen <[email protected]>
- *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $
- *
-
+***********************************************************
+
+Copyright 2006 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software")
+to deal in the software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+them Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+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
+STEPHEN CROWLEY, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
- * Copyright 1994 by Robin Cutshaw <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Robin Cutshaw not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Robin Cutshaw makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ROBIN CUTSHAW 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.
- *
- *
- * Modified for TVP3026 by Harald Koenig <[email protected]>
- *
- * Modified for MGA Millennium by Xavier Ducoin <[email protected]>
- *
- * Doug Merritt <[email protected]>
- * 24bpp: fixed high res stripe glitches, clock glitches on all res
- *
-
- * Copyright 2000 VA Linux Systems Inc., Fremont, California.
- * 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
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES
- * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Keith Whitwell <[email protected]>
- * Gareth Hughes <[email protected]>
-
- * Copyright 2000 VA Linux Systems Inc., Fremont, California.
- * 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
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES
- * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Keith Whitwell <[email protected]>
- * Gareth Hughes <[email protected]>
-
- * Copyright 2000 VA Linux Systems Inc., Fremont, California.
- * 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
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES
- * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Gareth Hughes <[email protected]>
-
- * Copyright 2006 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software")
- * to deal in the software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * them Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Adam Jackson <[email protected]>
- * Tilman Sauerbeck <[email protected]>
-
- * MGA Millennium (MGA2064W) functions
- * MGA Mystique (MGA1064SG) functions
- *
- * Copyright 1996 The XFree86 Project, Inc.
- *
- * Authors
- * Dirk Hohndel
- * [email protected]
- * David Dawes
- * [email protected]
- * Contributors:
- * Guy DESBIEF, Aix-en-provence, France
- * [email protected]
- * MGA1064SG Mystique register file
-
- * Copyright 2000 Gareth Hughes
- * 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
- * GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Gareth Hughes <[email protected]>
-
- Copyright (c) 1999, The XFree86 Project Inc.
- Written by Mark Vojkovich <[email protected]>
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+(c) 1999 Matrox Graphics 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
+MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+***********************************************************
+
+Copyright © 1997, Matrox Graphics Inc.
+All Rights Reserved.
+
+***********************************************************
+Copyright 2000 Gareth Hughes
+All Rights Reserved.
- * GLX Hardware Device Driver for Matrox G200/G400
- *
- * Warp Engine Microcode
- *
- * 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
- * MATROX GRAPHICS INC., OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * (c) 1999 Matrox Graphics 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
- * STEPHEN CROWLEY, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission 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
+GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Authors:
+ Gareth Hughes <[email protected]>
+
+***********************************************************
+
+(C) Copyright IBM Corporation 2005
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+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
+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.
+
--- a/open-src/driver/xf86-video-mga/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.12 09/01/14
+# @(#)Makefile 1.13 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-mga
# Version number (used in path names)
-MODULE_VERSION=1.4.9
+MODULE_VERSION=1.4.10
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = no-hal.patch
@@ -60,7 +60,7 @@
-R$(X11_SERVERMODS_DIR)/linux$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-lexa -lfb -lint10 -lpciaccess -lshadowfb -lvbe \
- -lvgahw -lxaa -lxf8_32bpp -lcfb -lmfb -lfbdevhw
+ -lvgahw -lxaa -lfbdevhw
AUTORECONF=yes
--- a/open-src/driver/xf86-video-nv/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-nv/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-nv Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,17 +30,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.20 09/01/10
+# @(#)Makefile 1.21 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-nv
# Version number (used in path names)
-MODULE_VERSION=2.1.12
+MODULE_VERSION=2.1.13
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = pci-match.patch,-p1
+SOURCE_PATCHES =
# Man pages to apply Sun footer to & attributes to list
SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-video-nv/pci-match.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-From e387bf31aae78d4447b4af555a8d09f79f72e6e7 Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <[email protected]>
-Date: Fri, 17 Oct 2008 20:45:18 -0700
-Subject: [PATCH] Only match PCI display devices in our display driver.
-
-Apparently the server needs the driver to tell it that no, we really don't want
-screen sections on our NIC, USB hubs, bridge devices, etc.
-
-Stop whining about PROBE_DETECT in G80 PreInit and just bail out instead.
-
-Bug #18099: Xorg -configure tries to create a screen for every nvidia device.
----
- src/g80_driver.c | 7 ++-----
- src/nv_driver.c | 19 +++++++++++++++----
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index 50d55a0..ad8a424 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -206,11 +206,8 @@ #endif
- CARD32 tmp;
- memType BAR1sizeKB;
-
-- if(flags & PROBE_DETECT) {
-- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-- "G80 PROBE_DETECT unimplemented\n");
-- return FALSE;
-- }
-+ if(flags & PROBE_DETECT)
-+ return TRUE;
-
- /* Check the number of entities, and fail if it isn't one. */
- if(pScrn->numEntities != 1)
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 831e90b..faf73a9 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -77,11 +77,22 @@ static Bool NVModeInit(ScrnInfoPtr pScrn
- static Bool NVSetModeVBE(ScrnInfoPtr pScrn, DisplayModePtr pMode);
-
- #if XSERVER_LIBPCIACCESS
--/* For now, just match any NVIDIA PCI device and sort through them in the probe
-- * routine */
-+/* For now, just match any NVIDIA display device and sort through them in the
-+ * probe routine */
-+
-+/*
-+ * libpciaccess's masks are shifted by 8 bits compared to the ones in xf86Pci.h.
-+ */
-+#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8)
-+#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8)
-+
- static const struct pci_id_match NVPciIdMatchList[] = {
-- { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0 },
-- { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
-+ { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-+ PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
-+
-+ { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-+ PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
-+
- { 0, 0, 0 }
- };
- #endif
---
-1.4.1
-
--- a/open-src/driver/xf86-video-openchrome/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-openchrome/Makefile Fri May 15 09:36:46 2009 -0700
@@ -56,7 +56,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lshadow -lvbe -lxf1bpp -lxf4bpp \
+ -lfb -lint10 -lpciaccess -lshadow -lvbe \
-lexa -lxaa -lvgahw -lshadowfb -lm
include ../Makefile.inc
--- a/open-src/driver/xf86-video-radeonhd/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-radeonhd/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.5 09/01/14
+# @(#)Makefile 1.6 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-radeonhd
# Version number (used in path names)
-MODULE_VERSION=1.2.4
+MODULE_VERSION=1.2.5
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
@@ -47,6 +47,8 @@
SUN_PACKAGE=SUNWxorg-graphics-ddx
MODULE_STABILITY=Volatile
+MODULE_CPPFLAGS= -DXF86DRI
+
# Libraries/modules to link with
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
@@ -55,6 +57,17 @@
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lshadow -lxaa -lexa
+ -lfb -lshadow -lxaa -lexa -ldri -lglx
+
+# AtomBios code won't build with Sun compiler
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
+
+MODULE_ADD_SOURCE_TARGETS=clean_linefeeds
include ../Makefile.inc
+
+# ATI's atombios code has ^M's at linefeeds which break Sun compilers
+clean_linefeeds: default_source
+ find $(BUILD_DIR) -type f -name '*.[ch]' | \
+ xargs perl -i -p -e 's{\r\n}{\n}g'
--- a/open-src/driver/xf86-video-rendition/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-rendition/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,23 +1,23 @@
- * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the XFree86 Project shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from the
- * XFree86 Project.
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION 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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
--- a/open-src/driver/xf86-video-rendition/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-rendition/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-rendition Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 09/01/10
+# @(#)Makefile 1.10 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-rendition
# Version number (used in path names)
-MODULE_VERSION=4.2.0
+MODULE_VERSION=4.2.1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-siliconmotion/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/COPYING Fri May 15 09:36:46 2009 -0700
@@ -1,80 +1,8 @@
-Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and silicon Motion.
-
-Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and Silicon Motion.
-
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and Silicon Motion.
-
-Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, Inc. All Rights Reserved.
+Copyright (C) 2000,2008 Silicon Motion, Inc. All Rights Reserved.
+Copyright (C) 2001 Corvin Zahn. All Rights Reserved.
+Copyright (C) 2008 Francisco Jerez. All Rights Reserved.
+Copyright (C) 2008 Mandriva Linux. 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
@@ -98,6 +26,31 @@
sale, use or other dealings in this Software without prior written
authorization from The XFree86 Project or Silicon Motion.
+******************************************************************************
+
+Copyright 2007 George Sapountzis
+
+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 (C) 2006 Dennis De Winter All Rights Reserved.
Copyright (C) 2007 Alex Deucher All Rights Reserved.
@@ -117,132 +70,3 @@
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.
-
-
-Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and Silicon Motion.
-
-Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and Silicon Motion.
-
-Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and Silicon Motion.
-
-Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, Inc. All Rights Reserved.
-Copyright (C) 2001 Corvin Zahn. 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and silicon Motion.
-
-Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 2000 Silicon Motion, 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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the XFree86 Project and
-Silicon Motion 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 and silicon Motion.
-
-## comments end
--- a/open-src/driver/xf86-video-siliconmotion/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-siliconmotion/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.8 09/01/10
+# @(#)Makefile 1.9 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-siliconmotion
# Version number (used in path names)
-MODULE_VERSION=1.7.0
+MODULE_VERSION=1.7.1
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES =
--- a/open-src/driver/xf86-video-tseng/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-tseng/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-tseng 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 09/01/10
+# @(#)Makefile 1.8 09/05/15
#
# Package name used in tarballs
@@ -53,7 +53,7 @@
-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
-R$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
-R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -lfb -lint10 -lpciaccess -lvgahw -lxaa -lxf1bpp -lxf4bpp
+ -lfb -lint10 -lpciaccess -lvgahw -lxaa
include ../Makefile.inc
--- a/open-src/driver/xf86-video-vesa/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-vesa Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.11 09/01/10
+# @(#)Makefile 1.12 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-vesa
# Version number (used in path names)
-MODULE_VERSION=2.1.0
+MODULE_VERSION=2.2.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = vesa_xorg72.patch
--- a/open-src/driver/xf86-video-vmware/6370961.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-vmware/6370961.patch Fri May 15 09:36:46 2009 -0700
@@ -28,12 +28,12 @@
6370961 - needs sane vert, horiz ranges
-diff -urp -x '*~' src/vmware.c src/vmware.c
---- src/vmware.c 2006-10-31 19:12:05.000000000 -0800
-+++ src/vmware.c 2006-11-01 11:10:40.076805000 -0800
-@@ -924,6 +924,20 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- clockRanges->ClockMulFactor = 1;
- clockRanges->ClockDivFactor = 1;
+diff -urp -x '*~' -x '*.orig' src/vmware.c src/vmware.c
+--- src/vmware.c 2009-05-12 16:47:50.000000000 -0700
++++ src/vmware.c 2009-05-12 21:01:29.909838000 -0700
+@@ -927,6 +927,20 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
+ */
+ vmwareGetSupportedModelines(&pScrn->monitor->Modes);
+ /* Set reasonable default Hsync range, if needed. */
+ if (pScrn->monitor->nHsync == 0) {
--- a/open-src/driver/xf86-video-vmware/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/driver/xf86-video-vmware/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xf86-video-vmware Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.10 09/01/10
+# @(#)Makefile 1.11 09/05/15
#
# Package name used in tarballs
MODULE_NAME=xf86-video-vmware
# Version number (used in path names)
-MODULE_VERSION=10.16.5
+MODULE_VERSION=10.16.6
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = 6370961.patch
@@ -47,6 +47,10 @@
SUN_PACKAGE=SUNWxorg-graphics-ddx
MODULE_STABILITY=Volatile
+# vmwarevideo code won't build with Sun compiler
+MODULE_COMPILER=gcc
+MODULE_COMPILER_SET=yes
+
# Libraries/modules to link with
MODULE_LD_OPTIONS= \
-L$(PROTODIR)$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir) \
--- a/open-src/lib/Makefile.inc Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/Makefile.inc Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org library modules
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.12 08/11/26
+# @(#)Makefile.inc 1.13 09/05/15
#
PWD:sh=pwd
@@ -52,6 +52,7 @@
# Flags to build & link libraries with
MODTYPE_CPPFLAGS=$(LIB_CPPFLAGS)
MODTYPE_CFLAGS=$(LIB_CFLAGS)
+MODTYPE_CXXFLAGS=$(LIB_CXXFLAGS)
MODTYPE_LDFLAGS=$(LIB_LDFLAGS) -lc
MODTYPE_LD_OPTIONS=$(LIB_REQUIRED_LDFLAGS)
--- a/open-src/lib/libXfont/6206898.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-
-CR6206898: [Xorg] B&H Hebrew (ISO8859-8) Type 1 fonts are missing Hebrew glyphs
-
-The root cause of the problem is that the names used in Type1 fonts
-for Hebrew letters are different from the ones used in Xorg libType1.so
-module. In the Type1 fonts stored under
-/usr/openwin/lib/locale/iso_8859_8/X11/fonts/Type1, Hebrew letter
-names are applied, like "alef" ...."tav". In the libtype1.so module,
-the standard unicode names for Hebrew letter are used, like
-"afii57664"..."afii57690". So when Xorg loads the Type1 fonts, there
-are no name matches for Hebrew letters, which cause hebrew glyphs
-missed. In order to fix the problem, a name map table is needed and
-SearchDictName() function should be improved to handle this new map
-table if Hebrew is detected.
-
---- src/Type1/fontfcn.c 2006-09-12 07:56:07.000000000 -0700
-+++ src/Type1/fontfcn.c 2005-11-04 16:09:12.269912000 -0800
-@@ -109,6 +109,38 @@
- /* return 0 - not found. */
- /* return n - nth element in dictionary. */
- /***================================================================***/
-+#define HNUM 27
-+
-+char *hebrew[][2] = {
-+ {"afii57664", "alef"},
-+ {"afii57665", "bet"},
-+ {"afii57666", "gimel"},
-+ {"afii57667", "dalet"},
-+ {"afii57668", "he"},
-+ {"afii57669", "vav"},
-+ {"afii57670", "zayin"},
-+ {"afii57671", "het"},
-+ {"afii57672", "tet"},
-+ {"afii57673", "yod"},
-+ {"afii57674", "kaffinal"},
-+ {"afii57675", "kaf"},
-+ {"afii57676", "lamed"},
-+ {"afii57677", "memfinal"},
-+ {"afii57678", "mem"},
-+ {"afii57679", "nunfinal"},
-+ {"afii57680", "nun"},
-+ {"afii57681", "samekh"},
-+ {"afii57682", "ayin"},
-+ {"afii57683", "pefinal"},
-+ {"afii57684", "pe"},
-+ {"afii57685", "tsadifinal"},
-+ {"afii57686", "tsadi"},
-+ {"afii57687", "qof"},
-+ {"afii57688", "resh"},
-+ {"afii57689", "shin"},
-+ {"afii57690", "tav"}
-+};
-+
- int
- SearchDictName(psdict *dictP, psobj *keyP)
- {
-@@ -126,6 +158,27 @@
- )
- ) return(i);
- }
-+ /* Fix for CR6206898 */
-+ if(strncmp(keyP->data.valueP, "afii", 4) == 0) {
-+ int pos = -1;
-+ int size = 0;
-+ for(i=0;i<HNUM;i++) {
-+ if(strncmp(keyP->data.valueP, hebrew[i][0], keyP->len) == 0) {
-+ pos = i;
-+ break;
-+ }
-+ }
-+ if(pos == -1)
-+ return(0);
-+ size = strlen(hebrew[pos][1]);
-+ for (i=1;i<=n;i++) {
-+ if((size == dictP[i].key.len) &&
-+ (strncmp(dictP[i].key.data.valueP, hebrew[pos][1], dictP[i].key.len)== 0)) {
-+ return(i);
-+ }
-+ }
-+ }
-+
- return(0);
- }
-
--- a/open-src/lib/libXfont/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libXfont/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# Xfont Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,18 +30,17 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.17 08/12/22
+# @(#)Makefile 1.18 09/05/15
#
# Package name used in tarballs
MODULE_NAME=libXfont
# Version number (used in path names)
-MODULE_VERSION=1.3.4
+MODULE_VERSION=1.4.0
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= \
- 6206898.patch \
ps-fonts.patch \
htons-inline.patch
@@ -56,7 +55,7 @@
# Additional configure script options to select the modules we use
MODULE_CONFIG_OPTS= --enable-freetype --disable-type1 --disable-cid \
- --disable-speedo --enable-fontcache --enable-fc --disable-builtins \
+ --disable-speedo --enable-fontcache --enable-fc --enable-builtins \
--with-bzip2
# pkg-config files that need to have -R added
--- a/open-src/lib/libXv/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libXv/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# Xv 1.x Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 08/08/08
+# @(#)Makefile 1.5 09/05/15
#
# Package name used in tarballs
@@ -40,7 +40,10 @@
MODULE_VERSION=1.0.4
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES =
+SOURCE_PATCHES = lint-flags.patch
+
+# Regenerate Makefile.in's from Makefile.am's after lint-flags.patch
+AUTORECONF=yes
# Library name
LIBNAME=Xv
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libXv/lint-flags.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,25 @@
+Fix flags passed to lint library build to include all needed -I options
+
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2008-03-17 20:00:43.000000000 -0700
++++ configure.ac 2009-05-09 16:58:35.161130000 -0700
+@@ -50,7 +50,6 @@ XORG_RELEASE_VERSION
+ dnl Allow checking code with lint, sparse, etc.
+ XORG_WITH_LINT
+ XORG_LINT_LIBRARY([Xv])
+-LINT_FLAGS="${LINT_FLAGS} ${XV_CFLAGS}"
+
+ AC_OUTPUT([Makefile
+ include/Makefile
+diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am 2006-09-18 15:54:54.000000000 -0700
++++ src/Makefile.am 2009-05-09 16:58:35.161447000 -0700
+@@ -5,7 +5,7 @@ libXv_la_SOURCES = \
+ Xvlibint.h
+
+ libXv_la_LIBADD = @XV_LIBS@
+-AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
++AM_CPPFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+
+ libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libdrm/COPYING Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,299 @@
+Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. All Rights Reserved.
+Copyright (c) 2007-2008 Intel Corporation
+Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright (c) 2007-2008 Dave Airlie <[email protected]>
+Copyright (c) 2007-2008 Jakob Bornecrantz <[email protected]>
+Copyright (c) 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 shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS 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 (C) 2004-2005 Nicolai Haehnle et al.
+
+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 AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+Copyright 2005 Eric Anholt. All Rights Reserved.
+Copyright © 2007, 2008 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.
+
+*************************************************************************
+
+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+Copyright 2002, 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+Copyright (C) 2003-2006 by XGI Technology, Taiwan.
+
+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 XGI AND/OR
+ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+Copyright 2004 Felix Kuehling
+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 FELIX KUEHLING BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 2000 Gareth Hughes
+Copyright 2002 Frank C. Earl
+Copyright 2002-2003 Leif Delgass
+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 COPYRIGHT OWNER(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.
+
+*************************************************************************
+
+Copyright � 2007 Red Hat Inc.
+Copyright � 2007 Intel Corporation
+Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
+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 SOFTWARE IS PROVIDED "AS 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, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+*************************************************************************
+
+Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+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
+VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+*************************************************************************
+
+
+GLX Hardware Device Driver common code
+Copyright (C) 1999 Wittawat Yamwong
+
+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
+WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, 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
+VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+
--- a/open-src/lib/libdrm/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libdrm/Makefile Fri May 15 09:36:46 2009 -0700
@@ -27,14 +27,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.10 09/02/05
+# @(#)Makefile 1.11 09/05/15
#
# Package name used in tarballs
MODULE_NAME=libdrm
# Version number (used in path names)
-MODULE_VERSION=2.3.1
+MODULE_VERSION=2.4.5
# Library name (used for specfiles/mapfiles)
LIBNAME=drm
@@ -46,7 +46,10 @@
GIT_URL_SET=yes
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = solaris-drm-port.patch 6802045.patch
+SOURCE_PATCHES = \
+ Makefile.patch,-p1 \
+ solaris-drm-port.patch \
+ 6802045.patch
# Need to regenerate files after patching Makefile.am in solaris-drm-port.patch
AUTORECONF=yes
@@ -58,7 +61,7 @@
#LIB_MAN_SUFFIX=3drm
# pkg-config files that need to have -R added
-FIX_PC_FILES=libdrm.pc.in
+FIX_PC_FILES=libdrm.pc.in libdrm_intel.pc.in
# Where to install files
MODULE_ADD_LIB_SUBDIR=$(X11_SERVERLIBS_SUBDIR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libdrm/Makefile.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,25 @@
+From 1bae8844cafd70f6196116f6e84b0f36c069e976 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sat, 9 May 2009 17:21:29 -0700
+Subject: [PATCH] Delete extra libdrm_lists.h line after libdrm_la_SOURCES in libdrm/Makefile.am
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ libdrm/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
+index 4c066e0..458420a 100644
+--- a/libdrm/Makefile.am
++++ b/libdrm/Makefile.am
+@@ -32,7 +32,6 @@ libdrm_la_LIBADD = @CLOCK_LIB@
+ AM_CFLAGS = -I$(top_srcdir)/shared-core
+ libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \
+ xf86drmMode.c libdrm_lists.h
+- libdrm_lists.h
+
+ libdrmincludedir = ${includedir}
+ libdrminclude_HEADERS = xf86drm.h xf86drmMode.h
+--
+1.5.6.5
+
--- a/open-src/lib/libdrm/solaris-drm-port.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libdrm/solaris-drm-port.patch Fri May 15 09:36:46 2009 -0700
@@ -27,8 +27,8 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2008-07-01 00:50:43.000000000 -0700
-+++ Makefile.am 2009-01-10 22:17:00.792398000 -0800
+--- Makefile.am 2009-02-23 13:29:52.000000000 -0800
++++ Makefile.am 2009-05-09 17:29:00.787462000 -0700
@@ -22,7 +22,7 @@
# here too, but let's just do libdrm for now
@@ -37,23 +37,23 @@
+SUBDIRS = libdrm shared-core
pkgconfigdir = @pkgconfigdir@
- pkgconfig_DATA = libdrm.pc
+ pkgconfig_DATA = libdrm.pc libdrm_intel.pc
diff -urp -x '*~' -x '*.orig' libdrm/xf86drm.c libdrm/xf86drm.c
---- libdrm/xf86drm.c 2008-07-01 00:51:40.000000000 -0700
-+++ libdrm/xf86drm.c 2009-01-10 22:17:00.782591000 -0800
-@@ -894,7 +894,7 @@ int drmRmMap(int fd, drm_handle_t handle
+--- libdrm/xf86drm.c 2009-01-09 17:08:29.000000000 -0800
++++ libdrm/xf86drm.c 2009-05-09 17:29:00.797394000 -0700
+@@ -940,7 +940,7 @@ int drmRmMap(int fd, drm_handle_t handle
{
drm_map_t map;
- map.handle = (void *)handle;
+ map.handle = (drm_handle_t)handle;
- if(ioctl(fd, DRM_IOCTL_RM_MAP, &map))
+ if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
return -errno;
diff -urp -x '*~' -x '*.orig' libdrm/xf86drm.h libdrm/xf86drm.h
---- libdrm/xf86drm.h 2008-07-01 00:51:40.000000000 -0700
-+++ libdrm/xf86drm.h 2009-01-10 22:17:00.783241000 -0800
-@@ -423,6 +423,19 @@ do { register unsigned int __old __asm("
+--- libdrm/xf86drm.h 2009-02-23 13:26:49.000000000 -0800
++++ libdrm/xf86drm.h 2009-05-09 17:29:00.802707000 -0700
+@@ -425,6 +425,19 @@ do { register unsigned int __old __asm("
#endif /* architecture */
#endif /* __GNUC__ >= 2 */
@@ -74,8 +74,8 @@
#define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */
#endif
diff -urp -x '*~' -x '*.orig' shared-core/drm.h shared-core/drm.h
---- shared-core/drm.h 2008-07-01 00:55:17.000000000 -0700
-+++ shared-core/drm.h 2009-01-10 22:17:00.781413000 -0800
+--- shared-core/drm.h 2008-12-17 10:28:24.000000000 -0800
++++ shared-core/drm.h 2009-05-09 17:29:00.817832000 -0700
@@ -58,6 +58,8 @@
#ifndef _DRM_H_
#define _DRM_H_
@@ -180,7 +180,7 @@
# define DRM_SIZE_T unsigned long
#endif
-@@ -264,12 +330,13 @@ struct drm_ctx_priv_map {
+@@ -266,12 +332,13 @@ struct drm_ctx_priv_map {
* \sa drmAddMap().
*/
struct drm_map {
@@ -197,7 +197,7 @@
int mtrr; /**< MTRR slot used */
/* Private data */
};
-@@ -376,18 +443,20 @@ enum drm_dma_flags {
+@@ -378,18 +445,20 @@ enum drm_dma_flags {
*
* \sa drmAddBufs().
*/
@@ -225,7 +225,7 @@
unsigned long agp_start; /**<
* Start address of where the AGP buffers are
* in the AGP aperture
-@@ -433,6 +502,7 @@ struct drm_buf_map {
+@@ -435,6 +504,7 @@ struct drm_buf_map {
void __user *virtual; /**< Mmap'd area in user-virtual */
#endif
struct drm_buf_pub __user *list; /**< Buffer information */
--- a/open-src/lib/libpciaccess/6785726.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
---- src/solx_devfs.c Tue Dec 16 09:33:33 2008
-+++ src/solx_devfs.c Tue Dec 16 10:39:28 2008
-@@ -671,6 +671,7 @@
- int i;
- pciaddr_t bytes;
- int len = 0;
-+ uint ent = 0;
-
- err = pci_device_solx_devfs_read( dev, config, 0, 256, & bytes );
- args.node = DI_NODE_NIL;
-@@ -752,13 +753,21 @@
- }
-
- /*
-- * solaris has its own BAR index. To be sure that
-- * Xorg has the same BAR number as solaris. ????
-+ * Solaris has its own BAR index.
-+ * Linux give two region slot for 64 bit address.
- */
- for (i = 0; i < len; i = i + CELL_NUMS_1275) {
-- int ent = i/CELL_NUMS_1275;
-
- reg = (pci_regspec_t *)®buf[i];
-+ ent = reg->pci_phys_hi & 0xff;
-+ /*
-+ * G35 broken in BAR0
-+ */
-+ ent = (ent - PCI_CONF_BASE0) >> 2;
-+ if (ent >= 6) {
-+ printf("error ent = %d\n", ent);
-+ break;
-+ }
-
- /*
- * non relocatable resource is excluded
-@@ -772,6 +781,17 @@
- dev->regions[ent].is_prefetchable = 1;
- }
-
-+
-+
-+ /*
-+ * We split the shift count 32 into two 16 to
-+ * avoid the complaining of the compiler
-+ */
-+ dev->regions[ent].base_addr = reg->pci_phys_low +
-+ ((reg->pci_phys_mid << 16) << 16);
-+ dev->regions[ent].size = reg->pci_size_low +
-+ ((reg->pci_size_hi << 16) << 16);
-+
- switch (reg->pci_phys_hi & PCI_REG_ADDR_M) {
- case PCI_ADDR_IO:
- dev->regions[ent].is_IO = 1;
-@@ -780,17 +800,11 @@
- break;
- case PCI_ADDR_MEM64:
- dev->regions[ent].is_64 = 1;
-+ /*
-+ * Skip one slot for 64 bit address
-+ */
- break;
- }
--
-- /*
-- * We split the shift count 32 into two 16 to
-- * avoid the complaining of the compiler
-- */
-- dev->regions[ent].base_addr = reg->pci_phys_low +
-- ((reg->pci_phys_mid << 16) << 16);
-- dev->regions[ent].size = reg->pci_size_low +
-- ((reg->pci_size_hi << 16) << 16);
- }
-
- return (err);
--- a/open-src/lib/libpciaccess/6789879.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- src/solx_devfs.c Fri Oct 31 08:40:09 2008
-+++ src/solx_devfs.c Wed Jan 7 13:58:31 2009
-@@ -68,7 +68,7 @@
- #include "pciaccess.h"
- #include "pciaccess_private.h"
-
--#define MAX_DEVICES 256
-+#define MAX_DEVICES 1024
- #define CELL_NUMS_1275 (sizeof(pci_regspec_t) / sizeof(uint_t))
-
- typedef union {
--- a/open-src/lib/libpciaccess/6811468.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-From be748a7b512bf5597e162694a3b1769132938fe1 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 15 Apr 2009 10:06:49 -0700
-Subject: [PATCH] Sun bug 6811468: pci_device_solx_devfs_probe accesses freed memory
-
-di_fini() is being called in pci_device_solx_devfs_probe()
-The di_fini (3DEVINFO) man page says "All handles associated with this
-snapshot become invalid after the call to di_fini()". But after that,
-eight lines down, the subroutine was calling di_prop_lookup_ints with
-a handle args.node which was stored from walking the device tree, and
-then using the pointers that returned even further down.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- src/solx_devfs.c | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/solx_devfs.c b/src/solx_devfs.c
-index 7d582ad..b56819c 100644
---- a/src/solx_devfs.c
-+++ b/src/solx_devfs.c
-@@ -726,8 +726,8 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
- {
- uint8_t config[256];
- int err;
-- di_node_t rnode;
-- i_devnode_t args;
-+ di_node_t rnode = DI_NODE_NIL;
-+ i_devnode_t args = { 0, 0, 0, DI_NODE_NIL };
- int *regbuf;
- pci_regspec_t *reg;
- int i;
-@@ -736,7 +736,6 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
- uint ent = 0;
-
- err = pci_device_solx_devfs_read( dev, config, 0, 256, & bytes );
-- args.node = DI_NODE_NIL;
-
- if ( bytes >= 64 ) {
- struct pci_device_private *priv =
-@@ -771,7 +770,6 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
- args.func = dev->func;
- (void) di_walk_node(rnode, DI_WALK_CLDFIRST,
- (void *)&args, find_target_node);
-- di_fini(rnode);
- }
- }
- if (args.node != DI_NODE_NIL) {
-@@ -786,7 +784,7 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
- }
-
- if (len <= 0)
-- return (err);
-+ goto cleanup;
-
-
- /*
-@@ -868,6 +866,10 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
- }
- }
-
-+ cleanup:
-+ if (rnode != DI_NODE_NIL) {
-+ di_fini(rnode);
-+ }
- return (err);
- }
-
---
-1.5.6.5
-
--- a/open-src/lib/libpciaccess/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libpciaccess/Makefile Fri May 15 09:36:46 2009 -0700
@@ -35,15 +35,10 @@
MODULE_NAME=libpciaccess
# Version number (used in path names)
-MODULE_VERSION=0.10.5
+MODULE_VERSION=0.10.6
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- sparc-byteswap.patch,-p1 \
- bus-range.patch,-p1 \
- 6811468.patch,-p1 \
- 6785726.patch \
- 6789879.patch \
scanpci.man.patch
# Library name
--- a/open-src/lib/libpciaccess/bus-range.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-From 5bf4b32c2b3844c50e720be5820f2ce657ddea12 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 22 Jan 2009 16:14:22 -0800
-Subject: [PATCH] Solaris: Use bus-range properties to limit busses scanned on each node
-
-Based on code provided by [email protected]
----
- src/solx_devfs.c | 116 ++++++++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 90 insertions(+), 26 deletions(-)
-
-diff --git a/src/solx_devfs.c b/src/solx_devfs.c
-index e184841..99ee1ac 100644
---- a/src/solx_devfs.c
-+++ b/src/solx_devfs.c
-@@ -22,7 +22,7 @@
- * DEALINGS IN THE SOFTWARE.
- */
- /*
-- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-+ * Copyright 2007, 2009 Sun Microsystems, 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
-@@ -68,6 +68,8 @@
- #include "pciaccess.h"
- #include "pciaccess_private.h"
-
-+/* #define DEBUG */
-+
- #define MAX_DEVICES 256
- #define CELL_NUMS_1275 (sizeof(pci_regspec_t) / sizeof(uint_t))
-
-@@ -85,12 +87,13 @@ typedef struct i_devnode {
-
- typedef struct nexus {
- int fd;
-- int domain;
-+ int first_bus;
-+ int last_bus;
-+ const char *path; /* for errors/debugging; fd is all we need */
- struct nexus *next;
- } nexus_t;
-
- static nexus_t *nexus_list = NULL;
--static int num_domains = 0;
- static int xsvc_fd = -1;
-
- /*
-@@ -127,9 +130,6 @@ static int xsvc_fd = -1;
- # define U45_SB_CLASS_RID 0x06040000
- #endif
-
--#define DEBUGON 0
--
--
- static int pci_device_solx_devfs_map_range(struct pci_device *dev,
- struct pci_device_mapping *map);
-
-@@ -174,12 +174,12 @@ static const struct pci_system_methods solx_devfs_methods = {
- };
-
- static nexus_t *
--find_nexus_for_domain( int domain )
-+find_nexus_for_bus( int bus )
- {
- nexus_t *nexus;
-
- for (nexus = nexus_list ; nexus != NULL ; nexus = nexus->next) {
-- if (nexus->domain == domain) {
-+ if ((bus >= nexus->first_bus) && (bus <= nexus->last_bus)) {
- return nexus;
- }
- }
-@@ -212,6 +212,7 @@ pci_system_solx_devfs_destroy( void )
- for (nexus = nexus_list ; nexus != NULL ; nexus = next) {
- next = nexus->next;
- close(nexus->fd);
-+ free(nexus->path);
- free(nexus);
- }
- nexus_list = NULL;
-@@ -443,7 +444,7 @@ probe_dev(nexus_t *nexus, pcitool_reg_t *prg_p, struct pci_system *pci_sys)
- /*
- * Domain is peer bus??
- */
-- pci_base->domain = nexus->domain;
-+ pci_base->domain = 0;
- pci_base->bus = prg_p->bus_no;
- pci_base->dev = prg_p->dev_no;
- pci_base->func = func;
-@@ -466,12 +467,20 @@ probe_dev(nexus_t *nexus, pcitool_reg_t *prg_p, struct pci_system *pci_sys)
- pci_sys->devices[pci_sys->num_devices].header_type
- = GET_CONFIG_VAL_8(PCI_CONF_HEADER);
-
--#if DEBUGON
-- fprintf(stderr, "busno = %x, devno = %x, funcno = %x\n",
-- prg_p->bus_no, prg_p->dev_no, func);
-+#ifdef DEBUG
-+ fprintf(stderr,
-+ "nexus = %s, busno = %x, devno = %x, funcno = %x\n",
-+ nexus->path, prg_p->bus_no, prg_p->dev_no, func);
- #endif
-
-- pci_sys->num_devices++;
-+ if (pci_sys->num_devices < (MAX_DEVICES - 1)) {
-+ pci_sys->num_devices++;
-+ } else {
-+ (void) fprintf(stderr,
-+ "Maximum number of PCI devices found,"
-+ " discarding additional devices\n");
-+ }
-+
-
- /*
- * Accommodate devices which state their
-@@ -495,17 +504,67 @@ static int
- probe_nexus_node(di_node_t di_node, di_minor_t minor, void *arg)
- {
- struct pci_system *pci_sys = (struct pci_system *) arg;
-- char *nexus_name;
-+ const char *nexus_name;
- nexus_t *nexus;
- int fd;
- char nexus_path[MAXPATHLEN];
-
-+ di_prop_t prop;
-+ const char *strings;
-+ int *ints;
-+ int numval;
-+ int pci_node = 0;
-+ int first_bus = 0, last_bus = PCI_REG_BUS_G(PCI_REG_BUS_M);
-+
-+#ifdef DEBUG
-+ nexus_name = di_devfs_minor_path(minor);
-+ fprintf(stderr, "-- device name: %s\n", nexus_name);
-+#endif
-+
-+ for (prop = di_prop_next(di_node, NULL); prop != NULL;
-+ prop = di_prop_next(di_node, prop)) {
-+
-+ const char *prop_name = di_prop_name(prop);
-+
-+#ifdef DEBUG
-+ fprintf(stderr, " property: %s\n", prop_name);
-+#endif
-+
-+ if (strcmp(prop_name, "device_type") == 0) {
-+ numval = di_prop_strings(prop, &strings);
-+ if (numval != 1 || strncmp(strings, "pci", 3) != 0) {
-+ /* not a PCI node, bail */
-+ return (DI_WALK_CONTINUE);
-+ }
-+ pci_node = 1;
-+ }
-+ else if (strcmp(prop_name, "class-code") == 0) {
-+ /* not a root bus node, bail */
-+ return (DI_WALK_CONTINUE);
-+ }
-+ else if (strcmp(prop_name, "bus-range") == 0) {
-+ numval = di_prop_ints(prop, &ints);
-+ if (numval == 2) {
-+ first_bus = ints[0];
-+ last_bus = ints[1];
-+ }
-+ }
-+ }
-+
-+#ifdef __x86 /* sparc pci nodes don't have the device_type set */
-+ if (pci_node != 1)
-+ return (DI_WALK_CONTINUE);
-+#endif
-+
-+ /* we have a PCI root bus node. */
- nexus = calloc(1, sizeof(nexus_t));
- if (nexus == NULL) {
- (void) fprintf(stderr, "Error allocating memory for nexus: %s\n",
- strerror(errno));
-- return DI_WALK_TERMINATE;
-+ return (DI_WALK_TERMINATE);
- }
-+ nexus->first_bus = first_bus;
-+ nexus->last_bus = last_bus;
-
- nexus_name = di_devfs_minor_path(minor);
- if (nexus_name == NULL) {
-@@ -517,14 +576,20 @@ probe_nexus_node(di_node_t di_node, di_minor_t minor, void *arg)
-
- snprintf(nexus_path, sizeof(nexus_path), "/devices%s", nexus_name);
- di_devfs_path_free(nexus_name);
-+ nexus->path = strdup(nexus_path);
-+
-+#ifdef DEBUG
-+ fprintf(stderr, "nexus = %s, bus-range = %d - %d\n",
-+ nexus_path, first_bus, last_bus);
-+#endif
-
- if ((fd = open(nexus_path, O_RDWR)) >= 0) {
- nexus->fd = fd;
-- nexus->domain = num_domains++;
- if ((do_probe(nexus, pci_sys) != 0) && (errno != ENXIO)) {
- (void) fprintf(stderr, "Error probing node %s: %s\n",
- nexus_path, strerror(errno));
- (void) close(fd);
-+ free(nexus->path);
- free(nexus);
- } else {
- nexus->next = nexus_list;
-@@ -533,6 +598,7 @@ probe_nexus_node(di_node_t di_node, di_minor_t minor, void *arg)
- } else {
- (void) fprintf(stderr, "Error opening %s: %s\n",
- nexus_path, strerror(errno));
-+ free(nexus->path);
- free(nexus);
- }
-
-@@ -553,9 +619,9 @@ do_probe(nexus_t *nexus, struct pci_system *pci_sys)
- pcitool_reg_t prg;
- uint32_t bus;
- uint8_t dev;
-- uint32_t last_bus = PCI_REG_BUS_M >> PCI_REG_BUS_SHIFT;
-+ uint32_t last_bus = nexus->last_bus;
- uint8_t last_dev = PCI_REG_DEV_M >> PCI_REG_DEV_SHIFT;
-- uint8_t first_bus = 0;
-+ uint8_t first_bus = nexus->first_bus;
- uint8_t first_dev = 0;
- int rval = 0;
-
-@@ -593,9 +659,6 @@ do_probe(nexus_t *nexus, struct pci_system *pci_sys)
- rval = 0;
- }
- }
-- if (pci_sys->num_devices > MAX_DEVICES) {
-- (void) fprintf(stderr, "pci devices reach maximum number\n");
-- }
-
- return (rval);
- }
-@@ -634,7 +697,7 @@ find_target_node(di_node_t node, void *arg)
- len = di_prop_lookup_ints(DDI_DEV_T_ANY, node, "reg", ®buf);
-
- if (len <= 0) {
--#if DEBUGON
-+#ifdef DEBUG
- fprintf(stderr, "error = %x\n", errno);
- fprintf(stderr, "can not find assigned-address\n");
- #endif
-@@ -808,7 +871,7 @@ pci_device_solx_devfs_read_rom( struct pci_device * dev, void * buffer )
- .size = dev->rom_size,
- .flags = 0
- };
--
-+
- err = pci_device_solx_devfs_map_range(dev, &prom);
- if (err == 0) {
- (void) bcopy(prom.memory, buffer, dev->rom_size);
-@@ -831,7 +894,7 @@ pci_device_solx_devfs_read( struct pci_device * dev, void * data,
- pcitool_reg_t cfg_prg;
- int err = 0;
- int i = 0;
-- nexus_t *nexus = find_nexus_for_domain(dev->domain);
-+ nexus_t *nexus = find_nexus_for_bus(dev->bus);
-
- *bytes_read = 0;
-
-@@ -852,7 +915,8 @@ pci_device_solx_devfs_read( struct pci_device * dev, void * data,
- cfg_prg.offset = offset + i;
-
- if ((err = ioctl(nexus->fd, PCITOOL_DEVICE_GET_REG, &cfg_prg)) != 0) {
-- fprintf(stderr, "read bdf<%x,%x,%x,%llx> config space failure\n",
-+ fprintf(stderr, "read bdf<%s,%x,%x,%x,%llx> config space failure\n",
-+ nexus->path,
- cfg_prg.bus_no,
- cfg_prg.dev_no,
- cfg_prg.func_no,
-@@ -882,7 +946,7 @@ pci_device_solx_devfs_write( struct pci_device * dev, const void * data,
- pcitool_reg_t cfg_prg;
- int err = 0;
- int cmd;
-- nexus_t *nexus = find_nexus_for_domain(dev->domain);
-+ nexus_t *nexus = find_nexus_for_bus(dev->bus);
-
- if ( bytes_written != NULL ) {
- *bytes_written = 0;
---
-1.5.6.5
-
--- a/open-src/lib/libpciaccess/sparc-byteswap.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-From 2525d8703f6948f3fa4879fd8483a964cb06faf8 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Tue, 18 Nov 2008 19:54:42 -0800
-Subject: [PATCH] Fill in byte swapping routines for big-endian Solaris machines
-
----
- src/common_interface.c | 18 ++++++++++++++----
- 1 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/common_interface.c b/src/common_interface.c
-index 0cdf25d..8808fdf 100644
---- a/src/common_interface.c
-+++ b/src/common_interface.c
-@@ -52,10 +52,20 @@
- #endif /* linux */
-
- #elif defined(__sun)
--#define LETOH_16(x) (x)
--#define HTOLE_16(x) (x)
--#define LETOH_32(x) (x)
--#define HTOLE_32(x) (x)
-+
-+#include <sys/byteorder.h>
-+
-+#ifdef _BIG_ENDIAN
-+# define LETOH_16(x) BSWAP_16(x)
-+# define HTOLE_16(x) BSWAP_16(x)
-+# define LETOH_32(x) BSWAP_32(x)
-+# define HTOLE_32(x) BSWAP_32(x)
-+#else
-+# define LETOH_16(x) (x)
-+# define HTOLE_16(x) (x)
-+# define LETOH_32(x) (x)
-+# define HTOLE_32(x) (x)
-+#endif /* Solaris */
-
- #else
-
---
-1.5.6.5
-
--- a/open-src/lib/libxkbui/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/libxkbui/Makefile Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
#
# xkbui Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 08/08/08
+# @(#)Makefile 1.5 09/05/15
#
# Package name used in tarballs
@@ -56,7 +56,4 @@
# pkg-config files that need to have -R added
FIX_PC_FILES=xkbui.pc.in
-# Install in private subdir for xorgcfg
-MODULE_ADD_LIB_SUBDIR=/xorgcfg
-
include ../Makefile.inc
--- a/open-src/lib/mesa/COPYING Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/mesa/COPYING Fri May 15 09:36:46 2009 -0700
@@ -68,9 +68,10 @@
licenses - not all of these are included in this binary package:
Mesa 3-D graphics library
-Version: 7.0.4
Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
+Copyright (C) 1999-2009 VMware, Inc. All Rights Reserved.
+Copyright (C) 2008 George Sapountzis <[email protected]>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -124,7 +125,55 @@
*************************************************************************
-Copyright (C) 2005 Aapo Tahkola.
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of Silicon Graphics, Inc.
+shall not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+Silicon Graphics, Inc.
+
+
+*************************************************************************
+
+Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
+ VA Linux Systems Inc., Fremont, California.
+Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
+ Tungsten Grahpics Inc., Austin, Texas.
+Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
+ Tungsten Graphics Inc., Cedar Park, Texas.
+Copyright 2000, 2001 VA Linux Systems Inc., Fremont, California.
+Copyright (C) 2004, 2008 Nicolai Haehnle.
+Copyright (C) 2005, 2006, 2007 Ben Skeggs.
+Copyright (C) 2005 Vladimir Dergachev.
+Copyright (C) 2005 Aapo Tahkola <[email protected]>
+Copyright (C) 2006 Dmitry Baryshkov, Laurent Carlier, Matthieu Castet,
+ Dawid Gajownik, Jeremy Kolb, Stephane Loeuillet, Patrice Mandin,
+ Stephane Marchesin, Serge Martin, Sylvain Munaut, Ben Skeggs, Erik Waling,
+ koala_br, sturmflut.
+Copyright (C) 2007 Dave Airlie
+Copyright (C) 2008 Oliver McFadden <[email protected]>
+Copyright 2008 Corbin Simpson <[email protected]>
All Rights Reserved.
@@ -151,34 +200,8 @@
*************************************************************************
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- VA Linux Systems Inc., Fremont, California.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2002, 2003, 2004, 2005, 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 2002-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 2009 Intel Corporation.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -225,10 +248,9 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
- David S. Miller <[email protected]>
-
-Copyright (C) 1999-2003 David Airlie All Rights Reserved.
+Copyright (C) 1999-2004 David Airlie 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"),
@@ -248,6 +270,8 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
+
Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
Cedar Park, Texas.
All Rights Reserved.
@@ -271,6 +295,7 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
Copyright (C) 2004-2007 Claudio Ciccani <[email protected]>
@@ -294,7 +319,11 @@
*************************************************************************
+Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
+ VA Linux Systems Inc., Fremont, California.
Copyright 2001 VA Linux Systems Inc., Fremont, California.
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+Copyright (C) 2004 Nicolai Haehnle.
All Rights Reserved.
@@ -317,42 +346,6 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-*************************************************************************
-
-
-******************************************************************************
-/
-/ File: GLView.h
-/
-/ Copyright 1993-98, Be Incorporated, All Rights Reserved.
-/
-******************************************************************************
-
-
-
-
- GGI-Driver for MESA
-
-Copyright (C) 1997 Uwe Maurer
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
----------------------------------------------------------------------
-This code was derived from the following source of information:
-
-svgamesa.c and ddsample.c by Brian Paul
-
***************************************************************************
*
@@ -385,6 +378,11 @@
Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
Copyright 2003 Eric Anholt
+Copyright 2006 Jeremy Kolb
+Copyright 2006 Nouveau
+Copyright 2006, 2007 Stephane Marchesin
+Copyright 2006 Stephane Marchesin, Sylvain Munaut
+
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -409,51 +407,8 @@
*************************************************************************
-
-
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-*************************************************************************
-
-Copyright 2006 Nouveau
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
Copyright 2001 by Alan Hourihane.
+Copyright 2002 by Alan Hourihane, Sychdyn, North Wales, UK.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -473,17 +428,13 @@
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Authors: Alan Hourihane, <[email protected]>
-
-3DLabs Gamma driver.
-
-
-
-
*************************************************************************
Copyright 2000 Compaq Computer Inc. and VA Linux Systems, Inc.
+Copyright 2000-2001 Compaq Computer Inc. VA Linux Systems, Inc.
+Copyright 2000, 2001 VA Linux Systems Inc., Fremont, California.
+
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -505,6 +456,7 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), [email protected]
@@ -551,7 +503,6 @@
*************************************************************************
-
Copyright 2006 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -572,35 +523,14 @@
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Copyright 2001 by Alan Hourihane.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
+*************************************************************************
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+Mesa 3-D graphics library GGI bindings (GGIGL [giggle])
+GGI-Driver for MESA
-Authors: Alan Hourihane, <[email protected]>
- Kevin E. Martin <[email protected]>
-
-
- GGI-Driver for MESA
-
+Copyright (C) 1995-2000 Brian Paul
Copyright (C) 1997-1998 Uwe Maurer - [email protected]
- 2002 Filip Spacek
+Copyright (C) 2001-2002 Filip Spacek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -620,10 +550,14 @@
svgamesa.c and ddsample.c by Brian Paul
-
+***************************************************************************
-Copyright 2005 Eric Anholt
-All Rights Reserved.
+Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+Copyright (c) 2003 Ville Syrjala
+Copyright 2005 Eric Anholt. All Rights Reserved.
+Copyright 2007-2008 Intel Corporation
+Copyright 2008 George Sapountzis
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -644,39 +578,6 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-Authors:
- Eric Anholt <[email protected]>
- Jim Duchek <[email protected]> -- Utah GLX 6326 code
- Alan Cox <[email protected]> -- 6326 Debugging
-
-
-
-Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
*************************************************************************
Copyright 2003 Eric Anholt
@@ -729,105 +630,40 @@
************************************************************************
-Mesa/FX device driver. Interface to Glide3.
-
- Copyright (c) 2003 - Daniel Borca
- Email : [email protected]
- Web : http://www.geocities.com/dborca
-
-
-
-
-Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
-Copyright 2006 Stephane Marchesin. All Rights Reserved
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
+Copyright (C) 1998-1999 Marcus Sundberg [[email protected]]
+Copyright (C) 1999-2000 Jon Taylor [[email protected]]
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- Tungsten Grahpics Inc., Austin, Texas.
-
-All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-*************************************************************************
-
- display-fbdev-mesa: visual handling
-
- Copyright (C) 1999 Jon Taylor [[email protected]]
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHOR(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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************
-
-Regarding GL_NV_texgen_reflection:
+Regarding GL_NV_texgen_reflection, GL_NV_point_sprite, GL_NV_fragment_program
+GL_NV_vertex_program, GL_NV_vertex_program1_1, etc:
Portions of this software may use or implement intellectual
property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
any and all warranties with respect to such intellectual property,
including any use thereof or modifications thereto.
+******************************************************************************
-GLX Hardware Device Driver for Intel i810
Copyright (C) 1999 Keith Whitwell
+Copyright (C) 1999 Wittawat Yamwong
Texmem interface changes (C) 2003 Dave Airlie
Permission is hereby granted, free of charge, to any person obtaining a
@@ -853,7 +689,7 @@
*************************************************************************
Copyright 2000-2001 VA Linux Systems, Inc.
-(C) Copyright IBM Corporation 2002, 2003
+(C) Copyright IBM Corporation 2002, 2003, 2004
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -875,39 +711,8 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-Authors:
- Keith Whitwell <[email protected]>
- Gareth Hughes <[email protected]>
-
*************************************************************************
-Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
-Copyright 2003 Eric Anholt
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 1992 Vrije Universiteit, The Netherlands
Permission to use, copy, modify, and distribute this software and its
@@ -928,6 +733,7 @@
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+*************************************************************************
Copyright (c) 1997 Theo de Raadt
@@ -954,35 +760,13 @@
*************************************************************************
+Copyright (C) The Weather Channel, Inc. 2002.
+Copyright (C) Tungsten Graphics 2002.
Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- Tungsten Graphics Inc., Austin, Texas.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+ VA Linux Systems Inc., Fremont, California.
+Copyright (C) 2004 Nicolai Haehnle.
+Copyright 2006 Stephane Marchesin.
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright (C) The Weather Channel, Inc. 2002.
-Copyright (C) 2004 Nicolai Haehnle.
All Rights Reserved.
The Weather Channel (TM) funded Tungsten Graphics to develop the
@@ -1011,37 +795,6 @@
*************************************************************************
-Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- VA Linux Systems Inc., Fremont, California.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
Copyright (C) 2004 Thomas Hellstrom, All Rights Reserved.
@@ -1064,112 +817,38 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
-
***************************************************************************
-Regarding GL_NV_fragment/vertex_program, GL_NV_vertex_program1_1, etc:
-
-Portions of this software may use or implement intellectual
-property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
-any and all warranties with respect to such intellectual property,
-including any use thereof or modifications thereto.
-
-******************************************************************************
-
- display-fbdev-kgicon-generic-mesa
-
- Copyright (C) 1999 Jon Taylor [[email protected]]
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+Copyright (c) 2007 The Khronos Group Inc.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE 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.
-
-******************************************************************************
-
-
-
-
-Copyright (C) 2006 Ben Skeggs.
-
-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
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials 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
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are 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 above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+THE MATERIALS ARE PROVIDED "AS 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 OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+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
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-** Copyright (c) 2007 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are 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 Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
+***************************************************************************
MGA Millennium (MGA2064W) functions
MGA Mystique (MGA1064SG) functions
Copyright 1996 The XFree86 Project, Inc.
-Authors
- Dirk Hohndel
- [email protected]
- David Dawes
- [email protected]
-Contributors:
- Guy DESBIEF, Aix-en-provence, France
- [email protected]
- MGA1064SG Mystique register file
-
************************************************************************
-Mesa 3-D graphics library
-Version: 5.0
Copyright (C) 1995-2002 Brian Paul
This library is free software; you can redistribute it and/or
@@ -1186,32 +865,7 @@
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Copyright (C) 2005 Ben Skeggs.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+*************************************************************************
Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
Precision Insight, Inc., Cedar Park, Texas, and
@@ -1240,6 +894,7 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -1261,31 +916,6 @@
*************************************************************************
-Copyright (C) 2004 Nicolai Haehnle.
-
-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
-ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
(C) Copyright IBM Corporation 2004
All Rights Reserved.
@@ -1363,88 +993,11 @@
next paragraph) shall be included in all copies or substantial portions
of the Software.
-
************************************************************************
-
-
-Copyright (C) 2005 Vladimir Dergachev.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-*****************************************************************************
-
- display-fbdev-mesa
-
- Copyright (C) 1999 Jon Taylor [[email protected]]
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHOR(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.
-
-******************************************************************************
-
-
-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.
-
-
-Copyright 2007 Stephane Marchesin. All Rights Reserved.
+Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+Copyright 2006-2007 Stephane Marchesin. 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"),
@@ -1465,32 +1018,7 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
-Copyright (C) 2007 Ben Skeggs.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+************************************************************************
Copyright 2000-2001 VA Linux Systems, Inc.
(c) Copyright IBM Corporation 2002
@@ -1515,62 +1043,11 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-Authors:
- Ian Romanick <[email protected]>
- Keith Whitwell <[email protected]>
-
-
-
-
-
-(c) Copyright IBM Corporation 2002
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Ian Romanick <[email protected]>
-
-
-
-Mesa 3-D graphics library
-Version: 3.2
-Copyright (C) 1995-2000 Brian Paul
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2007-2008 Red Hat, Inc.
(C) Copyright IBM Corporation 2004
All Rights Reserved.
@@ -1593,9 +1070,7 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Mesa 3-D graphics library
-Version: 7.1
+************************************************************************
Copyright (C) 2007 Tungsten Graphics All Rights Reserved.
@@ -1617,31 +1092,31 @@
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+************************************************************************
Copyright (C) 2006 Dave Airlie ([email protected])
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, 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:
+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 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.
+THE SOFTWARE IS PROVIDED "AS 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.
-
-Intel i810 DRI driver for Mesa 3.5
+*************************************************************************
Copyright (C) 1999-2000 Keith Whitwell All Rights Reserved.
@@ -1663,13 +1138,8 @@
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Author:
- Keith Whitwell <[email protected]>
-
-
-
-
+*************************************************************************
Mesa 3-D graphics library
Version: 4.0
@@ -1697,6 +1167,7 @@
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -1743,65 +1214,9 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
-Copyright 2000, 2001 VA Linux Systems Inc., Fremont, California.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+*************************************************************************
-Authors:
- Gareth Hughes <[email protected]>
- Keith Whitwell <[email protected]>
-
-
-
-
-GLX Hardware Device Driver common code
-Copyright (C) 1999 Wittawat Yamwong
-
-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
-KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
-(c) Copyright 1993, Silicon Graphics, Inc.
+(c) Copyright 1993, 1994 Silicon Graphics, Inc.
ALL RIGHTS RESERVED
Permission to use, copy, modify, and distribute this software for
any purpose and without fee is hereby granted, provided that the above
@@ -1838,31 +1253,9 @@
OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-Mesa 3-D graphics library GGI bindings (GGIGL [giggle])
-Version: 4.0
-Copyright (C) 1995-2000 Brian Paul
-Copyright (C) 1998 Uwe Maurer
-Copyrigth (C) 2001 Filip Spacek
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
+*************************************************************************
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-Mesa 3-D graphics library
-Version: 6.5
-
-Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
(C) Copyright IBM Corporation 2006
Permission is hereby granted, free of charge, to any person obtaining a
@@ -1883,146 +1276,8 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
-
-
-(C) Copyright IBM Corporation 2005
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-IBM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
*************************************************************************
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- VA Linux Systems Inc., Fremont, California.
-
-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
-ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
-
-
-
-(C) Copyright IBM Corporation 2002, 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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Ian Romanick <[email protected]>
-
-
-
-
-
-*************************************************************************
-
-Copyright 2006 Jeremy Kolb
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 2000-2001 VA Linux Systems, Inc.
-(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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
Copyright (C) Intel Corp. 2006. All Rights Reserved.
Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
develop this 3D driver.
@@ -2049,30 +1304,6 @@
********************************************************************
-GLX Hardware Device Driver for Intel tdfx
-Copyright (C) 1999 Keith Whitwell
-
-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
-KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
Copyright (C) Intel Corp. 2006. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
@@ -2095,232 +1326,8 @@
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 2000 VA Linux Systems Inc., Fremont, California.
-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
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Keith Whitwell <[email protected]>
- Gareth Hughes <[email protected]>
-
-
-
-
-Copyright 2000 ATI Technologies Inc., Markham, Ontario,
- VA Linux Systems Inc., Fremont, California.
-
-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 ATI, VA LINUX SYSTEMS AND/OR
-THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-(c) Copyright 1993, 1994, Silicon Graphics, Inc.
-ALL RIGHTS RESERVED
-Permission to use, copy, modify, and distribute this software for
-any purpose and without fee is hereby granted, provided that the above
-copyright notice appear in all copies and that both the copyright notice
-and this permission notice appear in supporting documentation, and that
-the name of Silicon Graphics, Inc. not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission.
-
-THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
-AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
-INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
-SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
-KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
-LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
-THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN
-ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
-POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
-
-US Government Users Restricted Rights
-Use, duplication, or disclosure by the Government is subject to
-restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-(c)(1)(ii) of the Rights in Technical Data and Computer Software
-clause at DFARS 252.227-7013 and/or in similar or successor
-clauses in the FAR or the DOD or NASA FAR Supplement.
-Unpublished-- rights reserved under the copyright laws of the
-United States. Contractor/manufacturer is Silicon Graphics,
-Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311.
-
-OpenGL(TM) is a trademark of Silicon Graphics, Inc.
-
-
-
-
-Copyright 2000-2001 VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-(C) Copyright IBM Corporation 2002, 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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright 2000-2001 VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Keith Whitwell <[email protected]>
- Gareth Hughes <[email protected]>
-
-
-
*************************************************************************
-Copyright 2000, 2001 VA Linux Systems Inc., Fremont, California.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************************
-
- GGIMesa debugging macros
-
- Copyright (C) 1998-1999 Marcus Sundberg [[email protected]]
- Copyright (C) 1999-2000 Jon Taylor [[email protected]]
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHOR(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.
-
-******************************************************************************
-
-
Copyright 2005 Felix Kuehling
All rights reserved.
@@ -2344,316 +1351,8 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:
-
-Portions of this software may use or implement intellectual
-property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
-any and all warranties with respect to such intellectual property,
-including any use thereof or modifications thereto.
-
******************************************************************************
- genkgi_visual.c: visual handling for the generic KGI helper
-
- Copyright (C) 1999 Jon Taylor [[email protected]]
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHOR(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.
-
-*************************************************************************
-
-Copyright (C) Tungsten Graphics 2002. All Rights Reserved.
-The Weather Channel, Inc. funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86
-license. This notice must be preserved.
-
-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 ATI, VA LINUX SYSTEMS AND/OR THEIR
-SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*************************************************************************
-
-
-Copyright 2002 by Alan Hourihane, Sychdyn, North Wales, UK.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Authors: Alan Hourihane, <[email protected]>
-
-Trident CyberBladeXP driver.
-
-
-
-**************************************************************************
-
- Copyright (C) 2006 :
- Dmitry Baryshkov,
- Laurent Carlier,
- Matthieu Castet,
- Dawid Gajownik,
- Jeremy Kolb,
- Stephane Loeuillet,
- Patrice Mandin,
- Stephane Marchesin,
- Serge Martin,
- Sylvain Munaut,
- Ben Skeggs,
- Erik Waling,
- koala_br,
- sturmflut.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- VA Linux Systems Inc., Fremont, California.
-Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
- Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2007 Stephane Marchesin
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2001 by Alan Hourihane.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Authors: Alan Hourihane, <[email protected]>
-
-
-
-
-Mesa 3-D graphics library
-Version: 3.3
-Copyright (C) 1995-2000 Brian Paul
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-Copyright (c) 2003 Ville Syrjala
-
-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.
-
-Authors:
- Ville Syrjala <[email protected]>
-
-
-
-Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
- VA Linux Systems Inc., Fremont, California.
-
-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 ATI, VA LINUX SYSTEMS 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.
-
-
-
-
Acceleration for the Creator and Creator3D framebuffer - register layout.
Copyright (C) 1998,1999,2000 Jakub Jelinek ([email protected])
@@ -2680,86 +1379,6 @@
*************************************************************************
-GLX Hardware Device Driver for Intel i810
-Copyright (C) 1999 Keith Whitwell
-
-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
-KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-*************************************************************************
-
-Copyright 2001 VA Linux Systems Inc., Fremont, California.
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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
-ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-Copyright 2000-2001 VA Linux Systems, Inc.
-(c) Copyright IBM Corporation 2002
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Ian Romanick <[email protected]>
- Keith Whitwell <[email protected]>
- Kevin E. Martin <[email protected]>
- Gareth Hughes <[email protected]>
-
-GLX Hardware Device Driver common code
Copyright (C) 1999 Wittawat Yamwong
Permission is hereby granted, free of charge, to any person obtaining a
@@ -2780,59 +1399,7 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, 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
-VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-Copyright 2006 Stephane Marchesin. 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
-VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
-Common header definitions for SiS 2D/3D/DRM suite
+*************************************************************************
Copyright (C) 2003 Eric Anholt
@@ -2854,52 +1421,7 @@
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Author:
- Eric Anholt <[email protected]>
-
-
-
-
-
-
-
-Copyright (C) 2004 David Airlie 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
-DAVID AIRLIE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Print GL state information (for debugging)
-Copyright (C) 1998 Brian Paul
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+*************************************************************************
(C) Copyright IBM Corporation 2004
All Rights Reserved.
@@ -2945,250 +1467,6 @@
IN AN ACTION 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 2000-2001 VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Keith Whitwell <[email protected]>
-
-*************************************************************************
-
-Copyright 2002 ATI Technologies Inc., Ontario, Canada, and
- Tungsten Graphics Inc., Austin, Texas.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-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
-ATI, TUNGSTEN GRAPHICS 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.
-
-*************************************************************************
-
-Mesa 3-D graphics library
-Version: 3.0
-Copyright (C) 1995-1998 Brian Paul
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*
-Copyright (C) 2004 David Airlie 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
-DAVID AIRLIE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-
-(C) Copyright IBM Corporation 2003
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright 2000 VA Linux Systems Inc., Fremont, California.
-
-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
-VA LINUX SYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Regarding GL_NV_point_sprite:
-
-Portions of this software may use or implement intellectual
-property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
-any and all warranties with respect to such intellectual property,
-including any use thereof or modifications thereto.
-
-
-Regarding GL_NV_fragment_program:
-
-Portions of this software may use or implement intellectual
-property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
-any and all warranties with respect to such intellectual property,
-including any use thereof or modifications thereto.
-
-
-
-
-
-
-
-
-Copyright (C) 2004 Nicolai Haehnle. 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
-
-Copyright 2000-2001 VA Linux Systems, Inc.
-(C) Copyright IBM Corporation 2002, 2003
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Ian Romanick <[email protected]>
- Keith Whitwell <[email protected]>
- Kevin E. Martin <[email protected]>
- Gareth Hughes <[email protected]>
-
-
-
-
-Mesa 3-D graphics library
-Version: 4.0
-Copyright (C) 1995-2001 Brian Paul
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
***************************************************************************
*
* Mesa bindings for SciTech MGL
@@ -3214,34 +1492,6 @@
***************************************************************************
Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-(C) Copyright IBM Corporation 2004
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL, IBM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
- Copyright (C) 2001 by Wind River Systems, Inc
-
-Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
(C) Copyright IBM Corporation 2004, 2006
All Rights Reserved.
@@ -3265,68 +1515,15 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+***************************************************************************
SimplexNoise1234
Copyright (c) 2003-2005, Stefan Gustavson
-
Contact: [email protected]
-
-(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
-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.
-
***************************************************************************
-Copyright 2005 Eric Anholt
-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.
-
-Authors:
- Eric Anholt <[email protected]>
-
-
-
-
-
-(C) Copyright IBM Corporation 2005, 2006
+(C) Copyright IBM Corporation 2004, 2005, 2006
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -3351,80 +1548,6 @@
*************************************************************************
-Copyright 2006 Stephane Marchesin
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 2006 Stephane Marchesin, Sylvain Munaut
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
-
-
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
Copyright 2000 VA Linux Systems, Inc.
All Rights Reserved.
@@ -3449,68 +1572,7 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-MGA Millennium (MGA2064W) functions
-
-Copyright 1996 The XFree86 Project, Inc.
-
-Authors
- Dirk Hohndel
- [email protected]
- David Dawes
- [email protected]
-
-
-
-Copyright 2000-2001 Compaq Computer Inc. VA Linux Systems, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Authors:
- Keith Whitwell <[email protected]>
-
-
-(C) Copyright IBM Corporation 2004, 2005
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-IBM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+***************************************************************************
(C) Copyright IBM Corporation 2002, 2004
All Rights Reserved.
@@ -3537,33 +1599,7 @@
xfonts.c -- glXUseXFont() for Mesa written by
Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
-
-Copyright 2001 by Alan Hourihane.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Alan Hourihane makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Authors: Alan Hourihane, <[email protected]>
- Keith Whitwell, <[email protected]>
-
-3DLabs Gamma driver.
-
-
+******************************************************************************
XML DRI client-side driver configuration
Copyright (C) 2003 Felix Kuehling
@@ -3586,3 +1622,32 @@
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2007, 2008 Red Hat, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Soft-
+ware"), to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, provided that the above copyright
+notice(s) and this permission notice appear in all copies of the Soft-
+ware and that both the above copyright notice(s) and this permission
+notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+MANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization of
+the copyright holder.
--- a/open-src/lib/mesa/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/mesa/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,14 +28,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.18 09/02/23
+# @(#)Makefile 1.19 09/05/15
#
# Package name used in tarballs
MODULE_NAME=mesa
# Version number (used in path names)
-MODULE_VERSION=7.2
+MODULE_VERSION=7.4.1
# Source tarball
SOURCE_TARBALL_NAME=MesaLib-$(MODULE_VERSION).tar.bz2
@@ -54,18 +54,14 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES= \
- execmem.patch,-p1 \
- mklib-libc.patch,-p1 \
- mklib-exports.patch,-p1 \
- mklib-SunCC.patch \
+ install-pc-dir.patch,-p1 \
+ glu-no-mangled-exports.patch \
solaris-port.patch
-# Regenerate configure after patching configure.ac with mklib-libc.patch
-AUTORECONF=yes
-
# File created by running configure script
AUTOCONF_TARGET=$(SOURCE_DIR)/configs/autoconf
AUTOCONF_TARGET_SET=yes
+MODULE_ADD_CONFIGURE_TARGETS=set_pc_dir
DRI_DRIVER_LIST_sparc=
DRI_DRIVER_LIST_i386=i915 i965 r200 r300 radeon
@@ -101,15 +97,13 @@
# Merge in additional sources from sun-src directory
ADDITIONAL_SOURCE_DIR=sun-src
+# pkg-config files that need to have -R added
+FIX_PC_FILES=src/*/*.pc.in src/mesa/drivers/dri/dri.pc.in
+
+
### Include common rulesets
include ../Makefile.inc
-### Rules specific to this directory:
-
-# Mesa installs its gl.pc files under /usr/X11/lib/pkgconfig, gives no
-# option for alternate paths, so we just copy them here to the protodir
-# path everyone else uses
-install_gen::
- mkdir -p $(PROTODIR)$(PKGCONFIG_DIR)
- $(INSTALL_SCRIPT) -m 644 $(SOURCE_DIR)/src/mesa/gl.pc \
- $(PROTODIR)$(PKGCONFIG_DIR)
+# Mesa makefiles use a different variable name/method for pkgconfig path
+set_pc_dir: $(AUTOCONF_TARGET)
+ echo 'INSTALL_PC_DIR=$(PKGCONFIG_DIR)' >> $(AUTOCONF_TARGET)
--- a/open-src/lib/mesa/execmem.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-From c2b838f049aa5f46c43b6a49b66a20c11d6128ab Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 16 Jul 2008 12:47:27 -0700
-Subject: [PATCH] Add Solaris to OS'es using PROT_EXEC mmap() to get executable heap space
----
- src/mesa/main/execmem.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
-index f95c318..b71846c 100644
---- a/src/mesa/main/execmem.c
-+++ b/src/mesa/main/execmem.c
-@@ -36,7 +36,7 @@ #include "glapi/glthread.h"
-
-
-
--#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__)
-+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)
-
- /*
- * Allocate a large block of memory which can hold code then dole it out
---
-1.4.1
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/glu-no-mangled-exports.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,65 @@
+--- src/glu/sgi/glu.exports 2009-01-22 09:38:33.000000000 -0800
++++ src/glu/sgi/glu.exports 2009-03-31 16:19:44.932561000 -0700
+@@ -57,62 +57,3 @@
+ gluTessVertex
+ gluUnProject
+ gluUnProject4
+- mgluBeginCurve
+- mgluBeginPolygon
+- mgluBeginSurface
+- mgluBeginTrim
+- mgluBuild1DMipmapLevels
+- mgluBuild1DMipmaps
+- mgluBuild2DMipmapLevels
+- mgluBuild2DMipmaps
+- mgluBuild3DMipmapLevels
+- mgluBuild3DMipmaps
+- mgluCheckExtension
+- mgluCylinder
+- mgluDeleteNurbsRenderer
+- mgluDeleteQuadric
+- mgluDeleteTess
+- mgluDisk
+- mgluEndCurve
+- mgluEndPolygon
+- mgluEndSurface
+- mgluEndTrim
+- mgluErrorString
+- mgluGetNurbsProperty
+- mgluGetString
+- mgluGetTessProperty
+- mgluLoadSamplingMatrices
+- mgluLookAt
+- mgluNewNurbsRenderer
+- mgluNewQuadric
+- mgluNewTess
+- mgluNextContour
+- mgluNurbsCallback
+- mgluNurbsCallbackData
+- mgluNurbsCallbackDataEXT
+- mgluNurbsCurve
+- mgluNurbsProperty
+- mgluNurbsSurface
+- mgluOrtho2D
+- mgluPartialDisk
+- mgluPerspective
+- mgluPickMatrix
+- mgluProject
+- mgluPwlCurve
+- mgluQuadricCallback
+- mgluQuadricDrawStyle
+- mgluQuadricNormals
+- mgluQuadricOrientation
+- mgluQuadricTexture
+- mgluScaleImage
+- mgluSphere
+- mgluTessBeginContour
+- mgluTessBeginPolygon
+- mgluTessCallback
+- mgluTessEndContour
+- mgluTessEndPolygon
+- mgluTessNormal
+- mgluTessProperty
+- mgluTessVertex
+- mgluUnProject
+- mgluUnProject4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/install-pc-dir.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,109 @@
+[Modified to apply to 7.4.1 tarballs]
+
+From 854cf5fedb3c0dd5879083dd08d0389e419e312d Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sun, 10 May 2009 18:57:27 -0700
+Subject: [PATCH] Define INSTALL_PC_DIR for pkgconfig file installation path
+
+Give builders/packagers a single variable to override if needed
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ configs/default | 1 +
+ src/glu/Makefile | 4 ++--
+ src/glut/glx/Makefile | 4 ++--
+ src/glut/mini/Makefile | 4 ++--
+ src/glw/Makefile | 4 ++--
+ src/mesa/Makefile | 8 ++++----
+ src/mesa/drivers/dri/Makefile | 4 ++--
+ 7 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/configs/default b/configs/default
+index 9c479fc..474abd6 100644
+--- a/configs/default
++++ b/configs/default
+@@ -117,6 +117,7 @@ APP_LIB_DEPS = -lm
+ INSTALL_DIR = /usr/local
+ INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
+ INSTALL_INC_DIR = $(INSTALL_DIR)/include
++INSTALL_PC_DIR = $(INSTALL_LIB_DIR)/pkgconfig
+ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
+
+ # Where libGL will look for DRI hardware drivers
+diff --git a/src/glu/Makefile b/src/glu/Makefile
+index 5c26ead..15bb467 100644
+--- a/src/glu/Makefile
++++ b/src/glu/Makefile
+@@ -29,9 +29,9 @@ glu.pc: glu.pc.in
+
+ install: glu.pc
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_PC_DIR)
+
+ clean:
+ -@for dir in $(SUBDIRS) ; do \
+diff --git a/src/glw/Makefile b/src/glw/Makefile
+index d88d773..34517f1 100644
+--- a/src/glw/Makefile
++++ b/src/glw/Makefile
+@@ -41,10 +41,10 @@ glw.pc: glw.pc.in
+ install: glw.pc
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_PC_DIR)
+
+ clean:
+ -rm -f depend depend.bak
+diff --git a/src/mesa/Makefile b/src/mesa/Makefile
+index bb18bee..49b1504 100644
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -128,17 +128,17 @@ install-headers:
+
+ install-libgl: default gl.pc install-headers
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+ $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_PC_DIR)
+
+ install-osmesa: default osmesa.pc
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
+ $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+ $(DESTDIR)$(INSTALL_LIB_DIR)
+- $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_PC_DIR)
+
+ install-dri: default
+ cd drivers/dri && $(MAKE) install
+diff --git a/src/mesa/drivers/dri/Makefile b/src/mesa/drivers/dri/Makefile
+index 32db097..e38c59a 100644
+--- a/src/mesa/drivers/dri/Makefile
++++ b/src/mesa/drivers/dri/Makefile
+@@ -41,8 +41,8 @@ install: dri.pc
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+ $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
+ $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+- $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_PC_DIR)
++ $(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_PC_DIR)
+
+
+ clean:
+--
+1.5.6.5
+
--- a/open-src/lib/mesa/mklib-SunCC.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff -urp -x '*~' -x '*.orig' bin/mklib bin/mklib
---- bin/mklib 2008-10-03 14:18:14.760469000 -0700
-+++ bin/mklib 2008-10-03 14:18:25.239726000 -0700
-@@ -372,6 +372,12 @@ case $ARCH in
- fi
- fi
-
-+ # If using Sun C++ compiler, need to tell it not to add runpaths
-+ # that are specific to the build machine
-+ if [ ${LINK} = "CC" ] ; then
-+ OPTS="${OPTS} -norunpath"
-+ fi
-+
- # Check if objects are SPARC v9
- # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
- set ${OBJECTS}
-@@ -387,6 +393,9 @@ case $ARCH in
-
- # Solaris linker requires explicitly listing the Standard C & C++
- # libraries in the link path when building shared objects
-+ if [ ${LINK} = "CC" ] ; then
-+ DEPS="${DEPS} -lCrun"
-+ fi
- DEPS="${DEPS} -lc"
-
- if [ $EXPORTS ] ; then
--- a/open-src/lib/mesa/mklib-exports.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-From 29f082e4d47699c09f909532cc0eae725e31851b Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 16 Jul 2008 13:16:19 -0700
-Subject: [PATCH] Convert mklib -exports list into a linker mapfile on Solaris
----
- bin/mklib | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/bin/mklib b/bin/mklib
-index aaae3a8..3eddb74 100755
---- a/bin/mklib
-+++ b/bin/mklib
-@@ -389,6 +389,17 @@ # rm -f exptmp
- # libraries in the link path when building shared objects
- DEPS="${DEPS} -lc"
-
-+ if [ $EXPORTS ] ; then
-+ # Make the 'mapfile.scope' linker mapfile
-+ echo "{" > mapfile.scope
-+ echo "global:" >> mapfile.scope
-+ sed 's/$/;/' ${EXPORTS} >> mapfile.scope
-+ echo "local:" >> mapfile.scope
-+ echo " *;" >> mapfile.scope
-+ echo "};" >> mapfile.scope
-+ OPTS="${OPTS} -M mapfile.scope"
-+ fi
-+
- # for debug:
- #echo "mklib: linker is" ${LINK} ${OPTS}
- if [ $NOPREFIX = 1 ] ; then
---
-1.4.1
-
--- a/open-src/lib/mesa/mklib-libc.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-From 3ff63b8a12e2d266b59a22e380cb4f40c00cc895 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 16 Jul 2008 12:56:29 -0700
-Subject: [PATCH] Move Solaris -lc linking flag for shared objects from configure.ac to mklib
----
- bin/mklib | 5 +++++
- configure.ac | 23 ++++++-----------------
- 2 files changed, 11 insertions(+), 17 deletions(-)
-
-diff --git a/bin/mklib b/bin/mklib
-index a25d5bf..aaae3a8 100755
---- a/bin/mklib
-+++ b/bin/mklib
-@@ -384,6 +384,11 @@ # rm -f exptmp
- if [ "${ALTOPTS}" ] ; then
- OPTS=${ALTOPTS}
- fi
-+
-+ # Solaris linker requires explicitly listing the Standard C & C++
-+ # libraries in the link path when building shared objects
-+ DEPS="${DEPS} -lc"
-+
- # for debug:
- #echo "mklib: linker is" ${LINK} ${OPTS}
- if [ $NOPREFIX = 1 ] ; then
-diff --git a/configure.ac b/configure.ac
-index 463821b..5d89bfa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,17 +345,6 @@ if test "x$enable_selinux" = "xyes"; the
- DEFINES="$DEFINES -DMESA_SELINUX"
- fi
-
--dnl OS-specific libraries
--OS_LIBS=""
--case "$host_os" in
--solaris*)
-- OS_LIBS="-lc"
-- if test "x$GXX" != xyes; then
-- OS_CPLUSPLUS_LIBS="-lCrun $OS_LIBS"
-- fi
-- ;;
--esac
--
- dnl
- dnl Driver configuration. Options are xlib, dri and osmesa right now.
- dnl More later: directfb, fbdev, ...
-@@ -514,7 +503,7 @@ xlib)
- X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
- GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
- fi
-- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $OS_LIBS"
-+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
-
- # if static, move the external libraries to the programs
- # and empty the libraries for libGL
-@@ -558,11 +547,11 @@ dri)
- fi
-
- # need DRM libs, -lpthread, etc.
-- GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS $OS_LIBS"
-+ GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
- ;;
- osmesa)
- # No libGL for osmesa
-- GL_LIB_DEPS="$OS_LIBS"
-+ GL_LIB_DEPS=""
- ;;
- esac
- AC_SUBST([GL_LIB_DEPS])
-@@ -799,7 +788,7 @@ osmesa)
- ;;
- esac
- if test "$enable_static" = no; then
-- OSMESA_LIB_DEPS="$OSMESA_LIB_DEPS $OS_LIBS"
-+ OSMESA_LIB_DEPS="$OSMESA_LIB_DEPS"
- fi
- AC_SUBST([OSMESA_LIB_DEPS])
- AC_SUBST([OSMESA_MESA_DEPS])
-@@ -900,7 +889,7 @@ if test "x$enable_glw" = xyes; then
- # If static, empty GLW_LIB_DEPS and add libs for programs to link
- if test "$enable_static" = no; then
- GLW_MESA_DEPS='-l$(GL_LIB)'
-- GLW_LIB_DEPS="$GLW_LIB_DEPS $OS_LIBS"
-+ GLW_LIB_DEPS="$GLW_LIB_DEPS"
- else
- APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"
- GLW_LIB_DEPS=""
-@@ -950,7 +939,7 @@ if test "x$enable_glut" = xyes; then
- # should check these...
- GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"
- fi
-- GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm $OS_LIBS"
-+ GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
-
- # If glut is available, we can build most programs
- if test "$with_demos" = yes; then
---
-1.4.1
-
--- a/open-src/lib/mesa/solaris-port.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/lib/mesa/solaris-port.patch Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,38 @@
---- src/glx/x11/Makefile 2008-09-13 13:25:44.000000000 -0700
-+++ src/glx/x11/Makefile 2008-10-03 07:51:04.249576000 -0700
-@@ -66,6 +66,10 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+diff -urp -x '*~' -x '*.orig' src/glx/x11/Makefile src/glx/x11/Makefile
+--- src/glx/x11/Makefile 2009-03-12 20:28:49.000000000 -0700
++++ src/glx/x11/Makefile 2009-03-31 09:12:45.627261000 -0700
+@@ -69,6 +69,10 @@ INCLUDES = -I. \
default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
@@ -11,9 +43,9 @@
# Make libGL
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-
---- src/mesa/drivers/dri/Makefile.template 2008-08-25 07:49:40.000000000 -0700
-+++ src/mesa/drivers/dri/Makefile.template 2008-10-03 10:53:42.854207000 -0700
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/Makefile.template
+--- src/mesa/drivers/dri/Makefile.template 2009-03-12 20:28:49.000000000 -0700
++++ src/mesa/drivers/dri/Makefile.template 2009-03-31 09:12:45.628778000 -0700
@@ -1,5 +1,10 @@
# -*-makefile-*-
@@ -25,10 +57,82 @@
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
COMMON_SOURCES = \
-
---- src/mesa/drivers/dri/intel/intel_context.c Tue Sep 30 10:14:35 2008
-+++ src/mesa/drivers/dri/intel/intel_context.c Tue Sep 30 10:29:38 2008
-@@ -69,6 +69,11 @@
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/common/dri_util.h src/mesa/drivers/dri/common/dri_util.h
+--- src/mesa/drivers/dri/common/dri_util.h 2009-03-12 20:28:49.000000000 -0700
++++ src/mesa/drivers/dri/common/dri_util.h 2009-03-31 09:12:45.637799000 -0700
+@@ -59,6 +59,10 @@
+
+ #define GLX_BAD_CONTEXT 5
+
++#define u_int64_t uint64_t
++#define u_int32_t uint32_t
++#define u_int8_t uint8_t
++
+ typedef struct __DRIswapInfoRec __DRIswapInfo;
+
+ /* Typedefs to avoid rewriting the world. */
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/mmio.h
+--- src/mesa/drivers/dri/common/mmio.h 2009-01-22 09:38:33.000000000 -0800
++++ src/mesa/drivers/dri/common/mmio.h 2009-03-31 09:12:45.639560000 -0700
+@@ -34,6 +34,7 @@
+ #define MMIO_H
+
+ #include "main/glheader.h"
++#include "dri_util.h"
+
+ #if defined( __powerpc__ )
+
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/i915/intel_tris.c src/mesa/drivers/dri/i915/intel_tris.c
+--- src/mesa/drivers/dri/i915/intel_tris.c 2009-03-17 07:48:46.000000000 -0700
++++ src/mesa/drivers/dri/i915/intel_tris.c 2009-03-31 09:12:45.639052000 -0700
+@@ -329,7 +329,7 @@ void intel_finish_vb(struct intel_contex
+ * Emit primitives as inline vertices *
+ ***********************************************************************/
+
+-#ifdef __i386__
++#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
+ #define COPY_DWORDS( j, vb, vertsize, v ) \
+ do { \
+ int __tmp; \
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_draw_upload.c
+--- src/mesa/drivers/dri/i965/brw_draw_upload.c 2009-03-12 20:28:49.000000000 -0700
++++ src/mesa/drivers/dri/i965/brw_draw_upload.c 2009-03-31 09:12:45.643357000 -0700
+@@ -26,6 +26,7 @@
+ **************************************************************************/
+
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "main/glheader.h"
+ #include "main/context.h"
+@@ -155,6 +156,23 @@ static GLuint byte_types_scale[5] = {
+ BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
+ };
+
++#if defined (sun)
++/* Solaris does not have ffsll in libc */
++#define NBITS_INT (CHAR_BIT * sizeof (int))
++static int ffsll(long long i)
++{
++ int i1;
++ int ret;
++
++ i1 = i & UINT_MAX;
++ ret = ffs(i1);
++ if (ret == 0) {
++ i1 = (i & 0xffffffff00000000) >> NBITS_INT;
++ ret = ffs(i1) + NBITS_INT;
++ }
++ return ret;
++}
++#endif
+
+ static GLuint get_surface_type( GLenum type, GLuint size, GLboolean normalized )
+ {
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_context.c
+--- src/mesa/drivers/dri/intel/intel_context.c 2009-03-27 17:56:14.000000000 -0700
++++ src/mesa/drivers/dri/intel/intel_context.c 2009-03-31 09:12:45.630903000 -0700
+@@ -70,6 +70,11 @@
int INTEL_DEBUG = (0);
#endif
@@ -37,19 +141,10 @@
+extern void _sigon(void);
+#endif
+
- #define need_GL_NV_point_sprite
#define need_GL_ARB_multisample
+ #define need_GL_ARB_occlusion_query
#define need_GL_ARB_point_parameters
-@@ -867,7 +872,7 @@
- intel->locked = 1;
-
- if (INTEL_DEBUG & DEBUG_LOCK)
-- _mesa_printf("%s - got contended lock\n", __progname);
-+ _mesa_printf("%s - got contended lock\n", __FUNCTION__);
-
- /* If the window moved, may need to set a new cliprect now.
- *
-@@ -966,6 +971,9 @@
+@@ -993,6 +998,9 @@ void LOCK_HARDWARE( struct intel_context
intel_fb->Base._ColorDrawBufferIndexes[0]);
}
@@ -59,56 +154,65 @@
if (intel_rb && dPriv->vblFlags &&
!(dPriv->vblFlags & VBLANK_FLAG_NO_IRQ) &&
(intel_fb->vbl_waited - intel_rb->vbl_pending) > (1<<23)) {
-@@ -981,6 +989,7 @@
+@@ -1008,6 +1016,7 @@ void LOCK_HARDWARE( struct intel_context
drmWaitVBlank(intel->driFd, &vbl);
intel_fb->vbl_waited = vbl.reply.sequence;
}
+#endif
- DRM_CAS(intel->driHwLock, intel->hHWContext,
- (DRM_LOCK_HELD|intel->hHWContext), __ret);
-@@ -998,7 +1007,7 @@
-
-
- if (INTEL_DEBUG & DEBUG_LOCK)
-- _mesa_printf("%s - locked\n", __progname);
-+ _mesa_printf("%s - locked\n", __FUNCTION__);
- }
-
-
-@@ -1014,7 +1023,7 @@
- _glthread_UNLOCK_MUTEX(lockMutex);
-
- if (INTEL_DEBUG & DEBUG_LOCK)
-- _mesa_printf("%s - unlocked\n", __progname);
-+ _mesa_printf("%s - unlocked\n", __FUNCTION__);
-
- /**
- * Nothing should be left in batch outside of LOCK/UNLOCK which references
-@@ -1021,5 +1030,9 @@
- * cliprects.
+ if (!sPriv->dri2.enabled) {
+ DRM_CAS(intel->driHwLock, intel->hHWContext,
+@@ -1046,5 +1055,9 @@ void UNLOCK_HARDWARE( struct intel_conte
*/
- assert(intel->batch->cliprect_mode != REFERENCES_CLIPRECTS);
+ if (intel->batch->cliprect_mode == REFERENCES_CLIPRECTS)
+ intel_batchbuffer_flush(intel->batch);
+
+#if defined(sun)
+ _sigon();
+#endif
}
---- src/mesa/drivers/dri/intel/intel_screen.c Tue Sep 30 10:38:08 2008
-+++ src/mesa/drivers/dri/intel/intel_screen.c Tue Sep 30 10:41:06 2008
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_context.h
+--- src/mesa/drivers/dri/intel/intel_context.h 2009-03-27 17:56:14.000000000 -0700
++++ src/mesa/drivers/dri/intel/intel_context.h 2009-03-31 09:12:45.655815000 -0700
+@@ -309,8 +309,12 @@
+ void LOCK_HARDWARE( struct intel_context *intel );
+ void UNLOCK_HARDWARE( struct intel_context *intel );
+
++#if defined(__sun)
++# include <stdlib.h>
++# define __progname getexecname()
++#else
+ extern char *__progname;
+-
++#endif
+
+ #define SUBPIXEL_X 0.125
+ #define SUBPIXEL_Y 0.125
+@@ -352,7 +352,7 @@ do { \
+ * than COPY_DWORDS would:
+ * XXX Put this in src/mesa/main/imports.h ???
+ */
+-#if defined(i386) || defined(__i386__)
++#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
+ static INLINE void * __memcpy(void * to, const void * from, size_t n)
+ {
+ int d0, d1, d2;
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_screen.c
+--- src/mesa/drivers/dri/intel/intel_screen.c 2009-03-17 07:48:46.000000000 -0700
++++ src/mesa/drivers/dri/intel/intel_screen.c 2009-03-31 09:12:45.636871000 -0700
@@ -25,6 +25,8 @@
*
**************************************************************************/
+#include <unistd.h>
+#include <signal.h>
- #include "glheader.h"
- #include "context.h"
- #include "framebuffer.h"
+ #include "main/glheader.h"
+ #include "main/context.h"
+ #include "main/framebuffer.h"
@@ -51,6 +53,15 @@
#include "intel_batchbuffer.h"
- #include "intel_bufmgr_ttm.h"
+ #include "intel_bufmgr.h"
+static void stop_handler(int sig)
+{
@@ -122,7 +226,7 @@
PUBLIC const char __driConfigOptions[] =
DRI_CONF_BEGIN
DRI_CONF_SECTION_PERFORMANCE
-@@ -488,6 +499,12 @@
+@@ -292,6 +303,12 @@ static GLboolean intelInitDriver(__DRIsc
sPriv->extensions = intelScreenExtensions;
@@ -135,113 +239,10 @@
return GL_TRUE;
}
---- src/mesa/drivers/dri/common/dri_util.h Wed Sep 24 13:38:44 2008
-+++ src/mesa/drivers/dri/common/dri_util.h Wed Sep 24 13:39:06 2008
-@@ -60,6 +60,10 @@
-
- #define GLX_BAD_CONTEXT 5
-
-+#define u_int64_t uint64_t
-+#define u_int32_t uint32_t
-+#define u_int8_t uint8_t
-+
- typedef struct __DRIswapInfoRec __DRIswapInfo;
-
- /* Typedefs to avoid rewriting the world. */
---- src/mesa/drivers/dri/i915/intel_tris.c Mon Aug 25 07:49:40 2008
-+++ src/mesa/drivers/dri/i915/intel_tris.c Wed Sep 24 13:53:25 2008
-@@ -156,7 +156,7 @@
- * Emit primitives as inline vertices *
- ***********************************************************************/
-
--#ifdef __i386__
-+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
- #define COPY_DWORDS( j, vb, vertsize, v ) \
- do { \
- int __tmp; \
-224c224
---- src/mesa/drivers/dri/common/mio.h Wed Sep 24 14:04:29 2008
-+++ src/mesa/drivers/dri/common/mmio.h Wed Sep 24 14:04:45 2008
-@@ -34,6 +34,7 @@
- #define MMIO_H
-
- #include "glheader.h"
-+#include "dri_util.h"
-
- #if defined( __powerpc__ )
-
---- src/mesa/drivers/dri/radeon/server/radeon_dri.h Wed Sep 24 14:05:24 2008
-+++ src/mesa/drivers/dri/radeon/server/radeon_dri.h Wed Sep 24 14:06:48 2008
-@@ -90,6 +90,7 @@
- /*@{*/
- drm_handle_t registerHandle; /**< \brief MMIO register map size */
- drmSize registerSize; /**< \brief MMIO register map handle */
-+ int padding0;
- /*@}*/
-
- /**
-@@ -98,6 +99,7 @@
- /*@{*/
- drm_handle_t statusHandle; /**< \brief status map handle */
- drmSize statusSize; /**< \brief status map size */
-+ int padding1;
- /*@}*/
-
- /**
-@@ -106,11 +108,13 @@
- /*@{*/
- drm_handle_t gartTexHandle; /**< \brief AGP texture area map handle */
- drmSize gartTexMapSize; /**< \brief AGP texture area map size */
-+ int padding2;
- int log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */
- int gartTexOffset; /**< \brief AGP texture area offset in AGP space */
- /*@}*/
-
- unsigned int sarea_priv_offset; /**< \brief offset of the private SAREA data*/
-+ int padding3;
- } RADEONDRIRec, *RADEONDRIPtr;
-
- #endif
-
---- src/mesa/drivers/dri/i965/brw_draw_upload.c Wed Sep 24 14:14:46 2008
-+++ src/mesa/drivers/dri/i965/brw_draw_upload.c Wed Sep 24 14:16:22 2008
-@@ -26,6 +26,7 @@
- **************************************************************************/
-
- #include <stdlib.h>
-+#include <string.h>
-
- #include "glheader.h"
- #include "context.h"
-@@ -156,7 +157,24 @@
- BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
- };
-
-+#if defined (sun)
-+/* Solaris does not have ffsll in libc */
-+#define NBITS_INT (CHAR_BIT * sizeof (int))
-+static int ffsll(long long i)
-+{
-+ int i1;
-+ int ret;
-
-+ i1 = i & UINT_MAX;
-+ ret = ffs(i1);
-+ if (ret == 0) {
-+ i1 = (i & 0xffffffff00000000) >> NBITS_INT;
-+ ret = ffs(i1) + NBITS_INT;
-+ }
-+ return ret;
-+}
-+#endif
-+
- static GLuint get_surface_type( GLenum type, GLuint size, GLboolean normalized )
- {
- if (INTEL_DEBUG & DEBUG_VERTS)
-
---- src/mesa/drivers/dri/intel/server/i830_dri.h Tue Sep 30 09:13:02 2008
-+++ src/mesa/drivers/dri/intel/server/i830_dri.h Tue Sep 30 09:15:40 2008
-@@ -21,16 +21,20 @@
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/intel/server/i830_dri.h src/mesa/drivers/dri/intel/server/i830_dri.h
+--- src/mesa/drivers/dri/intel/server/i830_dri.h 2008-08-25 07:46:43.000000000 -0700
++++ src/mesa/drivers/dri/intel/server/i830_dri.h 2009-03-31 09:12:45.654900000 -0700
+@@ -21,16 +21,20 @@ typedef struct _I830DRIRec {
drm_handle_t unused2; /* backbuffer */
drmSize unused3; /* depthbufferSize */
@@ -262,26 +263,36 @@
int deviceID;
int width;
---- src/mesa/drivers/dri/intel/intel_buffers.c Tue Sep 30 10:54:45 2008
-+++ src/mesa/drivers/dri/intel/intel_buffers.c Tue Sep 30 10:55:09 2008
-@@ -224,7 +224,7 @@
-
- if (INTEL_DEBUG & DEBUG_LOCK)
- if (pf_active != intel_fb->pf_active)
-- _mesa_printf("%s - Page flipping %sactive\n", __progname,
-+ _mesa_printf("%s - Page flipping %sactive\n", __FUNCTION__,
- pf_active ? "" : "in");
+diff -urp -x '*~' -x '*.orig' src/mesa/drivers/dri/radeon/server/radeon_dri.h src/mesa/drivers/dri/radeon/server/radeon_dri.h
+--- src/mesa/drivers/dri/radeon/server/radeon_dri.h 2009-01-22 09:38:33.000000000 -0800
++++ src/mesa/drivers/dri/radeon/server/radeon_dri.h 2009-03-31 09:12:45.642139000 -0700
+@@ -89,6 +89,7 @@ typedef struct {
+ /*@{*/
+ drm_handle_t registerHandle; /**< \brief MMIO register map size */
+ drmSize registerSize; /**< \brief MMIO register map handle */
++ int padding0;
+ /*@}*/
- if (pf_active) {
---- src/mesa/drivers/dri/intel/intel_context.h Tue Sep 30 10:31:32 2008
-+++ src/mesa/drivers/dri/intel/intel_context.h Tue Sep 30 12:01:59 2008
-@@ -327,7 +327,7 @@
- * than COPY_DWORDS would:
- * XXX Put this in src/mesa/main/imports.h ???
- */
--#if defined(i386) || defined(__i386__)
-+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
- static INLINE void * __memcpy(void * to, const void * from, size_t n)
- {
- int d0, d1, d2;
-
+ /**
+@@ -97,6 +98,7 @@ typedef struct {
+ /*@{*/
+ drm_handle_t statusHandle; /**< \brief status map handle */
+ drmSize statusSize; /**< \brief status map size */
++ int padding1;
+ /*@}*/
+
+ /**
+@@ -105,11 +107,13 @@ typedef struct {
+ /*@{*/
+ drm_handle_t gartTexHandle; /**< \brief AGP texture area map handle */
+ drmSize gartTexMapSize; /**< \brief AGP texture area map size */
++ int padding2;
+ int log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */
+ int gartTexOffset; /**< \brief AGP texture area offset in AGP space */
+ /*@}*/
+
+ unsigned int sarea_priv_offset; /**< \brief offset of the private SAREA data*/
++ int padding3;
+ } RADEONDRIRec, *RADEONDRIPtr;
+
+ #endif
--- a/open-src/proto/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/proto/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.13 09/01/14
+# @(#)Makefile 1.14 09/05/15
#
###############################################################################
@@ -37,6 +37,7 @@
bigreqsproto \
compositeproto \
damageproto \
+ dri2proto \
evieproto \
fixesproto \
fontcacheproto \
--- a/open-src/proto/Makefile.inc Thu May 14 20:00:54 2009 -0700
+++ b/open-src/proto/Makefile.inc Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.7 09/01/14
+# @(#)Makefile.inc 1.8 09/05/15
#
PWD:sh=pwd
@@ -50,6 +50,10 @@
MODTYPE_LDFLAGS=$(LIB_LDFLAGS)
MODTYPE_LD_OPTIONS=
+# pkg-config files that need to have -I paths added to -uninstalled versions
+FIX_PC_FILES_DEFAULT = $(FIX_PC_FILES_SET:yes=$(POUND_SIGN))
+$(FIX_PC_FILES_DEFAULT) FIX_PC_FILES=*.pc.in
+
### Include common rulesets
include $(TOP)/common/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/proto/dri2proto/Makefile Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,42 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+# Package name used in tarballs
+MODULE_NAME=dri2proto
+
+# Version number (used in path names)
+MODULE_VERSION=2.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+### Include common rulesets
+include ../Makefile.inc
--- a/open-src/proto/sun-ext-protos/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/proto/sun-ext-protos/Makefile Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,7 +29,7 @@
# of the copyright holder.
#
#
-# ident "@(#)Makefile 1.2 08/08/08 SMI"
+# ident "@(#)Makefile 1.3 09/05/15 SMI"
#
# Definitions of Solaris-specific X Server extensions
@@ -37,11 +37,13 @@
SOURCE_TARBALL_NAME=NONE
SOURCE_TARBALL_NAME_SET=yes
-# Don't need to configure or build these
+# Don't need to configure or build these or install pkg-config files for them
BUILD_TARGETS=
BUILD_TARGETS_SET=yes
INSTALL_TARGETS=
INSTALL_TARGETS_SET=yes
+FIX_PC_FILES=
+FIX_PC_FILES_SET=yes
### Include common rulesets
include ../Makefile.inc
--- a/open-src/proto/x11proto/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/proto/x11proto/Makefile Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 09/04/17
+# @(#)Makefile 1.10 09/05/15
#
# Package name used in tarballs
@@ -42,9 +42,3 @@
### Include common rulesets
include ../Makefile.inc
-
-# Extra install for bootstrapping the old monolith
-install_gen:: $(SOURCE_DIR)/Makefile
- @if [ -d $(PROTODIR)/../xc/include ] ; then \
- (set -x ; cd $(SOURCE_DIR) ; $(MAKE) $(MAKEFLAGS) -e DESTDIR=$(PROTODIR) xprotodir=/../xc/include install) ;\
- fi
--- a/open-src/xserver/Makefile.inc Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/Makefile.inc Fri May 15 09:36:46 2009 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.11 09/02/18
+# @(#)Makefile.inc 1.12 09/05/15
#
PWD:sh=pwd
@@ -40,7 +40,7 @@
include $(TOP)/common/Makefile.init
# Xorg server source tarball to use sources from
-XORGSERVER_VERS=1.5.3
+XORGSERVER_VERS=1.6.1.901
# Patches shared between Xorg & Xvnc builds
XORG_SOURCE_PATCHES:sh=cat -s ../xorg/patch-list ../xorg/closed-src/patch-list | sed '/^\#/ d'
@@ -56,8 +56,7 @@
--bindir='$${exec_prefix}/bin/$(ARCHBINSUBDIR)' \
--disable-xdm-auth-1 --enable-xcsecurity \
--enable-shared --disable-static \
- --disable-xsdl --disable-xwin --disable-xgl \
- --disable-kbd_mode \
+ --disable-xsdl --disable-xwin --disable-xnest \
--disable-install-setuid \
--with-vendor-name="Sun Microsystems, Inc." \
--with-vendor-web="http://sunsolve.sun.com/" \
@@ -66,7 +65,6 @@
--with-module-dir=$(SERVER_MODULES_DIR) \
--with-dri-driver-path=$(DRI_MODULES_DIR) \
--with-xkb-path='$${libdir}/X11/xkb' \
- --with-rgb-path='$${libdir}/X11/rgb' \
--with-serverconfig-path='$${libdir}/X11/xserver' \
--with-default-font-path="catalogue:/etc/X11/fontpath.d" \
--with-default-xkb-rules=xorg \
@@ -74,21 +72,18 @@
$(ADDITIONAL_CONFIG_OPTS)
XSERVER_CONFIG_OPTS_sparc=$(XSERVER_CONFIG_OPTS_COMMON) \
- --disable-glx
+ --disable-glx --disable-dri2
XSERVER_CONFIG_OPTS_i386=$(XSERVER_CONFIG_OPTS_COMMON) \
- --with-mesa-source=$(MESA_SRC_DIR)
+ --with-mesa-source=$(MESA_SRC_DIR) --enable-dri2
XSERVER_CONFIG_OPTS=$(XSERVER_CONFIG_OPTS_$(MACH))
-# Need to append header path with gcc headers for MMX/SSE intrinsics
-GCC_HEADERS:sh=gcc -print-search-dirs | awk -F: '$1 == "install" {printf "-idirafter %s/install-tools/include", $2}'
-
# Default DPMS settings for Solaris
DPMS_DEFINES= -DDEFAULT_STANDBY_TIME=900000 \
-DDEFAULT_SUSPEND_TIME=1080000 \
-DDEFAULT_OFF_TIME=1260000
MODTYPE_CPPFLAGS_suncc= # No extra flags needed
-MODTYPE_CPPFLAGS_gcc= $(GCC_HEADERS)
+MODTYPE_CPPFLAGS_gcc= # No extra flags needed
MODTYPE_CPPFLAGS= \
-I$(PROTODIR)/usr/include \
@@ -107,6 +102,7 @@
# Environment variable options to GNU autoconf configure script
# - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking
# use of headers from proto area
+# - PATH - include /usr/sbin for dtrace command (needed for building probes)
MODTYPE_CONFIG_ENV = \
XSERVERCFLAGS_CFLAGS="-DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API" \
PATH=$(PATH):/usr/sbin
@@ -131,6 +127,7 @@
MODTYPE_BUILD_64_FLAGS=$(MODTYPE_BUILD_64_FLAGS_$(MACH))
# Environment variable options to use when building
+# - PATH - include /usr/sbin for dtrace command (needed for building probes)
MODTYPE_BUILD_ENV= PATH=$(PATH):/usr/sbin \
LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR):$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR):$(PROTODIR)$(X11_DIR)/lib/xorgcfg$(ARCHLIBSUBDIR)
--- a/open-src/xserver/xorg/6406044.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/6406044.patch Fri May 15 09:36:46 2009 -0700
@@ -28,9 +28,10 @@
Redo the patch for Xorg 1.5. The patch is helpful only for nv driver.
---- hw/xfree86/modes/xf86EdidModes.c.orig Fri Dec 5 15:42:03 2008
-+++ hw/xfree86/modes/xf86EdidModes.c Fri Dec 12 15:40:54 2008
-@@ -622,6 +622,20 @@
+diff -urp -x '*~' -x '*.orig' hw/xfree86/modes/xf86EdidModes.c hw/xfree86/modes/xf86EdidModes.c
+--- hw/xfree86/modes/xf86EdidModes.c 2009-01-09 09:47:04.000000000 -0800
++++ hw/xfree86/modes/xf86EdidModes.c 2009-01-22 20:35:43.666680000 -0800
+@@ -794,6 +794,20 @@ xf86DDCGetModes(int scrnIndex, xf86MonPt
&det_mon->section.d_timings,
preferred,
quirks);
--- a/open-src/xserver/xorg/6535006.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/6535006.patch Fri May 15 09:36:46 2009 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c
---- hw/xfree86/common/xf86Mode.c 2008-09-24 20:23:48.393454000 -0700
-+++ hw/xfree86/common/xf86Mode.c 2008-09-24 20:24:02.313999000 -0700
-@@ -1415,7 +1415,45 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+--- hw/xfree86/common/xf86Mode.c 2009-01-22 20:35:43.655168000 -0800
++++ hw/xfree86/common/xf86Mode.c 2009-01-22 20:35:51.516322000 -0800
+@@ -1409,7 +1409,45 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
virtX = virtualX;
virtY = virtualY;
scrp->virtualFrom = X_CONFIG;
@@ -48,7 +48,7 @@
/* No virtual size given in the config, try to infer */
/* XXX this doesn't take m{in,ax}Pitch into account; oh well */
inferred_virtual = inferVirtualSize(scrp, availModes, &virtX, &virtY);
-@@ -1500,12 +1538,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1494,12 +1532,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
xf86DeleteMode(&scrp->modes, scrp->modes);
endp = &scrp->modes;
last = NULL;
--- a/open-src/xserver/xorg/6618220.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86RandR.c hw/xfree86/common/xf86RandR.c
---- hw/xfree86/common/xf86RandR.c 2008-09-24 20:24:55.563464000 -0700
-+++ hw/xfree86/common/xf86RandR.c 2008-09-24 20:25:14.259832000 -0700
-@@ -72,7 +72,7 @@ xf86RandRGetInfo (ScreenPtr pScreen, Rot
-
- *rotations = RR_Rotate_0;
-
-- for (mode = scrp->modes; ; mode = mode->next)
-+ for (mode = scrp->modes; mode!=NULL ; mode = mode->next)
- {
- int refresh = xf86RandRModeRefresh (mode);
-
--- a/open-src/xserver/xorg/6668806.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/ix86Pci.c hw/xfree86/os-support/bus/ix86Pci.c
---- hw/xfree86/os-support/bus/ix86Pci.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/os-support/bus/ix86Pci.c 2008-09-24 20:25:29.280648000 -0700
-@@ -267,6 +267,7 @@ ix86PciBusCheck(void)
- case (PCI_CLASS_PREHISTORIC << 8) | PCI_SUBCLASS_PREHISTORIC_VGA:
- case (PCI_CLASS_DISPLAY << 8) | PCI_SUBCLASS_DISPLAY_VGA:
- case (PCI_CLASS_BRIDGE << 8) | PCI_SUBCLASS_BRIDGE_HOST:
-+ case (PCI_CLASS_BRIDGE << 8) | PCI_SUBCLASS_BRIDGE_PCI:
- return TRUE;
-
- default:
--- a/open-src/xserver/xorg/6685465.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-From c8216aede6c4ac41976947521d884fa010913204 Mon Sep 17 00:00:00 2001
-From: Jeremy Uejio <[email protected]>
-Date: Tue, 1 Jul 2008 13:37:12 -0700
-Subject: [PATCH] Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
-
-<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
-
-This bug is caused by Xephyr not handling the RGB byte order correctly
-of the server where Xephyr is displaying on. The previous code just
-assumed that the order was RGB and did not take into account that
-Xservers may use different order (such as BGR).
-
-The fix is to add a function to calculate the byte order and bits
-to shift based on the visual mask and the visual bits_per_rgb (which
-is usually 8, but could be server dependent). Since the shifts won't
-change once the display connection has been made, I can cache these
-values so that Xephyr doesn't have to keep recalculating them everytime
-it tries to translate the Xephyr colormap entries for Xephyr clients to
-the actual server colormap entries (i.e. calling the function
-hostx_set_cmap_entry() repeatedly for every colormap entry).
----
- hw/kdrive/ephyr/hostx.c | 30 ++++++++++++++++++++++++++++--
- 1 files changed, 28 insertions(+), 2 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
-index 74f9f16..171d78c 100644
---- a/hw/kdrive/ephyr/hostx.c
-+++ b/hw/kdrive/ephyr/hostx.c
-@@ -565,14 +565,40 @@ hostx_get_visual_masks (EphyrScreenInfo screen,
- }
- }
-
-+static int
-+hostx_calculate_color_shift(unsigned long mask,
-+ int bits_per_rgb)
-+{
-+ int shift = 0;
-+ while(mask) {
-+ mask = mask >> bits_per_rgb;
-+ if (mask) shift += bits_per_rgb;
-+ }
-+ return shift;
-+}
-+
- void
- hostx_set_cmap_entry(unsigned char idx,
- unsigned char r,
- unsigned char g,
- unsigned char b)
- {
-- /* XXX Will likely break for 8 on 16, not sure if this is correct */
-- HostX.cmap[idx] = (r << 16) | (g << 8) | (b);
-+/* need to calculate the shifts for RGB because server could be BGR. */
-+/* XXX Not sure if this is correct for 8 on 16, but this works for 8 on 24.*/
-+ static int rshift, bshift, gshift = 0;
-+ static int first_time = 1;
-+ if (first_time) {
-+ first_time = 0;
-+ rshift = hostx_calculate_color_shift(HostX.visual->red_mask,
-+ HostX.visual->bits_per_rgb);
-+ gshift = hostx_calculate_color_shift(HostX.visual->green_mask,
-+ HostX.visual->bits_per_rgb);
-+ bshift = hostx_calculate_color_shift(HostX.visual->blue_mask,
-+ HostX.visual->bits_per_rgb);
-+ }
-+ HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
-+ ((g << gshift) & HostX.visual->green_mask) |
-+ ((b << bshift) & HostX.visual->blue_mask);
- }
-
- /**
---
-1.5.6.5
-
-From 416685c295353b5816689994c7c58ae7db3e878d Mon Sep 17 00:00:00 2001
-From: Jeremy Uejio <[email protected]>
-Date: Tue, 25 Nov 2008 16:26:44 -0800
-Subject: [PATCH] Refix Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
-
-<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
-
-This is a refix of the previous fix for CR 6685465. In the first fix
-I was shifting the colors to match the mask by the bits_per_rgb amount
-in the visual structure. That field has nothing to do with the # of
-bits to shift by. I should just instead shift the bits to match the mask.
----
- hw/kdrive/ephyr/hostx.c | 23 ++++++++++-------------
- 1 files changed, 10 insertions(+), 13 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
-index 1bc95a8..d289d73 100644
---- a/hw/kdrive/ephyr/hostx.c
-+++ b/hw/kdrive/ephyr/hostx.c
-@@ -578,14 +578,14 @@ hostx_get_visual_masks (EphyrScreenInfo screen,
- }
-
- static int
--hostx_calculate_color_shift(unsigned long mask,
-- int bits_per_rgb)
-+hostx_calculate_color_shift(unsigned long mask)
- {
-- int shift = 0;
-- while(mask) {
-- mask = mask >> bits_per_rgb;
-- if (mask) shift += bits_per_rgb;
-- }
-+ int shift = 1;
-+ /* count # of bits in mask */
-+ while (mask=(mask>>1)) shift++;
-+ /* cmap entry is an unsigned char so adjust it by size of that */
-+ shift = shift - sizeof(unsigned char) * 8;
-+ if (shift < 0) shift = 0;
- return shift;
- }
-
-@@ -601,12 +601,9 @@ hostx_set_cmap_entry(unsigned char idx,
- static int first_time = 1;
- if (first_time) {
- first_time = 0;
-- rshift = hostx_calculate_color_shift(HostX.visual->red_mask,
-- HostX.visual->bits_per_rgb);
-- gshift = hostx_calculate_color_shift(HostX.visual->green_mask,
-- HostX.visual->bits_per_rgb);
-- bshift = hostx_calculate_color_shift(HostX.visual->blue_mask,
-- HostX.visual->bits_per_rgb);
-+ rshift = hostx_calculate_color_shift(HostX.visual->red_mask);
-+ gshift = hostx_calculate_color_shift(HostX.visual->green_mask);
-+ bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);
- }
- HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
- ((g << gshift) & HostX.visual->green_mask) |
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/6721634.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/6721634.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c 2008-09-24 20:25:58.727068000 -0700
-+++ hw/xfree86/common/xf86AutoConfig.c 2008-09-24 20:26:14.062161000 -0700
-@@ -56,6 +56,18 @@
+--- hw/xfree86/common/xf86AutoConfig.c 2009-01-09 09:47:03.000000000 -0800
++++ hw/xfree86/common/xf86AutoConfig.c 2009-01-22 20:36:15.107090000 -0800
+@@ -59,6 +59,18 @@
"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
"\tDriver\t\"%s\"\n"
@@ -48,7 +48,7 @@
#define BUILTIN_DEVICE_SECTION_POST \
"EndSection\n\n"
-@@ -63,6 +75,13 @@
+@@ -66,6 +78,13 @@
BUILTIN_DEVICE_SECTION_PRE \
BUILTIN_DEVICE_SECTION_POST
@@ -62,7 +62,7 @@
#define BUILTIN_SCREEN_NAME \
"\"Builtin Default %s Screen %d\""
-@@ -224,6 +243,14 @@ xf86AutoConfig(void)
+@@ -233,6 +252,14 @@ xf86AutoConfig(void)
listPossibleVideoDrivers(deviceList, 20);
for (p = deviceList; *p; p++) {
--- a/open-src/xserver/xorg/6801386.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/6801386.patch Fri May 15 09:36:46 2009 -0700
@@ -1,39 +1,21 @@
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
+From 1e816065e5ec3b9394dc1fa5815457a664e15fd9 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 8 May 2009 21:31:01 -0700
+Subject: [PATCH] Don't printf NULL pointers on HAL connection error
+
+Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running
+http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386
-6801386 Xorg core dumps on startup if hald not running in snv_107
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ config/hal.c | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
-Make sure we don't crash trying to printf NULL pointers on HAL connection
-errors.
-
---- config/hal.c 2009-02-03 20:49:37.597450000 -0800
-+++ config/hal.c 2009-02-04 15:01:59.325432000 -0800
-@@ -491,12 +491,14 @@ connect_hook(DBusConnection *connection,
+diff --git a/config/hal.c b/config/hal.c
+index 36fa839..731d9b8 100644
+--- a/config/hal.c
++++ b/config/hal.c
+@@ -493,12 +493,14 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
}
if (!libhal_ctx_init(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
@@ -50,7 +32,7 @@
goto out_ctx2;
}
libhal_ctx_set_device_added(info->hal_ctx, device_added);
-@@ -516,7 +518,8 @@ connect_hook(DBusConnection *connection,
+@@ -518,7 +520,8 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
out_ctx2:
if (!libhal_ctx_shutdown(info->hal_ctx, &error))
LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
@@ -60,3 +42,6 @@
out_ctx:
libhal_ctx_free(info->hal_ctx);
out_err:
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/6835232.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-###############################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-
-6835232 remote Motif app crashes on keyboard input in snv_111a
-
-ProcXkbSetNamedIndicator should skip devices without LED's, not report failure.
-
-Integrated upstream in git commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65
-(surrounding code changed too much between 1.5 & pre-1.7-master to use that
- patch as is).
-
---- xkb/xkb.c 2009-05-01 02:08:37.816994000 -0700
-+++ xkb/xkb.c 2009-05-01 23:54:12.172096000 -0700
-@@ -3438,6 +3438,7 @@ ProcXkbSetNamedIndicator(ClientPtr clien
- for (other = inputInfo.devices; other; other = other->next)
- {
- if ((other != dev) && other->coreEvents &&
-+ (other->kbdfeed || other->leds) &&
- (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
- {
- rc = _XkbCreateIndicatorMap(other, stuff->indicator,
-@@ -3461,6 +3462,7 @@ ProcXkbSetNamedIndicator(ClientPtr clien
- for (other = inputInfo.devices; other; other = other->next)
- {
- if ((other != dev) && other->coreEvents &&
-+ (other->kbdfeed || other->leds) &&
- (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
- {
- _XkbSetNamedIndicator(client, other, stuff);
--- a/open-src/xserver/xorg/COPYING Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4451 +0,0 @@
-Copyright 1991, 1992, 1993, 1996, 1997, 1998, 2001 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 (c) 1992-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-(c) Copyright 1996 Hewlett-Packard Company
-(c) Copyright 1996 International Business Machines Corp.
-(c) Copyright 1996 Sun Microsystems, Inc.
-(c) Copyright 1996 Novell, Inc.
-(c) Copyright 1996 Digital Equipment Corp.
-(c) Copyright 1996 Fujitsu Limited
-(c) Copyright 1996 Hitachi, Ltd.
-
-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 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the 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 from said
-copyright holders.
-
-
-
- * Copyright (c) 2002 Greg Parker. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc.
- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
- *
- * Portions of this file are copied from Mesa's xf86glx.c,
- * which contains the following copyright:
- *
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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.
-
-
- * (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.
-
-
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-
-
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-
-
- * Copyright © 2006 Red Hat, Inc
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat,
- * Inc not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Red Hat, Inc makes no representations about the
- * suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (the "License"). You may not use this file except in compliance with the
-** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
-**
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
-**
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-**
-
- * Copyright © 2006 Red Hat, Inc.
- * (C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
-
-****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-****************************************************************************
-
-***************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1992 by
-
- Digital Equipment Corp., Maynard, MA
-
-X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND ABSOL-PUTER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL OR ABSOL-PUTER BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-****************************************************************************
-
-
-***********************************************************
-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*******************************************************
-
-
-
-
-****************************************************************
-
-Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-*****************************************************************
-
-
-*****************************************************************
--
- * Copyright (c) 1998-1999 Shunsuke Akiyama <[email protected]>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-
-
-***********************************************************
-
-Copyright (c) 2004, Sun Microsystems, 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.
-
-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 (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-*****************************************************************
-
-
-Copyright (c) 1992 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*******************************************************
-
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright 1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission. Digital and Olivetti
-make no representations about the suitability of this software
-for any purpose. It is provided "as is" without express or implied warranty.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Author: Eamon Walsh <[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
-this permission notice appear in supporting documentation. This permission
-notice shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright © 2003 Philip Blundell
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Philip Blundell not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Philip Blundell makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-***********************************************************
-
-Copyright 2003-2005 Sun Microsystems, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-***********************************************************
-
- * BIGFONT extension for sharing font metrics between clients (if possible)
- * and for transmitting font metrics to clients in a compressed form.
- *
- * Copyright (c) 1999-2000 Bruno Haible
- * Copyright (c) 1999-2000 The XFree86 Project, Inc.
-
-
-** * Copyright: Copyright 1993, 1995 Hewlett-Packard Company
-** *
-** * Copyright 1989 by The Massachusetts Institute of Technology
-** *
-** * 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 MIT not be used in
-** * advertising or publicity pertaining to distribution of the
-** * software without specific prior written permission.
-** * M.I.T. makes no representation about the suitability of
-** * this software for any purpose. It is provided "as is"
-** * without any express or implied warranty.
-** *
-** * MIT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-** * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-** * NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL MIT BE LI-
-** * ABLE 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 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
-and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital or MIT not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*****************************************************************
-
-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 1996 by Thomas E. Dickey <[email protected]>
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-*******************************************************
-
-**********************************************************
-
-Copyright (c) 1987 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.
-
-
-*****************************************************************
-
-Copyright (c) 1989 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.
-
-***********************************************************
-Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
-
- 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 no-
-tice appear in all copies and that both that copyright no-
-tice and this permission notice appear in supporting docu-
-mentation, and that the names of Sun or X Consortium
-not be used in advertising or publicity pertaining to
-distribution of the software without specific prior
-written permission. Sun and X Consortium make no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
-implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
-ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-*****************************************************************
-
-Copyright (c) 1990 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.
-
-*****************************************************************
-
-
- * Copyright (c) 1987 by the Regents of the University of California
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies. The University of California
- * makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without
- * express or implied warranty.
-
-
-***********************************************************
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*****************************************************************
-
-
- * Copyright © 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.
-
-
-*****************************************************************
-
-
-(c)Copyright 1988,1991 Adobe Systems Incorporated. All rights reserved.
-
-Permission to use, copy, modify, distribute, and sublicense this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notices appear in all copies and that both those copyright
-notices and this permission notice appear in supporting documentation and that
-the name of Adobe Systems Incorporated not be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission. No trademark license to use the Adobe trademarks is hereby
-granted. If the Adobe trademark "Display PostScript"(tm) is used to describe
-this software, its functionality or for any other purpose, such use shall be
-limited to a statement that this software works in conjunction with the Display
-PostScript system. Proper trademark attribution to reflect Adobe's ownership
-of the trademark shall be given whenever any such reference to the Display
-PostScript system is made.
-
-ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY
-PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. ADOBE
-DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE TO YOU
-OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT
-LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER
-SUPPORT FOR THE SOFTWARE.
-
-Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
-Incorporated which may be registered in certain jurisdictions.
-
-Author: Adobe Systems Incorporated
-
-
-***********************************************************
- Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- *******************************************************
-
-
-Copyright (c) 2006, Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-RED HAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION 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 Red Hat shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from Red Hat.
-
-
-*******************************************************
-
-
- * Copyright � 2001 Keith Packard
- *
- * Partly based on code that is Copyright � The XFree86 Project Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- *
- * Copyright (C) 2000 Keith Packard
- * 2004 Eric Anholt
- * 2005 Zack Rusin
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of copyright holders not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Copyright holders make no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
-
-
- * Copyright � 2006 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-
-
- * Copyright © 2003 Anders Carlsson
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Anders Carlsson not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Anders Carlsson makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright (C) 2000 Keith Packard, member of The XFree86 Project, Inc.
- * 2005 Zack Rusin, Trolltech
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
-
-
- *
- * Copyright � 1999 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- *
- * Copyright © 1998 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. SuSE makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-*******************************************************
-
- *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
- * 2005 Lars Knoll & Zack Rusin, Trolltech
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
-
-
- * Copyright © 2004 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
-
- * Copyright © 2004, 2005 Red Hat, Inc.
- * Copyright © 2004 Nicholas Miell
- * Copyright © 2005 Trolltech AS
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Red Hat not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Red Hat makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
-
-
-Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
-Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
-
-This file is based on mieq.c by Keith Packard,
-which contains the following copyright:
-Copyright 1990, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-// Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
-// Copyright (c) 2003 Apple Computer, Inc. All Rights Reserved.
-// Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
-//
-// The code to parse the Darwin keymap is derived from dumpkeymap.c
-// by Eric Sunshine, which includes the following copyright:
-//
-// Copyright (C) 1999,2000 by Eric Sunshine <[email protected]>
-// All rights reserved.
-//
-//-----------------------------------------------------------------------------
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-// NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-
- * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-***********************************************************
-
-
- * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-
- * Copyright (c) 2001 Andreas Monitzer. 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.
-
-
- * Copyright (c) 2001 Andreas Monitzer. All Rights Reserved.
- * Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization.
-
-*************************************************************************
-
-Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
-Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
-Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
-Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-
- * Copyright (c) 2001-2003 Torrey T. Lyons and Greg Parker.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-
- * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-
- Copyright (c) 2003 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.
-
-
-
- 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.
-
- Note that these interfaces are provided solely for the use of the
- X11 server. Any other uses are unsupported and strongly discouraged.
-
-
-*************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-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, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
-Copyright 1987, 1998 The Open Group
-Copyright 2002 Red Hat Inc., Durham, North Carolina.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
- * Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-
-
- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-
-
- * Copyright (c) 1995 X Consortium
- * Copyright 2004 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium
- * shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written
- * authorization from the X Consortium.
-
-
-
- **********************************************************************
- *
- * Copyright 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 (c) 2001 by Juliusz Chroboczek
- * Copyright (c) 1999 by Keith Packard
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
-
-
- * Copyright � 2003 Eric Anholt
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Eric Anholt not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Eric Anholt makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 2004 Eric Anholt
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Eric Anholt not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Eric Anholt makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright � 2004 Keith Packard
- * Copyright � 2005 Eric Anholt
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Eric Anholt not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Eric Anholt makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 2003 Eric Anholt, Anders Carlsson
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Eric Anholt not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Eric Anholt makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 2004 Nokia
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Nokia not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Nokia makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2004 by Costas Stylianou <[email protected]> +44(0)7850 394095
- *
- * 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 Costas Sylianou not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Costas Stylianou makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * COSTAS STYLIANOU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL COSTAS STYLIANOU BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (c) 2000, 2001 Nokia Home Communications
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-X Window System is a trademark of The Open Group
-
-**************************************************************************
-
-
-Copyright 2000 Intel Corporation. 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 INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright � 2000-2001 Nokia Home Communications
-Copyright � 2000 VA Linux Systems, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
- * Copyright � 1999 Keith Packard
- * Copyright � 2000 Compaq 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 Keith Packard or Compaq not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard and Compaq makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD AND COMPAQ DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 1999 Keith Packard
- * Copyright � 2000 Compaq Computer Corporation
- * Copyright � 2002 MontaVista Software Inc.
- * Copyright � 2005 OpenedHand Ltd.
- *
- * 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 or Compaq not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard and Compaq makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD AND COMPAQ DISCLAIM 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.
- *
- * 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 Michael Taht or MontaVista not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Michael Taht and Montavista make no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * MICHAEL TAHT AND MONTAVISTA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL EITHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Matthew Allum or OpenedHand not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Matthew Allum and OpenedHand make no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * MATTHEW ALLUM AND OPENEDHAND DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL EITHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright © 2004 Damien Ciabrini
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Anders Carlsson not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Anders Carlsson makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * DAMIEN CIABRINI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 2003-2004 Anders Carlsson
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Anders Carlsson not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Anders Carlsson makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright © 2004 Franco Catrin
- *
- * 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 Franco Catrin not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Franco Catrin makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * FRANCO CATRIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL FRANCO CATRIN 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.
-
-
- * glint register file
- *
- * Copyright by Stefan Dirsch, Dirk Hohndel, Alan Hourihane
- * Authors: Alan Hourihane, <[email protected]>
- * Dirk Hohndel, <[email protected]>
- * Stefan Dirsch, <[email protected]>
- * Simon P., <[email protected]>
- *
- * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
- * Siemens Nixdorf Informationssysteme
- *
-
-
- * Copyright © 2004 PillowElephantBadgerBankPond
- *
- * 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 PillowElephantBadgerBankPond not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. PillowElephantBadgerBankPond makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PillowElephantBadgerBankPond 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.
- *
- * It's really not my fault - see it was the elephants!!
- * - jaymz
- *
-
-
-
-*************************************************************************
-
-Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
-Copyright 2003 Eric Anholt
-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
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
- XFree86 Xv DDX written by Mark Vojkovich ([email protected])
- Adapted for KDrive by Pontus Lidman <[email protected]>
-
- Copyright (C) 2000, 2001 - Nokia Home Communications
- Copyright (C) 1998, 1999 - The XFree86 Project Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright (c) 2000 by Juliusz Chroboczek
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
- * Copyright � 2004 Ralph Thomas
- *
- * 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 Ralph Thomas not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Ralph Thomas makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * RALPH THOMAS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL RALPH THOMAS 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-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, 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
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-
-
- * Copyright 2003 by David H. Dawes.
- * Copyright 2003 by X-Oz Technologies.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- *
- * Author: David Dawes <[email protected]>.
-
-
- * Copyright 1992-2003 by The XFree86 Project, Inc.
- * Copyright 1997 by Metro Link, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-
- * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Alan Hourihane, [email protected]
- *
-
-
-***********************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-*******************************************************
-
- * Copyright 1995-1999 by Frederic Lepied, France. <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Frederic Lepied not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Frederic Lepied makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 2005-2006 Luc Verhaegen.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright (C) 2000 Jakub Jelinek ([email protected])
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright (c) 1997 Metro Link Incorporated
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
-
-
- * Copyright (c) 2004, X.Org Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
-
-
- * Copyright 1998,1999 by Egbert Eich <[email protected]>
- *
- * DDC is a Trademark of VESA (Video Electronics Standard Association).
-
-
-*************************************************************************
-
-
- * Copyright (c) 1997 Matthieu Herrb
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Matthieu Herrb not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Matthieu Herrb makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1995 Jon Tombs
-Copyright (c) 1995, 1996, 1999 XFree86 Inc
-
-
-
-Copyright 1995 Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-
-*************************************************************************
-
-
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*************************************************************************
-
-
- * Copyright (C) 2005 Bogdan D. [email protected]
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this Software without prior written
- * authorization from the author.
- *
- ******************************************************************************
-
-
- * Copyright (C) 1998 Itai Nahshon, Michael Schimek
- *
- * The original code was derived from and inspired by
- * the I2C driver from the Linux kernel.
- * (c) 1998 Gerd Knorr <[email protected]>
-
-
- * XFree86 int10 module
- * execute BIOS int 10h calls in x86 real mode environment
- * Copyright 1999 Egbert Eich
- *
- * Part of this is based on code taken from DOSEMU
- * (C) Copyright 1992, ..., 1999 the "DOSEMU-Development-Team"
-
-
-
- * Copyright 1995-1998 by Metro Link, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Metro Link, Inc. not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Metro Link, Inc. makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1995,96 by Metro Link, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Metro Link, Inc. not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Metro Link, Inc. makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
- * Copyright 1992 Vrije Universiteit, The Netherlands
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of the Vrije Universiteit not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The Vrije Universiteit makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
- * Copyright 1992 by Rich Murphey <[email protected]>
- * Copyright 1993 by David Wexelblat <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Rich Murphey and David Wexelblat
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Rich Murphey and
- * David Wexelblat make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
-
-
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in
- * accordance with the following terms and conditions. Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- * this copyright notice and list of conditions as they appear in the
- * source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital
- * Equipment Corporation. Neither the "Digital Equipment Corporation"
- * name nor any trademark or logo of Digital Equipment Corporation may be
- * used to endorse or promote products derived from this software without
- * the prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- * including but not limited to, any implied warranties of merchantability,
- * fitness for a particular purpose, or non-infringement are disclaimed.
- * In no event shall DIGITAL be liable for any damages whatsoever, and in
- * particular, DIGITAL shall not be liable for special, indirect,
- * consequential, or incidental damages or damages for lost profits, loss
- * of revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise, even
- * if advised of the possibility of such damage.
- *
-
-
- * Slightly modified xf86KbdBSD.c which is
- *
- * Derived from xf86Kbd.c by S_ren Schmidt ([email protected])
- * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
- * and from xf86KbdCODrv.c by Holger Veit
-
-
- * Derived from VTsw_usl.c which is
- * Copyright 1993 by David Wexelblat <[email protected]>
- * by S_ren Schmidt ([email protected])
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. David Wexelblat makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 1992 by Rich Murphey <[email protected]>
- * Copyright 1993 by David Dawes <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Rich Murphey and David Dawes
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Rich Murphey and
- * David Dawes make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 1995 by Frederic Lepied, France. <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Frederic Lepied not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Frederic Lepied makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright (c) 2002 by The XFree86 Project, Inc.
- * Author: Ivan Pascal.
- *
- * Based on the code from bsd_io.c which is
- * Copyright 1992 by Rich Murphey <[email protected]>
- * Copyright 1993 by David Dawes <[email protected]>
-
-
- * Copyright (c) 1999 Lennart Augustsson <[email protected]>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-
-
- * Copyright 1998 by Concurrent Computer Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Concurrent Computer
- * Corporation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Concurrent Computer Corporation makes no representations
- * about the suitability of this software for any purpose. It is
- * provided "as is" without express or implied warranty.
- *
- * CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Copyright 1998 by Metro Link Incorporated
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Metro Link
- * Incorporated not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. Metro Link Incorporated makes no representations
- * about the suitability of this software for any purpose. It is
- * provided "as is" without express or implied warranty.
- *
- * METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * This software is derived from the original XFree86 PCI code
- * which includes the following copyright notices as well:
- *
- * Copyright 1995 by Robin Cutshaw <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of the above listed copyright holder(s)
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. The above listed
- * copyright holder(s) make(s) no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * This code is also based heavily on the code in FreeBSD-current, which was
- * written by Wolfgang Stanglmeier, and contains the following copyright:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-
-
- * Copyright 1997,1998 by UCHIYAMA Yasushi
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of UCHIYAMA Yasushi not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. UCHIYAMA Yasushi makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * linux specific part of the int10 module
- * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich
-
-
- * Slightly modified xf86KbdLnx.c which is
- *
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-
-
- * Copyright © 2000 VA Linux Systems, Inc.
- * Copyright © 2001 The XFree86 Project, Inc.
-
- * Copyright 2004, Egbert Eich
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
- * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of Egbert Eich shall not
- * be used in advertising or otherwise to promote the sale, use or other deal-
- *ings in this Software without prior written authorization from Egbert Eich.
- *
-
- * Copyright 1992 by Orest Zborowski <[email protected]>
- * Copyright 1993 by David Wexelblat <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Orest Zborowski and David Wexelblat
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Orest Zborowski
- * and David Wexelblat make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
-
- * Copyright (c) 2002 by The XFree86 Project, Inc.
- * Author: Ivan Pascal.
- *
- * Based on the code from lnx_io.c which is
- * Copyright 1992 by Orest Zborowski <[email protected]>
- * Copyright 1993 by David Dawes <[email protected]>
-
-
- * Copyright 1999 by The XFree86 Project, Inc.
-
-
- * Copyright 1992 by Orest Zborowski <[email protected]>
- * Copyright 1993 by David Wexelblat <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Orest Zborowski and David Wexelblat
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Orest Zborowski
- * and David Wexelblat make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 1993 by Thomas Mueller
- *
- * 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 Mueller not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Thomas Mueller makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THOMAS MUELLER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THOMAS MUELLER 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 1993 by David Wexelblat <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. David Wexelblat makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 1993 by David Wexelblat <[email protected]>
- * Copyright 1993 by David McCullough <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. David Wexelblat makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright 2001-2005 by J. Kean Johnston <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name J. Kean Johnston not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. J. Kean Johnston makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
-
-
- * Copyright 2004, Egbert Eich
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
- * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of Egbert Eich shall not
- * be used in advertising or otherwise to promote the sale, use or other deal-
- *ings in this Software without prior written authorization from Egbert Eich.
- *
-
-
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * 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 Thomas Roell and David Dawes
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Thomas Roell and
- * David Dawes makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * THOMAS ROELL AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THOMAS ROELL 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 (C) 1999 Jeff Hartmann
- * Copyright (C) 1999 Precision Insight, Inc.
- * Copyright (C) 1999 Xi Graphics, 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
- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 2006 Sun Microsystems, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
-
-
- * Copyright � 2000 VA Linux Systems, Inc.
- * Copyright � 2001 The XFree86 Project, Inc.
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
-
-
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <[email protected]>
- * Copyright 1999 by David Holland <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the names of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-
- * Copyright 2001-2005 by Kean Johnston <[email protected]>
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * 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 Thomas Roell, David Dawes
- * and Kean Johnston not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Thomas Roell, David Dawes and Kean Johnston make no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * THOMAS ROELL, DAVID DAWES AND KEAN JOHNSTON DISCLAIM ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THOMAS ROELLm DAVID WEXELBLAT
- * OR KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
-
-
- * Copyright 2005 by Kean Johnston <[email protected]>
- * Copyright 1993 by David Wexelblat <[email protected]>
- * Copyright 1993 by David McCullough <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of David Wexelblat not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. David Wexelblat makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1992 by David Dawes <[email protected]>
- * Copyright 1992 by Jim Tsillas <[email protected]>
- * Copyright 1992 by Rich Murphey <[email protected]>
- * Copyright 1992 by Robert Baron <[email protected]>
- * Copyright 1992 by Orest Zborowski <[email protected]>
- * Copyright 1993 by Vrije Universiteit, The Netherlands
- * Copyright 1993 by David Wexelblat <[email protected]>
- * Copyright 1994, 1996 by Holger Veit <[email protected]>
- * Copyright 1997 by Takis Psarogiannakopoulos <[email protected]>
- * Copyright 1994-2003 by The XFree86 Project, Inc
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of the above listed copyright holders
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. The above listed
- * copyright holders make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
-
-
- * Copyright 1998 by Alan Hourihane, Wigan, England.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright � 2002 by the XFree86 Project, Inc.
- *
- * The pci.ids file and the data it contains are from the Linux PCI ID's
- * Project (http://pciids.sf.net/). It is maintained by Martin Mares
- * <[email protected]> and other volunteers. The pci.ids file is licensed under
- * the BSD 3-clause or GPL version 2 or later licenses.
-
-
- * Copyright (c) 2001, Andy Ritger [email protected]
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * o Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * o Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * o Neither the name of NVIDIA nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * This program is based on the Generalized Timing Formula(GTF TM)
- * Standard Version: 1.0, Revision: 1.0
- *
- * The GTF Document contains the following Copyright information:
- *
- * Copyright (c) 1994, 1995, 1996 - Video Electronics Standards
- * Association. Duplication of this document within VESA member
- * companies for review purposes is permitted. All other rights
- * reserved.
- *
- * While every precaution has been taken in the preparation
- * of this standard, the Video Electronics Standards Association and
- * its contributors assume no responsibility for errors or omissions,
- * and make no warranties, expressed or implied, of functionality
- * of suitability for any purpose. The sample code contained within
- * this standard may be used without restriction.
-
-
- * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-***********************************************************
-Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
-
- 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 no-
-tice appear in all copies and that both that copyright no-
-tice and this permission notice appear in supporting docu-
-mentation, and that the names of Sun or The Open Group
-not be used in advertising or publicity pertaining to
-distribution of the software without specific prior
-written permission. Sun and The Open Group make no
-representations about the suitability of this software for
-any purpose. It is provided "as is" without any express or
-implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
-ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 2000 by Egbert Eich
- * Copyright 1995 by Robin Cutshaw <[email protected]>
- * Copyright 2002 by David Dawes
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of the above listed copyright holder(s)
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. The above listed
- * copyright holder(s) make(s) no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
-
-
- * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
- *
- * 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
- * CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of Conectiva Linux shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from
- * Conectiva Linux.
-
-
- * XFree86 vbe module
- * Copyright 2000 Egbert Eich
- *
- * The mode query/save/set/restore functions from the vesa driver
- * have been moved here.
- * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
- * Authors: Paulo César Pereira de Andrade <[email protected]>
-
-
-
-
- * Copyright © 2002 David Dawes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of the author(s) shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from
- * the author(s).
- *
- * Authors: David Dawes <[email protected]>
- *
-
-* Copyright (C) 1996-1999 SciTech Software, Inc.
-* Copyright (C) David Mosberger-Tang
-* Copyright (C) 1999 Egbert Eich
-*
-* ========================================================================
-*
-* Permission to use, copy, modify, distribute, and sell this software and
-* its documentation for any purpose is hereby granted without fee,
-* provided that the above copyright notice appear in all copies and that
-* both that copyright notice and this permission notice appear in
-* supporting documentation, and that the name of the authors not be used
-* in advertising or publicity pertaining to distribution of the software
-* without specific, written prior permission. The authors makes no
-* representations about the suitability of this software for any purpose.
-* It is provided "as is" without express or implied warranty.
-*
-* THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-* EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-* PERFORMANCE OF THIS SOFTWARE.
-*
-
-
- * Copyright IBM Corporation 1987,1988,1989
- *
- * 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 IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * IBM 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 1993 Gerrit Jan Akkerman
- *
- * 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 Gerrit Jan Akkerman not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * GERRIT JAN AKKERMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL GERRIT JAN AKKERMAN BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
-
-
-
-Copyright 1987 by the Regents of the University of 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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-
-
-
-
- * Copyright 2006 Adam Jackson.
- *
- * 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 AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- * Copyright © 2005 Novell, 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
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <[email protected]>
-
-
- * Copyright © 2004 David Reveman
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * David Reveman not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * David Reveman makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DAVID REVEMAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <[email protected]>
-
-
-
-
-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.
-
-
-
-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.
-
-
-
- * (c) Copyright 1996 by Sebastien Marineau
- * <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * HOLGER VEIT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION 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 Sebastien Marineau shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Sebastien Marineau.
- *
-
-
-(c) Copyright 1996 Hewlett-Packard Company
-(c) Copyright 1996 International Business Machines Corp.
-(c) Copyright 1996-2004 Sun Microsystems, Inc.
-(c) Copyright 1996 Novell, Inc.
-(c) Copyright 1996 Digital Equipment Corp.
-(c) Copyright 1996 Fujitsu Limited
-(c) Copyright 1996 Hitachi, Ltd.
-(c) Copyright 2003-2004 Roland Mainz <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the 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 from said
-copyright holders.
-
-
-##
-## (c) Copyright 2003-2004 Roland Mainz <[email protected]>
-##
-
- Copyright (c) 2002-2004 by Roland Mainz <[email protected]>
- please send bugfixes or comments to http://xprint.mozdev.org/
-
-
-
-
-
- * (c) Copyright 1996 Hewlett-Packard Company
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996, 2000 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc.
- * (c) Copyright 1996 Digital Equipment Corp.
- * (c) Copyright 1996 Fujitsu Limited
- * (c) Copyright 1996 Hitachi, Ltd.
- *
- * 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 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the names of the 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
- * from said copyright holders.
-
-
-Copyright (c) 2003-2004 Roland Mainz <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-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 (c) 2003-2004 Roland Mainz <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-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 (c) 2003-2004 Roland Mainz <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-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 (c) 2003-2004 Roland Mainz <[email protected]>
-Copyright (c) 2004 Sun Microsystems, 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 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the 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 from said
-copyright holders.
-
-
-
- *Copyright (C) 2001-2004 Harold L Hunt II 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 HAROLD L HUNT II BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors: Harold L Hunt II
-
-
- * Copyright (c) 2005 Alexander Gottwald
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
-
-
-
- * Copyright (c) 1987 by the Regents of the University of California
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies. The University of
- * California makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
-
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used. Neither OMRON or
-DATA GENERAL make any representation about the suitability of this software
-for any purpose. It is provided "as is" without express or implied warranty.
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-*****************************************************************
-
- Copyright (C) 1994 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 CONNEC-
- TION 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 deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
-
-
-
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright 1990,91,92,93 by Thomas Roell, Germany.
- * Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
- *
- * 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 nor
- * SGCS be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- * Thomas Roell nor SGCS makes no representations about the suitability
- * of this software for any purpose. It is provided "as is" without
- * express or implied warranty.
- *
- * THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- * Copyright © 1998 Keith Packard
- * Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-
- * Copyright © 2004 Philip Blundell
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Philip Blundell not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Philip Blundell makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
- Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
- Originally by Fran,cois Pinard <[email protected]>, 1996.
-
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (C) 1995 Pascal Haible. 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
-PASCAL HAIBLE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION 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 Pascal Haible shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Pascal Haible.
-
-
-
- * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of N.C.D. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. N.C.D. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
-
-
-
- * Copyright © 2000 Compaq Computer Corporation
- * Copyright © 2002 Hewlett-Packard Company
- * Copyright © 2006 Intel Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
-
-***********************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-***********************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- *******************************************************
-
--- a/open-src/xserver/xorg/COPYING.Xprint-fonts Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-Copyright (c) 1999,2000,2001 Compaq Computer Corporation
-Copyright (c) 1999,2000,2001 Hewlett-Packard Company
-Copyright (c) 1999,2000,2001 IBM Corporation
-Copyright (c) 1999,2000,2001 Hummingbird Communications Ltd.
-Copyright (c) 1999,2000,2001 Silicon Graphics, Inc.
-Copyright (c) 1999,2000,2001 Sun Microsystems, Inc.
-Copyright (c) 1999,2000,2001 The Open Group
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-X Window System is a trademark of The Open Group.
--- a/open-src/xserver/xorg/IA.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/IA.patch Fri May 15 09:36:46 2009 -0700
@@ -1,4 +1,4 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,10 +26,21 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
+diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
+--- Makefile.am 2009-04-14 10:14:56.000000000 -0700
++++ Makefile.am 2009-05-08 17:43:31.905647000 -0700
+@@ -36,6 +36,7 @@ SUBDIRS = \
+ damageext \
+ $(COMPOSITE_DIR) \
+ $(GLX_DIR) \
++ IA \
+ exa \
+ config \
+ hw
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2008-10-17 15:44:42.831612000 -0700
-+++ configure.ac 2008-10-17 15:44:58.744720000 -0700
-@@ -1003,6 +1003,9 @@ AC_DEFINE(XINPUT, 1, [Support X Input ex
+--- configure.ac 2009-05-08 17:43:23.621871000 -0700
++++ configure.ac 2009-05-08 17:43:31.908445000 -0700
+@@ -1009,6 +1009,9 @@ MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/
XI_LIB='$(top_builddir)/Xi/libXi.la'
XI_INC='-I$(top_srcdir)/Xi'
@@ -39,43 +50,43 @@
AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
-@@ -1224,7 +1227,7 @@ AC_MSG_RESULT([$XVFB])
+@@ -1252,7 +1255,7 @@ AC_MSG_RESULT([$XVFB])
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then
-- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
-+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB"
- XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
+- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
++ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB"
+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
AC_SUBST([XVFB_LIBS])
AC_SUBST([XVFB_SYS_LIBS])
-@@ -1242,7 +1245,7 @@ AC_MSG_RESULT([$XNEST])
+@@ -1270,7 +1273,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
-- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
-+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
- XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
+- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
++ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
AC_SUBST([XNEST_LIBS])
AC_SUBST([XNEST_SYS_LIBS])
-@@ -1962,7 +1965,7 @@ if test "$KDRIVE" = yes; then
+@@ -1773,7 +1776,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
-- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
-+ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $OS_LIB"
+- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
++ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
case $host_os in
*linux*)
-@@ -2266,3 +2269,6 @@ hw/xprint/config/en_US/print/Makefile
- hw/xprint/config/en_US/Makefile
+@@ -1930,3 +1933,6 @@ hw/kdrive/sdl/Makefile
+ hw/kdrive/src/Makefile
xorg-server.pc
])
+
+# Add Sun IA extension
+AC_OUTPUT([IA/Makefile])
diff -urp -x '*~' -x '*.orig' hw/dmx/Makefile.am hw/dmx/Makefile.am
---- hw/dmx/Makefile.am 2007-10-17 07:01:23.000000000 -0700
-+++ hw/dmx/Makefile.am 2008-10-17 15:44:58.745221000 -0700
+--- hw/dmx/Makefile.am 2009-04-14 10:14:56.000000000 -0700
++++ hw/dmx/Makefile.am 2009-05-08 17:43:31.909047000 -0700
@@ -86,6 +86,7 @@ XDMX_LIBS = \
$(GLX_LIBS) \
input/libdmxinput.a \
@@ -85,9 +96,9 @@
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2008-10-10 11:12:48.000000000 -0700
-+++ hw/xfree86/common/xf86Config.c 2008-10-17 15:44:58.746569000 -0700
-@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] =
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:43:23.432853000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:43:31.911031000 -0700
+@@ -121,6 +121,7 @@ static ModuleDefault ModuleDefaults[] =
#ifdef DRI2
{.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
#endif
@@ -96,12 +107,12 @@
};
diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2008-10-10 11:12:48.000000000 -0700
-+++ hw/xfree86/dixmods/Makefile.am 2008-10-17 15:44:58.747030000 -0700
-@@ -112,3 +112,10 @@ libxorgxkb_la_LIBADD = $(top_builddir)/d
- libxtrap_la_LDFLAGS = -avoid-version
- libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
- libxtrap_la_SOURCES = xf86XTrapModule.c
+--- hw/xfree86/dixmods/Makefile.am 2008-12-16 14:43:11.000000000 -0800
++++ hw/xfree86/dixmods/Makefile.am 2009-05-08 17:43:31.912778000 -0700
+@@ -66,3 +66,10 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $
+
+ libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
+ libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
+
+
+# Sun IA extension module additions
@@ -109,48 +120,28 @@
+libia_la_LDFLAGS = -avoid-version
+libia_la_LIBADD = $(top_builddir)/IA/libIA.la
+libia_la_SOURCES = iamodule.c
-diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2008-10-10 11:12:48.000000000 -0700
-+++ Makefile.am 2008-10-17 15:44:58.741284000 -0700
-@@ -58,6 +58,7 @@ SUBDIRS = \
- $(XTRAP_DIR) \
- $(COMPOSITE_DIR) \
- $(GLX_DIR) \
-+ IA \
- exa \
- config \
- hw
diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2008-10-10 11:12:48.000000000 -0700
-+++ mi/miinitext.c 2008-10-17 15:44:58.747720000 -0700
-@@ -84,6 +84,8 @@ SOFTWARE.
+--- mi/miinitext.c 2009-04-14 10:14:57.000000000 -0700
++++ mi/miinitext.c 2009-05-08 17:43:31.913906000 -0700
+@@ -83,6 +83,7 @@ SOFTWARE.
#include "micmap.h"
#include "globals.h"
+#define SolarisIAExtension
-+
- #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
- #undef GLXEXT
- #endif
-@@ -109,6 +111,7 @@ SOFTWARE.
- #undef DAMAGE
- #undef XFIXES
- #undef XEVIE
-+#undef SolarisIAExtension
- #else
- #ifndef LOADABLEPRINTDDX
- #undef XPRINT
-@@ -221,6 +224,9 @@ extern Bool noSELinuxExtension;
- #ifdef XV
+
+ extern Bool noTestExtensions;
+
+@@ -151,6 +152,9 @@ extern Bool noSELinuxExtension;
extern Bool noXvExtension;
#endif
+ extern Bool noGEExtension;
+#ifdef SolarisIAExtension
+Bool noIAExtension;
+#endif
#ifndef XFree86LOADER
#define INITARGS void
-@@ -263,6 +269,9 @@ typedef void (*InitExtension)(INITARGS);
+@@ -186,6 +190,9 @@ typedef void (*InitExtension)(INITARGS);
#ifdef RES
#include <X11/extensions/XResproto.h>
#endif
@@ -159,29 +150,29 @@
+#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
- #ifdef EVI
-@@ -386,6 +395,9 @@ extern void DamageExtensionInit(INITARGS
- #ifdef COMPOSITE
+ #ifdef MITSHM
+@@ -272,6 +279,9 @@ extern void DamageExtensionInit(INITARGS
extern void CompositeExtensionInit(INITARGS);
#endif
+ extern void GEExtensionInit(INITARGS);
+#ifdef SolarisIAExtension
+extern void IAExtensionInit(void);
+#endif
/* The following is only a small first step towards run-time
* configurable extensions.
-@@ -449,6 +461,9 @@ static ExtensionToggle ExtensionToggleLi
- #ifdef XSYNC
- { "SYNC", &noSyncExtension },
+@@ -318,6 +328,9 @@ static ExtensionToggle ExtensionToggleLi
+ #ifdef XCSECURITY
+ { "SECURITY", &noSecurityExtension },
#endif
+#ifdef SolarisIAExtension
+ { IANAME /* "SolarisIA" */, &noIAExtension },
+#endif
- #ifdef TOGCUP
- { "TOG-CUP", &noXcupExtension },
+ #ifdef RES
+ { "X-Resource", &noResExtension },
#endif
-@@ -664,6 +679,9 @@ InitExtensions(argc, argv)
- GlxPushProvider(&__glXDRISWRastProvider);
+@@ -477,6 +490,9 @@ InitExtensions(int argc, char *argv[])
+ GlxPushProvider(&__glXDRISWRastProvider);
if (!noGlxExtension) GlxExtensionInit();
#endif
+#ifdef SolarisIAExtension
@@ -189,4 +180,4 @@
+#endif
}
- void
+ #else /* XFree86LOADER */
--- a/open-src/xserver/xorg/KB_EncodingAtXCrash.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Events.c hw/xfree86/common/xf86Events.c
---- hw/xfree86/common/xf86Events.c 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/common/xf86Events.c 2008-09-24 20:24:56.137289000 -0700
-@@ -764,6 +764,31 @@ xf86SigHandler(int signo)
- xorg_backtrace();
-
- FatalError("Caught signal %d. Server aborting\n", signo);
-+
-+/* CR 6545884 If server crashes keyboard left in un-encoded mode*/
-+#ifdef sun
-+ {
-+ int kbd_fd,console_fd;
-+ int translate=TR_ASCII;
-+
-+ Error ("Resetting keyboard\n");
-+ /* Check if on console, since kbd_mode works on console only */
-+ if (((console_fd = open("/dev/console", O_RDWR | O_NDELAY, 0)) != -1)) {
-+ if ((kbd_fd = open("/dev/kbd", O_RDONLY, 0)) < 0) {
-+ Error("/dev/kbd open failed\n");
-+ } else {
-+ if (ioctl(kbd_fd, KIOCTRANS, (caddr_t) &translate)) {
-+ Error("Could not set /dev/kbd back to ASCII mode\n");
-+ }
-+ close(kbd_fd);
-+ }
-+ close (console_fd);
-+ }
-+ else
-+ Error ("Not on Console not Resetting keyboard\n");
-+ }
-+#endif
-+
- }
-
- static void
--- a/open-src/xserver/xorg/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/Makefile Fri May 15 09:36:46 2009 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.75 09/03/12
+# @(#)Makefile 1.76 09/05/15
#
# Build 32-bit or 64-bit?
@@ -63,13 +63,6 @@
MODULE_STABILITY=Volatile
MODULE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/bin/
-# Compiler to use - x86 MMX code only builds with gcc, not Sun Studio, so use
-# gcc on x86 for now, but keep Sun Studio on SPARC
-MODULE_COMPILER_sparc=suncc
-MODULE_COMPILER_i386=gcc
-MODULE_COMPILER=$(MODULE_COMPILER_$(MACH))
-MODULE_COMPILER_SET=yes
-
# Binary built in tree
XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg
@@ -77,10 +70,6 @@
$(BUILD_DIR)/mapfile-Xorg-externs
BUILD_TARGETS_SET=yes
-# Additional license files to install
-EXTRA_LICENSES = \
- COPYING.Xprint-fonts
-
# Need to regenerate autoconf/automake files after patching
AUTORECONF=yes
@@ -88,7 +77,7 @@
# Need to override LD setting to add -xarch flags that libtool strips
# XXX: --disable-dga
MODULE_CONFIG_OPTS = $(XSERVER_CONFIG_OPTS) \
- --enable-builddocs --enable-xorgcfg --disable-xprint \
+ --enable-builddocs \
--enable-kdrive --enable-xephyr --disable-xsdl \
MKFONTDIR="$(MKFONTDIR)" \
MKFONTSCALE="$(MKFONTSCALE)" \
@@ -128,9 +117,6 @@
mkdir -p $(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor
cp -p $(SOURCE_DIR)/config/x11-input.fdi \
$(PROTODIR)$(X11_DIR)/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
- (cd $(SOURCE_DIR)/hw/xprint/doc && \
- $(BUILD_ENV) $(MODULE_MAKE) $(MAKEFLAGS) \
- $(DEFAULT_INSTALL_MAKEFLAGS) install)
# Install xorg-server.pc in 32-bit pkgconfig dir on SPARC too
install_pc: install_pkgconfig_uninstalled
--- a/open-src/xserver/xorg/XkbSetRulesDflts.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-From 63b3bf85ed4e11ace433e6aa21b311cce7144007 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Wed, 3 Dec 2008 15:06:37 +1000
-Subject: [PATCH] xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
-
-If no rules file is given, simply re-use the previous one. If no RF is given
-the first time this function is called, use the built-in default.
-This includes fixing the built-in default to something that actually exists.
-
-Signed-off-by: Peter Hutterer <[email protected]>
-(cherry picked from commit 463e02e7de5da3e582a3a049110a476713c7210e)
----
- xkb/xkbInit.c | 29 ++++++++++++++++++++++++-----
- 1 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
-index 0b93e87..3a0e375 100644
---- a/xkb/xkbInit.c
-+++ b/xkb/xkbInit.c
-@@ -93,7 +93,7 @@ typedef struct _SrvXkmInfo {
- #define XKB_BIN_DIRECTORY XKB_BASE_DIRECTORY
- #endif
- #ifndef XKB_DFLT_RULES_FILE
--#define XKB_DFLT_RULES_FILE "rules"
-+#define XKB_DFLT_RULES_FILE "base"
- #endif
- #ifndef XKB_DFLT_KB_LAYOUT
- #define XKB_DFLT_KB_LAYOUT "us"
-@@ -240,14 +240,33 @@ XkbSetRulesUsed(XkbRF_VarDefsPtr defs)
- return;
- }
-
-+/**
-+ * Set the default RMLVO for the next device to be initialised.
-+ * If a parameter is NULL, the previous setting will be used. Use empty
-+ * strings if you want to delete a previous setting.
-+ *
-+ * If @rulesFile is NULL and no previous @rulesFile has been set, the
-+ * built-in default is chosen as default.
-+ */
- _X_EXPORT void
- XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
- char *variant,char *options)
- {
-- if (XkbRulesFile)
-- _XkbFree(XkbRulesFile);
-- XkbRulesFile= _XkbDupString(rulesFile);
-- rulesDefined= True;
-+ if (!rulesFile && !XkbRulesFile)
-+ {
-+ LogMessage(X_WARNING, "[xkb] No rule given, and no previous rule "
-+ "defined. Defaulting to '%s'.\n",
-+ XKB_DFLT_RULES_FILE);
-+ rulesFile = XKB_DFLT_RULES_FILE;
-+ }
-+
-+ if (rulesFile) {
-+ if (XkbRulesFile)
-+ _XkbFree(XkbRulesFile);
-+ XkbRulesFile= _XkbDupString(rulesFile);
-+ rulesDefined= True;
-+ }
-+
- if (model) {
- if (XkbModelDflt)
- _XkbFree(XkbModelDflt);
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/Xorg-mapfile.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/Xorg-mapfile.patch Fri May 15 09:36:46 2009 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' hw/xfree86/Makefile.am hw/xfree86/Makefile.am
---- hw/xfree86/Makefile.am 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/Makefile.am 2008-09-23 16:32:54.777197000 -0700
-@@ -72,7 +72,7 @@ XORG_LIBS = \
+--- hw/xfree86/Makefile.am 2009-01-09 09:47:03.000000000 -0800
++++ hw/xfree86/Makefile.am 2009-01-22 20:34:34.486569000 -0800
+@@ -63,7 +63,7 @@ XORG_LIBS = \
Xorg_DEPENDENCIES = $(XORG_LIBS)
Xorg_LDADD = $(XORG_LIBS) $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/aei-default.false.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,20 @@
+Revert part of e317943c125d7fdbe62c750324640eb30c88fa15 to restore
+AllowEmptyInput default of False unless specified in xorg.conf until
+HAL input device support is integrated into HAL for OpenSolaris.
+
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:41:54.405734000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:42:02.451242000 -0700
+@@ -1007,9 +1007,9 @@ configServerFlags(XF86ConfFlagsPtr flags
+ }
+ #endif
+
+- /* AllowEmptyInput is automatically true if we're hotplugging */
+- xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
+- xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
++ xf86Info.allowEmptyInput = FALSE;
++ if (xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &value))
++ xf86Info.allowEmptyInput = TRUE;
+
+ /* AEI on? Then we're not using kbd, so use the evdev rules set. */
+ #ifdef XKB
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/agpgart.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,200 @@
+From 2a2a7fa6856b2e1954e904577535118f20cd9133 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Mon, 27 Apr 2009 20:23:53 -0700
+Subject: [PATCH] Solaris: use <sys/agpgart.h> instead of stale copy in Xorg sources
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ configure.ac | 2 +-
+ hw/xfree86/os-support/solaris/Makefile.am | 11 ++--
+ hw/xfree86/os-support/solaris/agpgart.h | 108 -----------------------------
+ hw/xfree86/os-support/solaris/sun_agp.c | 7 +--
+ 4 files changed, 7 insertions(+), 121 deletions(-)
+ delete mode 100644 hw/xfree86/os-support/solaris/agpgart.h
+
+diff --git a/configure.ac b/configure.ac
+index 9eadabc..438ee08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,7 +222,7 @@ AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
+ AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
+
+ dnl AGPGART headers
+-AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h], AGP=yes)
++AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
+ AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
+
+ dnl APM header
+diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
+index bcb9874..4496ee1 100644
+--- a/hw/xfree86/os-support/solaris/Makefile.am
++++ b/hw/xfree86/os-support/solaris/Makefile.am
+@@ -4,12 +4,11 @@ else
+ VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c
+ endif
+
+-# TODO: Don't build agpgart on SPARC
+-#if defined(i386Architecture) || defined(AMD64Architecture)
++if AGP
+ AGP_SRC = sun_agp.c
+-#else
+-#AGP_SRC = $(srcdir)/../shared/agp_noop.c
+-#endif
++else
++AGP_SRC = $(srcdir)/../shared/agp_noop.c
++endif
+
+ SOLARIS_INOUT_SRC = solaris-@[email protected]
+ DISTCLEANFILES = solaris-@[email protected]
+@@ -28,7 +27,7 @@ libsolaris_la_SOURCES = sun_init.c \
+ $(VTSW_SRC)
+ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
+
+-sdk_HEADERS = agpgart.h
++sdk_HEADERS =
+ nodist_sdk_HEADERS = solaris-@[email protected]
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+diff --git a/hw/xfree86/os-support/solaris/agpgart.h b/hw/xfree86/os-support/solaris/agpgart.h
+deleted file mode 100644
+index 566de80..0000000
+--- a/hw/xfree86/os-support/solaris/agpgart.h
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/*
+- * AGPGART module version 0.99
+- * Copyright (C) 1999 Jeff Hartmann
+- * Copyright (C) 1999 Precision Insight, Inc.
+- * Copyright (C) 1999 Xi Graphics, 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
+- * JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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 2005 Sun Microsystems, Inc. All rights reserved.
+- *
+- * Permission is hereby granted, free of charge, to any person obtaining a
+- * copy of this software and associated documentation files (the
+- * "Software"), to deal in the Software without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, and/or sell copies of the Software, and to permit persons
+- * to whom the Software is furnished to do so, provided that the above
+- * copyright notice(s) and this permission notice appear in all copies of
+- * the Software and that both the above copyright notice(s) and this
+- * permission notice appear in supporting documentation.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- *
+- * Except as contained in this notice, the name of a copyright holder
+- * shall not be used in advertising or otherwise to promote the sale, use
+- * or other dealings in this Software without prior written authorization
+- * of the copyright holder.
+- */
+-
+-#ifndef _AGPGART_H
+-#define _AGPGART_H
+-
+-#pragma ident "@(#)agpgart.h 1.1 05/04/04 SMI"
+-
+-typedef struct _agp_version {
+- uint16_t agpv_major;
+- uint16_t agpv_minor;
+-} agp_version_t;
+-
+-typedef struct _agp_info {
+- agp_version_t agpi_version;
+- uint32_t agpi_devid; /* bridge vendor + device */
+- uint32_t agpi_mode; /* mode of bridge */
+- ulong_t agpi_aperbase; /* base of aperture */
+- size_t agpi_apersize; /* aperture range size */
+- uint32_t agpi_pgtotal; /* max number of pages in aperture */
+- uint32_t agpi_pgsystem; /* same as pg_total */
+- uint32_t agpi_pgused; /* NUMBER of currently used pages */
+-} agp_info_t;
+-
+-typedef struct _agp_setup {
+- uint32_t agps_mode;
+-} agp_setup_t;
+-
+-typedef struct _agp_allocate {
+- int32_t agpa_key;
+- uint32_t agpa_pgcount;
+- uint32_t agpa_type;
+- uint32_t agpa_physical; /* for i810/830 driver */
+-} agp_allocate_t;
+-
+-typedef struct _agp_bind {
+- int32_t agpb_key;
+- uint32_t agpb_pgstart;
+-} agp_bind_t;
+-
+-typedef struct _agp_unbind {
+- int32_t agpu_key;
+- uint32_t agpu_pri; /* no use in solaris */
+-} agp_unbind_t;
+-
+-#define AGPIOC_BASE 'G'
+-#define AGPIOC_INFO _IOR(AGPIOC_BASE, 0, 100)
+-#define AGPIOC_ACQUIRE _IO(AGPIOC_BASE, 1)
+-#define AGPIOC_RELEASE _IO(AGPIOC_BASE, 2)
+-#define AGPIOC_SETUP _IOW(AGPIOC_BASE, 3, agp_setup_t)
+-#define AGPIOC_ALLOCATE _IOWR(AGPIOC_BASE, 4, agp_allocate_t)
+-#define AGPIOC_DEALLOCATE _IOW(AGPIOC_BASE, 5, int)
+-#define AGPIOC_BIND _IOW(AGPIOC_BASE, 6, agp_bind_t)
+-#define AGPIOC_UNBIND _IOW(AGPIOC_BASE, 7, agp_unbind_t)
+-
+-#define AGP_DEVICE "/dev/agpgart"
+-
+-#endif /* _AGPGART_H */
+diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
+index d151bf6..376f98e 100644
+--- a/hw/xfree86/os-support/solaris/sun_agp.c
++++ b/hw/xfree86/os-support/solaris/sun_agp.c
+@@ -34,8 +34,6 @@
+ * of the copyright holder.
+ */
+
+-#pragma ident "@(#)sun_agp.c 1.1 05/04/04 SMI"
+-
+ #ifdef HAVE_XORG_CONFIG_H
+ #include <xorg-config.h>
+ #endif
+@@ -49,11 +47,8 @@
+ #include <sys/ioccom.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+-#include "agpgart.h"
++#include <sys/agpgart.h>
+
+-#ifndef AGP_DEVICE
+-#define AGP_DEVICE "/dev/agpgart"
+-#endif
+ /* AGP page size is independent of the host page size. */
+ #ifndef AGP_PAGE_SIZE
+ #define AGP_PAGE_SIZE 4096
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/amd64-loader-path.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/amd64-loader-path.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' hw/xfree86/loader/loadmod.c hw/xfree86/loader/loadmod.c
---- hw/xfree86/loader/loadmod.c 2008-09-23 16:32:33.084154000 -0700
-+++ hw/xfree86/loader/loadmod.c 2008-09-23 16:32:43.661970000 -0700
-@@ -171,6 +171,12 @@ InitPathList(const char *path)
+--- hw/xfree86/loader/loadmod.c 2009-01-22 20:34:18.719862000 -0800
++++ hw/xfree86/loader/loadmod.c 2009-01-22 20:34:27.009905000 -0800
+@@ -169,6 +169,12 @@ InitPathList(const char *path)
list[n][len - 1] = '/';
list[n][len] = '\0';
}
@@ -42,7 +42,7 @@
n++;
}
elem = strtok(NULL, ",");
-@@ -349,6 +355,9 @@ InitSubdirs(const char **subdirlist)
+@@ -346,6 +352,9 @@ InitSubdirs(const char **subdirlist)
} else
slash = "";
len += oslen + 2;
@@ -52,7 +52,7 @@
if (!(subdirs[i] = xalloc(len))) {
while (--i >= 0)
xfree(subdirs[i]);
-@@ -358,10 +367,26 @@ InitSubdirs(const char **subdirlist)
+@@ -355,10 +364,26 @@ InitSubdirs(const char **subdirlist)
return NULL;
}
/* tack on the OS name */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/apm-handlers.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,106 @@
+From c74220b853cd99d03e33cc62d32431ca3a879483 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Mon, 30 Mar 2009 14:56:15 -0400
+Subject: [PATCH] APM: Use general handlers, not input handlers.
+
+Otherwise APM events get treated as input events, which messes up idle
+time accounting and screensavers and such. Not, we hope, that anyone
+is using APM anymore.
+---
+ hw/xfree86/os-support/bsd/bsd_apm.c | 4 ++--
+ hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 4 ++--
+ hw/xfree86/os-support/linux/lnx_apm.c | 4 ++--
+ hw/xfree86/os-support/solaris/sun_apm.c | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
+index 43eda74..73c88dc 100644
+--- a/hw/xfree86/os-support/bsd/bsd_apm.c
++++ b/hw/xfree86/os-support/bsd/bsd_apm.c
+@@ -122,7 +122,7 @@ xf86OSPMOpen(void)
+ }
+ xf86PMGetEventFromOs = bsdPMGetEventFromOS;
+ xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
+- APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL);
++ APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
+ return bsdCloseAPM;
+ }
+
+@@ -132,7 +132,7 @@ bsdCloseAPM(void)
+ int fd;
+
+ if (APMihPtr) {
+- fd = xf86RemoveInputHandler(APMihPtr);
++ fd = xf86RemoveGeneralHandler(APMihPtr);
+ close(fd);
+ APMihPtr = NULL;
+ }
+diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+index b37070c..053619e 100644
+--- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
++++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+@@ -178,7 +178,7 @@ xf86OSPMOpen(void)
+
+ xf86PMGetEventFromOs = bsdPMGetEventFromOS;
+ xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
+- APMihPtr = xf86AddInputHandler(kq, xf86HandlePMEvents, NULL);
++ APMihPtr = xf86AddGeneralHandler(kq, xf86HandlePMEvents, NULL);
+ return bsdCloseAPM;
+ }
+
+@@ -188,7 +188,7 @@ bsdCloseAPM(void)
+ int kq;
+
+ if (APMihPtr) {
+- kq = xf86RemoveInputHandler(APMihPtr);
++ kq = xf86RemoveGeneralHandler(APMihPtr);
+ close(devFd);
+ devFd = -1;
+ close(kq);
+diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
+index 16ac80d..8cf318f 100644
+--- a/hw/xfree86/os-support/linux/lnx_apm.c
++++ b/hw/xfree86/os-support/linux/lnx_apm.c
+@@ -180,7 +180,7 @@ lnxAPMOpen(void)
+ close(pfd);
+ xf86PMGetEventFromOs = lnxPMGetEventFromOs;
+ xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
+- APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
++ APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
+ xf86MsgVerb(X_INFO,3,"Open APM successful\n");
+ return lnxCloseAPM;
+ }
+@@ -197,7 +197,7 @@ lnxCloseAPM(void)
+ ErrorF("APM: Closing device\n");
+ #endif
+ if (APMihPtr) {
+- fd = xf86RemoveInputHandler(APMihPtr);
++ fd = xf86RemoveGeneralHandler(APMihPtr);
+ close(fd);
+ APMihPtr = NULL;
+ }
+diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
+index 7decc90..e128c13 100644
+--- a/hw/xfree86/os-support/solaris/sun_apm.c
++++ b/hw/xfree86/os-support/solaris/sun_apm.c
+@@ -215,7 +215,7 @@ xf86OSPMOpen(void)
+ }
+ xf86PMGetEventFromOs = sunPMGetEventFromOS;
+ xf86PMConfirmEventToOs = sunPMConfirmEventToOs;
+- APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL);
++ APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
+ return sunCloseAPM;
+ }
+
+@@ -225,7 +225,7 @@ sunCloseAPM(void)
+ int fd;
+
+ if (APMihPtr) {
+- fd = xf86RemoveInputHandler(APMihPtr);
++ fd = xf86RemoveGeneralHandler(APMihPtr);
+ close(fd);
+ APMihPtr = NULL;
+ }
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/autoconfig.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/autoconfig.patch Fri May 15 09:36:46 2009 -0700
@@ -29,9 +29,9 @@
6385111: Xorg auto-configuration Improvement
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2008-09-24 20:23:15.204372000 -0700
-+++ hw/xfree86/common/xf86Config.c 2008-09-24 20:23:31.397650000 -0700
-@@ -2180,7 +2180,7 @@ configMonitor(MonPtr monitorp, XF86ConfM
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:44:47.430402000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:44:56.031564000 -0700
+@@ -2105,7 +2105,7 @@ configMonitor(MonPtr monitorp, XF86ConfM
cmodep = conf_monitor->mon_modeline_lst;
while( cmodep ) {
mode = xnfcalloc(1, sizeof(DisplayModeRec));
--- a/open-src/xserver/xorg/autoconfig2.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/autoconfig2.patch Fri May 15 09:36:46 2009 -0700
@@ -28,9 +28,9 @@
Raise hsync and default to "1024x768" when DDC data not available.
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Mode.c hw/xfree86/common/xf86Mode.c
---- hw/xfree86/common/xf86Mode.c 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/common/xf86Mode.c 2008-09-24 20:23:48.393454000 -0700
-@@ -1215,6 +1215,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+--- hw/xfree86/common/xf86Mode.c 2009-01-09 09:47:04.000000000 -0800
++++ hw/xfree86/common/xf86Mode.c 2009-01-22 20:35:36.195292000 -0800
+@@ -1209,6 +1209,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
range hsync[MAX_HSYNC];
range vrefresh[MAX_VREFRESH];
Bool inferred_virtual = FALSE;
@@ -38,7 +38,7 @@
#ifdef DEBUG
ErrorF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
-@@ -1262,8 +1263,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1256,8 +1257,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
}
} else {
scrp->monitor->hsync[0].lo = 31.5;
@@ -49,7 +49,7 @@
}
type = "default ";
}
-@@ -1498,6 +1500,11 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
+@@ -1492,6 +1494,11 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
xf86DeleteMode(&scrp->modes, scrp->modes);
endp = &scrp->modes;
last = NULL;
--- a/open-src/xserver/xorg/catch-dlerrors.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/catch-dlerrors.patch Fri May 15 09:36:46 2009 -0700
@@ -31,20 +31,35 @@
Catch errors loading libraries at runtime so we can clean up when a lazyloaded
library fails to open correctly.
---- os/osinit.c 2008-11-05 08:52:17.000000000 -0800
-+++ os/osinit.c 2009-03-05 14:44:17.792553000 -0800
-@@ -54,6 +54,8 @@
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2009-05-08 17:42:50.197784000 -0700
++++ configure.ac 2009-05-08 17:42:58.915352000 -0700
+@@ -101,7 +101,7 @@ AM_CONDITIONAL(XSERVER_DTRACE, [test "x$
+
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h])
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff -urp -x '*~' -x '*.orig' os/osinit.c os/osinit.c
+--- os/osinit.c 2009-04-14 10:14:57.000000000 -0700
++++ os/osinit.c 2009-05-08 17:42:58.916721000 -0700
+@@ -54,6 +54,10 @@ SOFTWARE.
#include "os.h"
#include "osdep.h"
#include <X11/Xos.h>
-+#include <dlfcn.h>
++#ifdef HAVE_DLFCN_H
++# include <dlfcn.h>
++#endif
+#include <signal.h>
- #ifdef SMART_SCHEDULE
#include "dixstruct.h"
-@@ -92,6 +94,17 @@
- Bool OsDelayInitColors = FALSE;
+@@ -88,6 +92,17 @@ int limitStackSpace = -1;
+ int limitNoFile = -1;
+ #endif
+static void OsSigHandler(int signo)
+{
@@ -60,7 +75,7 @@
void
OsInit(void)
{
-@@ -100,6 +113,16 @@
+@@ -96,6 +111,16 @@ OsInit(void)
static char* devnull = "/dev/null";
char fname[PATH_MAX];
--- a/open-src/xserver/xorg/cli-nobanner.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/cli-nobanner.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2008-09-24 20:18:58.790366000 -0700
-+++ os/utils.c 2008-09-24 20:19:13.278843000 -0700
-@@ -903,6 +903,12 @@ ProcessCommandLine(int argc, char *argv[
+--- os/utils.c 2009-01-22 20:33:34.957491000 -0800
++++ os/utils.c 2009-01-22 20:33:41.392540000 -0800
+@@ -776,6 +776,12 @@ ProcessCommandLine(int argc, char *argv[
}
#endif
#endif
--- a/open-src/xserver/xorg/cli-nolock.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/cli-nolock.patch Fri May 15 09:36:46 2009 -0700
@@ -28,9 +28,9 @@
diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2008-09-23 11:25:01.000000000 -0700
-+++ os/utils.c 2008-09-24 20:18:58.790366000 -0700
-@@ -606,9 +606,11 @@ void UseMsg(void)
+--- os/utils.c 2009-01-09 09:47:04.000000000 -0800
++++ os/utils.c 2009-01-22 20:33:34.957491000 -0800
+@@ -506,9 +506,11 @@ void UseMsg(void)
#ifdef RLIMIT_STACK
ErrorF("-ls int limit stack space to N Kb\n");
#endif
@@ -42,7 +42,7 @@
#ifndef NOLOGOHACK
ErrorF("-logo enable logo in screen saver\n");
ErrorF("nologo disable logo in screen saver\n");
-@@ -888,6 +890,7 @@ ProcessCommandLine(int argc, char *argv[
+@@ -761,6 +763,7 @@ ProcessCommandLine(int argc, char *argv[
UseMsg();
}
#endif
@@ -50,7 +50,7 @@
#ifdef SERVER_LOCK
else if ( strcmp ( argv[i], "-nolock") == 0)
{
-@@ -899,6 +902,7 @@ ProcessCommandLine(int argc, char *argv[
+@@ -772,6 +775,7 @@ ProcessCommandLine(int argc, char *argv[
nolock = TRUE;
}
#endif
--- a/open-src/xserver/xorg/config-man-eofnotes.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-###############################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)config-man-eofnotes.patch 1.1 09/03/12
-#
-
-Add notes to xorgcfg & xorgconfig man pages about their EOF state,
-and directly add attributes section with Obsolete stability instead
-of letting suntouch-manpages.pl add one with just Volatile stability.
-
---- hw/xfree86/utils/xorgcfg/xorgcfg.man.pre Wed Nov 5 08:52:17 2008
-+++ hw/xfree86/utils/xorgcfg/xorgcfg.man.pre Wed Mar 11 18:10:42 2009
-@@ -1,3 +1,4 @@
-+'\" t
- .\"
- .\" $XdotOrg: $
- .\" Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-@@ -33,7 +34,7 @@
- .SH NAME
- xorgcfg - Graphical configuration tool for __xservername__
- .SH SYNOPSIS
--.B xorgcfg
-+.B /usr/X11/bin/xorgcfg
- [-config \fIconfigfile\fP] [-modulepath \fImoduledir\fP]
- [-fontpath \fIfontsdir\fP] [-toolkitoption ...]
- .SH DESCRIPTION
-@@ -146,3 +147,53 @@
-
- .SH BUGS
- Probably.
-+.\" Begin Sun update
-+.SH "ATTRIBUTES"
-+See \fBattributes\fR(5) for descriptions of the following attributes:
-+.sp
-+.TS
-+allbox;
-+cw(2.750000i)| cw(2.750000i)
-+lw(2.750000i)| lw(2.750000i).
-+ATTRIBUTE TYPE ATTRIBUTE VALUE
-+Availability SUNWxorg-cfg
-+Interface Stability Obsolete Volatile
-+.TE
-+.sp
-+.SH NOTES
-+.PP
-+The
-+.BR xorgcfg (1)
-+and
-+.BR xorgconfig (1)
-+utilities for generating
-+.BR xorg.conf (4)
-+files may no longer be included in an upcoming release.
-+.PP
-+The
-+.BR Xorg (1)
-+server does not require a configuration file in many cases,
-+and will autoconfigure itself if one is not present. If the
-+default configuration does not meet your needs, you may use one of
-+these alternative methods to generate an xorg.conf file for
-+customization:
-+.IP
-+When Xorg is started without a configuration file, the xorg.conf
-+data it generates automatically is logged in /var/log/Xorg.0.log
-+and may be copied to an xorg.conf file for customization.
-+.IP
-+/usr/X11/bin/Xorg -configure, when the server is not already running
-+will provide a sample configuration file for the currently detected
-+hardware in the system.
-+.IP
-+Users of Nvidia graphics devices may use the provided
-+.BR nvidia-settings (1)
-+and
-+.BR nvidia-xconfig (1)
-+utilities to generate or update device-specific configurations.
-+.IP
-+Users of Sun graphics devices for the SPARC platform may use the
-+.BR fbconfig (1)
-+utility to generate or update device-specific
-+configurations.
-+.\" End Sun update
-
---- hw/xfree86/utils/xorgconfig/xorgconfig.man.pre Wed Nov 5 08:52:17 2008
-+++ hw/xfree86/utils/xorgconfig/xorgconfig.man.pre Wed Mar 11 18:10:14 2009
-@@ -1,3 +1,4 @@
-+'\" t
- .\" $XdotOrg: $
- .\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man,v 1.5 2001/11/01 23:35:34 dawes Exp $
- .TH xorgconfig 1 __vendorversion__
-@@ -4,7 +5,7 @@
- .SH NAME
- xorgconfig \- generate an __XCONFIGFILE__ file
- .SH SYNOPSIS
--.B xorgconfig
-+.B /usr/X11/bin/xorgconfig
- .SH DESCRIPTION
- \fIxorgconfig\fP is an interactive program for generating an __XCONFIGFILE__ file
- for use with __XSERVERNAME__ X servers.
-@@ -20,3 +21,53 @@
- .SH AUTHOR
- Harm Hanemaayer.
- .\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $
-+.\" Begin Sun update
-+.SH "ATTRIBUTES"
-+See \fBattributes\fR(5) for descriptions of the following attributes:
-+.sp
-+.TS
-+allbox;
-+cw(2.750000i)| cw(2.750000i)
-+lw(2.750000i)| lw(2.750000i).
-+ATTRIBUTE TYPE ATTRIBUTE VALUE
-+Availability SUNWxorg-server
-+Interface Stability Obsolete Volatile
-+.TE
-+.sp
-+.SH NOTES
-+.PP
-+The
-+.BR xorgcfg (1)
-+and
-+.BR xorgconfig (1)
-+utilities for generating
-+.BR xorg.conf (4)
-+files may no longer be included in an upcoming release.
-+.PP
-+The
-+.BR Xorg (1)
-+server does not require a configuration file in many cases,
-+and will autoconfigure itself if one is not present. If the
-+default configuration does not meet your needs, you may use one of
-+these alternative methods to generate an xorg.conf file for
-+customization:
-+.IP
-+When Xorg is started without a configuration file, the xorg.conf
-+data it generates automatically is logged in /var/log/Xorg.0.log
-+and may be copied to an xorg.conf file for customization.
-+.IP
-+/usr/X11/bin/Xorg -configure, when the server is not already running
-+will provide a sample configuration file for the currently detected
-+hardware in the system.
-+.IP
-+Users of Nvidia graphics devices may use the provided
-+.BR nvidia-settings (1)
-+and
-+.BR nvidia-xconfig (1)
-+utilities to generate or update device-specific configurations.
-+.IP
-+Users of Sun graphics devices for the SPARC platform may use the
-+.BR fbconfig (1)
-+utility to generate or update device-specific
-+configurations.
-+.\" End Sun update
--- a/open-src/xserver/xorg/dixmods-deps.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/dixmods-deps.patch Fri May 15 09:36:46 2009 -0700
@@ -1,17 +1,27 @@
---- hw/xfree86/dixmods/Makefile.am 2008-09-26 21:45:31.528930000 -0700
-+++ hw/xfree86/dixmods/Makefile.am 2008-09-27 09:30:57.338529000 -0700
-@@ -70,7 +70,7 @@
- libdbe_la_SOURCES = dbemodule.c
+diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
+--- hw/xfree86/dixmods/Makefile.am 2009-05-08 17:45:57.848078000 -0700
++++ hw/xfree86/dixmods/Makefile.am 2009-05-08 17:46:07.162324000 -0700
+@@ -36,6 +36,7 @@ libdbe_la_SOURCES = dbemodule.c
libfb_la_LDFLAGS = -avoid-version
--libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
-+libfb_la_LIBADD = $(top_builddir)/fb/libfb.la -lpixman-1
+ libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
++libfb_la_LIBADD += -lpixman-1
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
libfb_la_CFLAGS = $(AM_CFLAGS)
+@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACC
+ libglx_la_LDFLAGS = -avoid-version -mimpure-text
+ if AIGLX
+ GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
++libglx_la_LDFLAGS += -R$(extsmoduledir:amd64/extensions=extensions/amd64)
++libglx_la_LDFLAGS += -Wl,-N,libdri.so -Wl,-N,libdri2.so
+ endif
+ libglx_la_LIBADD = \
+ $(top_builddir)/glx/libglx.la \
+diff -urp -x '*~' -x '*.orig' hw/xfree86/int10/Makefile.am hw/xfree86/int10/Makefile.am
--- hw/xfree86/int10/Makefile.am 2007-10-17 07:01:23.000000000 -0700
-+++ hw/xfree86/int10/Makefile.am 2008-09-30 14:20:57.961539000 -0700
-@@ -42,3 +42,5 @@
++++ hw/xfree86/int10/Makefile.am 2009-05-08 17:46:07.162854000 -0700
+@@ -42,3 +42,5 @@ libint10_la_SOURCES = stub.c xf86int10mo
endif
EXTRA_DIST = xf86x86emu.h INT10.HOWTO
--- a/open-src/xserver/xorg/dri.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-
-diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/solaris/agpgart.h hw/xfree86/os-support/solaris/agpgart.h
---- hw/xfree86/os-support/solaris/agpgart.h 2007-10-23 14:26:51.000000000 -0700
-+++ hw/xfree86/os-support/solaris/agpgart.h 2008-09-24 20:22:57.390291000 -0700
-@@ -23,7 +23,7 @@
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- /*
-- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-+ * Copyright 2006 Sun Microsystems, 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
-@@ -54,7 +54,13 @@
- #ifndef _AGPGART_H
- #define _AGPGART_H
-
--#pragma ident "@(#)agpgart.h 1.1 05/04/04 SMI"
-+#pragma ident "@(#)agpgart.h 1.2 06/10/25 SMI"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define AGP_NORMAL 0 /* mapped to user land, no cache */
-
- typedef struct _agp_version {
- uint16_t agpv_major;
-@@ -80,7 +86,7 @@ typedef struct _agp_allocate {
- int32_t agpa_key;
- uint32_t agpa_pgcount;
- uint32_t agpa_type;
-- uint32_t agpa_physical; /* for i810/830 driver */
-+ uint32_t agpa_physical; /* for i810 only, private */
- } agp_allocate_t;
-
- typedef struct _agp_bind {
-@@ -102,7 +108,46 @@ typedef struct _agp_unbind {
- #define AGPIOC_DEALLOCATE _IOW(AGPIOC_BASE, 5, int)
- #define AGPIOC_BIND _IOW(AGPIOC_BASE, 6, agp_bind_t)
- #define AGPIOC_UNBIND _IOW(AGPIOC_BASE, 7, agp_unbind_t)
-+#define AGPIOC_IOREMAP _IO(AGPIOC_BASE, 8)
-+#define AGPIOC_IOREMAP_FREE _IO(AGPIOC_BASE, 9)
-+#define AGPIOC_READ _IO(AGPIOC_BASE, 10)
-+#define AGPIOC_WRITE _IO(AGPIOC_BASE, 11)
-+
-+/* AGP status register bits definition */
-+#define AGPSTAT_RQ_MASK 0xff000000 /* target only */
-+#define AGPSTAT_SBA (0x1 << 9) /* always 1 for 3.0 */
-+#define AGPSTAT_OVER4G (0x1 << 5)
-+#define AGPSTAT_FW (0x1 << 4)
-+#define AGPSTAT_RATE_MASK 0x7
-+/* rate for 2.0 mode */
-+#define AGP2_RATE_1X 0x1
-+#define AGP2_RATE_2X 0x2
-+#define AGP2_RATE_4X 0x4
-+/* AGP 3.0 only bits */
-+#define AGPSTAT_ARQSZ_MASK (0x7 << 13) /* target only */
-+#define AGPSTAT_CAL_MASK (0x7 << 10)
-+#define AGPSTAT_GART64B (0x1 << 7) /* target only */
-+#define AGPSTAT_MODE3 (0x1 << 3)
-+/* Rate for 3.0 mode */
-+#define AGP3_RATE_4X 0x1
-+#define AGP3_RATE_8X 0x2
-+
-+/* AGP command register bits definition */
-+#define AGPCMD_RQ_MASK 0xff000000 /* master only */
-+#define AGPCMD_SBAEN (0x1 << 9) /* must be 1 for 3.0 */
-+#define AGPCMD_AGPEN (0x1 << 8)
-+#define AGPCMD_OVER4GEN (0x1 << 5)
-+#define AGPCMD_FWEN (0x1 << 4)
-+#define AGPCMD_RATE_MASK 0x7
-+/* AGP 3.0 only bits */
-+#define AGP3_CMD_ARQSZ_MASK (0x7 << 13) /* master only */
-+#define AGP3_CMD_CAL_MASK (0x7 << 10) /* target only */
-+#define AGP3_CMD_GART64BEN (0x1 << 7) /* target only */
-
- #define AGP_DEVICE "/dev/agpgart"
-
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif /* _AGPGART_H */
--- a/open-src/xserver/xorg/driver-autoconfig.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-From 5e847c1d4fc30a0d263a861a76982660f11998cd Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 7 Jul 2008 17:08:01 -0700
-Subject: [PATCH] Improved driver selection when autoconfiguring driver without xorg.conf
-
-- Allow returning multiple drivers to try for a given PCI id (for instance,
- try "geode" then "amd" for AMD Geode hardware)
-- On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers
-- Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
----
- hw/xfree86/common/xf86AutoConfig.c | 223 +++++++++++++++++++++++-------------
- 1 files changed, 142 insertions(+), 81 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index a786eed..45c42e1 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -41,6 +41,11 @@ #include "xf86Priv.h"
- #include "xf86_OSlib.h"
- #include "dirent.h"
-
-+#ifdef sun
-+# include <sys/visual_io.h>
-+# include <ctype.h>
-+#endif
-+
- /* Sections for the default built-in configuration. */
-
- #define BUILTIN_DEVICE_NAME \
-@@ -79,11 +84,8 @@ #define BUILTIN_LAYOUT_SECTION_POST \
-
- static const char **builtinConfig = NULL;
- static int builtinLines = 0;
--static const char *deviceList[] = {
-- "fbdev",
-- "vesa",
-- NULL
--};
-+
-+static void listPossibleVideoDrivers(char *matches[], int nmatches);
-
- /*
- * A built-in config file is stored as an array of strings, with each string
-@@ -135,87 +137,91 @@ AppendToConfig(const char *s)
- AppendToList(s, &builtinConfig, &builtinLines);
- }
-
--static const char *
--videoPtrToDriverName(struct pci_device *dev)
-+static int
-+videoPtrToDriverList(struct pci_device *dev,
-+ char *returnList[], int returnListMax)
- {
- /*
- * things not handled yet:
- * cyrix/nsc. should be merged into geode anyway.
- * xgi.
- */
-+ int i;
-+ /* Add more entries here if we ever return more than 4 drivers for
-+ any device */
-+ char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };
-
- switch (dev->vendor_id)
- {
- case 0x1022:
-- if (dev->device_id == 0x2081)
-- return "geode";
-- else
-- return NULL;
-- case 0x1142: return "apm";
-- case 0xedd8: return "ark";
-- case 0x1a03: return "ast";
-- case 0x1002: return "ati";
-- case 0x102c: return "chips";
-- case 0x1013: return "cirrus";
-+ if (dev->device_id == 0x2081) {
-+ driverList[0] = "geode";
-+ driverList[1] = "amd";
-+ }
-+ break;
-+ case 0x1142: driverList[0] = "apm"; break;
-+ case 0xedd8: driverList[0] = "ark"; break;
-+ case 0x1a03: driverList[0] = "ast"; break;
-+ case 0x1002: driverList[0] = "ati"; break;
-+ case 0x102c: driverList[0] = "chips"; break;
-+ case 0x1013: driverList[0] = "cirrus"; break;
- case 0x8086:
-- if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800))
-- return "i740";
-- else return "intel";
-- case 0x102b: return "mga";
-- case 0x10c8: return "neomagic";
-- case 0x105d: return "i128";
-- case 0x10de: case 0x12d2: return "nv";
-- case 0x1163: return "rendition";
-+ if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
-+ driverList[0] = "i740";
-+ } else {
-+ driverList[0] = "intel";
-+ driverList[1] = "i810";
-+ }
-+ break;
-+ case 0x102b: driverList[0] = "mga"; break;
-+ case 0x10c8: driverList[0] = "neomagic"; break;
-+ case 0x105d: driverList[0] = "i128"; break;
-+ case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
-+ case 0x1163: driverList[0] = "rendition"; break;
- case 0x5333:
- switch (dev->device_id)
- {
- case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811:
- case 0x8812: case 0x8814: case 0x8901:
-- return "s3";
-+ driverList[0] = "s3"; break;
- case 0x5631: case 0x883d: case 0x8a01: case 0x8a10:
- case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13:
-- return "s3virge";
-+ driverList[0] = "s3virge"; break;
- default:
-- return "savage";
-+ driverList[0] = "savage"; break;
- }
-- case 0x1039: return "sis";
-- case 0x126f: return "siliconmotion";
-+ break;
-+ case 0x1039: driverList[0] = "sis"; break;
-+ case 0x126f: driverList[0] = "siliconmotion"; break;
- case 0x121a:
- if (dev->device_id < 0x0003)
-- return "voodoo";
-+ driverList[0] = "voodoo";
- else
-- return "tdfx";
-- case 0x3d3d: return "glint";
-- case 0x1023: return "trident";
-- case 0x100c: return "tseng";
-- case 0x1106: return "openchrome";
-- case 0x15ad: return "vmware";
-+ driverList[0] = "tdfx";
-+ break;
-+ case 0x3d3d: driverList[0] = "glint"; break;
-+ case 0x1023: driverList[0] = "trident"; break;
-+ case 0x100c: driverList[0] = "tseng"; break;
-+ case 0x1106: driverList[0] = "openchrome"; break;
-+ case 0x15ad: driverList[0] = "vmware"; break;
- default: break;
- }
-- return NULL;
-+ for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {
-+ returnList[i] = xnfstrdup(driverList[i]);
-+ }
-+ return i; /* Number of entries added */
- }
-
- Bool
- xf86AutoConfig(void)
- {
-- const char **p;
-+ char *deviceList[20];
-+ char **p;
-+ const char **cp;
- char buf[1024];
-- const char *driver = NULL;
- ConfigStatus ret;
-
-- driver = chooseVideoDriver();
--
-- if (driver) {
-- snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_PRE,
-- driver, 0, driver);
-- AppendToConfig(buf);
-- ErrorF("New driver is \"%s\"\n", driver);
-- buf[0] = '\t';
-- AppendToConfig(BUILTIN_DEVICE_SECTION_POST);
-- snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION,
-- driver, 0, driver, 0);
-- AppendToConfig(buf);
-- }
-+ listPossibleVideoDrivers(deviceList, 20);
-
- for (p = deviceList; *p; p++) {
- snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
-@@ -225,23 +231,23 @@ xf86AutoConfig(void)
- }
-
- AppendToConfig(BUILTIN_LAYOUT_SECTION_PRE);
-- if (driver) {
-- snprintf(buf, sizeof(buf), BUILTIN_LAYOUT_SCREEN_LINE, driver, 0);
-- AppendToConfig(buf);
-- }
- for (p = deviceList; *p; p++) {
- snprintf(buf, sizeof(buf), BUILTIN_LAYOUT_SCREEN_LINE, *p, 0);
- AppendToConfig(buf);
- }
- AppendToConfig(BUILTIN_LAYOUT_SECTION_POST);
-
-+ for (p = deviceList; *p; p++) {
-+ xfree(*p);
-+ }
-+
- xf86MsgVerb(X_DEFAULT, 0,
- "Using default built-in configuration (%d lines)\n",
- builtinLines);
-
- xf86MsgVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n");
-- for (p = builtinConfig; *p; p++)
-- xf86ErrorFVerb(3, "\t%s", *p);
-+ for (cp = builtinConfig; *cp; cp++)
-+ xf86ErrorFVerb(3, "\t%s", *cp);
- xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n");
-
- xf86setBuiltinConfig(builtinConfig);
-@@ -416,17 +422,51 @@ #endif /* __GLIBC __ */
- }
- #endif /* __linux__ */
-
--char*
--chooseVideoDriver(void)
-+static void
-+listPossibleVideoDrivers(char *matches[], int nmatches)
- {
- struct pci_device * info = NULL;
- struct pci_device_iterator *iter;
-- char *chosen_driver = NULL;
- int i;
-- char *matches[20]; /* If we have more than 20 drivers we're in trouble */
-
-- for (i=0 ; i<20 ; i++)
-+ for (i = 0 ; i < nmatches ; i++) {
- matches[i] = NULL;
-+ }
-+ i = 0;
-+
-+#ifdef sun
-+ /* Check for driver type based on /dev/fb type and if valid, use
-+ it instead of PCI bus probe results */
-+ if (xf86Info.consoleFd >= 0) {
-+ struct vis_identifier visid;
-+ const char *cp;
-+
-+ if (ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid) >= 0) {
-+ xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
-+
-+ /* Special case from before the general case was set */
-+ if (strcmp(visid.name, "NVDAnvda") == 0) {
-+ matches[i++] = xnfstrdup("nvidia");
-+ }
-+
-+ /* General case - split into vendor name (initial all-caps
-+ prefix) & driver name (rest of the string). */
-+ if (strcmp(visid.name, "SUNWtext") != 0) {
-+ for (cp = visid.name; (*cp != '\0') && isupper(*cp); cp++) {
-+ /* find end of all uppercase vendor section */
-+ }
-+ if ((cp != visid.name) && (*cp != '\0')) {
-+ char *driverName = xnfstrdup(cp);
-+ char *vendorName = xnfstrdup(visid.name);
-+ vendorName[cp - visid.name] = '\0';
-+
-+ matches[i++] = vendorName;
-+ matches[i++] = driverName;
-+ }
-+ }
-+ }
-+ }
-+#endif
-
- /* Find the primary device, and get some information about it. */
- iter = pci_slot_match_iterator_create(NULL);
-@@ -447,31 +487,52 @@ #ifdef __linux__
- }
- #endif /* __linux__ */
-
-- /* TODO Handle multiple drivers claiming to support the same PCI ID */
-- if (matches[0]) {
-- chosen_driver = matches[0];
-- } else {
-- if (info != NULL)
-- chosen_driver = videoPtrToDriverName(info);
-- if (chosen_driver == NULL) {
--#if defined __i386__ || defined __amd64__ || defined __hurd__
-- chosen_driver = "vesa";
--#elif defined __sparc__
-- chosen_driver = "sunffb";
-+ for (i = 0; (i < nmatches) && (matches[i]); i++) {
-+ /* find end of matches list */
-+ }
-+
-+ if ((info != NULL) && (i < nmatches)) {
-+ i += videoPtrToDriverList(info, &(matches[i]), nmatches - i);
-+ }
-+
-+ /* Fallback to platform default hardware */
-+ if (i < (nmatches - 1)) {
-+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
-+ matches[i++] = xnfstrdup("vesa");
-+#elif defined(__sparc__) && !defined(sun)
-+ matches[i++] = xnfstrdup("sunffb");
-+#endif
-+ }
-+
-+ /* Fallback to platform default frame buffer driver */
-+ if (i < (nmatches - 1)) {
-+#if !defined(__linux__) && defined(__sparc__)
-+ matches[i++] = xnfstrdup("wsfb");
- #else
-- chosen_driver = "fbdev";
-+ matches[i++] = xnfstrdup("fbdev");
- #endif
-- }
- }
-+}
-+
-+char*
-+chooseVideoDriver(void)
-+{
-+ char *chosen_driver = NULL;
-+ int i;
-+ char *matches[20]; /* If we have more than 20 drivers we're in trouble */
-
-- xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", chosen_driver);
-+ listPossibleVideoDrivers(matches, 20);
-
-- i = 0;
-- while (matches[i]) {
-+ /* TODO Handle multiple drivers claiming to support the same PCI ID */
-+ chosen_driver = matches[0];
-+
-+ xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n",
-+ chosen_driver);
-+
-+ for (i = 0; matches[i] ; i++) {
- if (matches[i] != chosen_driver) {
- xfree(matches[i]);
- }
-- i++;
- }
-
- return chosen_driver;
---
-1.4.1
-
--- a/open-src/xserver/xorg/dtlogin-userinfo.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/dtlogin-userinfo.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2008-09-23 11:27:01.000000000 -0700
-+++ configure.ac 2008-09-24 20:20:03.627438000 -0700
-@@ -1157,6 +1157,7 @@ LIBCRYPTO="$OPENSSL_LIB_FLAGS -lcrypto"
+--- configure.ac 2009-05-08 17:43:15.381265000 -0700
++++ configure.ac 2009-05-08 17:43:23.621871000 -0700
+@@ -1198,6 +1198,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUI
XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
@@ -38,9 +38,9 @@
AC_SUBST([XSERVER_SYS_LIBS])
diff -urp -x '*~' -x '*.orig' os/Makefile.am os/Makefile.am
---- os/Makefile.am 2008-09-23 11:25:01.000000000 -0700
-+++ os/Makefile.am 2008-09-24 20:20:03.627940000 -0700
-@@ -22,6 +22,7 @@ libos_la_SOURCES = \
+--- os/Makefile.am 2009-02-13 14:24:04.000000000 -0800
++++ os/Makefile.am 2009-05-08 17:43:23.622460000 -0700
+@@ -24,6 +24,7 @@ libos_la_SOURCES = \
xdmauth.c \
xstrans.c \
xprintf.c \
@@ -48,7 +48,7 @@
$(XORG_SRCS)
if SECURE_RPC
-@@ -36,6 +37,8 @@ if NEED_STRLCAT
+@@ -38,6 +39,8 @@ if NEED_STRLCAT
libos_la_SOURCES += $(STRLCAT_SRCS)
endif
@@ -58,8 +58,8 @@
$(XDMCP_SRCS) $(STRLCAT_SRCS)
diff -urp -x '*~' -x '*.orig' os/auth.c os/auth.c
---- os/auth.c 2008-09-23 11:25:01.000000000 -0700
-+++ os/auth.c 2008-09-24 20:20:03.629219000 -0700
+--- os/auth.c 2009-03-13 10:34:03.000000000 -0700
++++ os/auth.c 2009-05-08 17:43:23.622937000 -0700
@@ -289,6 +289,19 @@ AddAuthorization (unsigned name_length,
return 0;
}
@@ -81,9 +81,9 @@
XID
diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
---- os/connection.c 2008-09-23 11:25:01.000000000 -0700
-+++ os/connection.c 2008-09-24 20:20:03.630157000 -0700
-@@ -168,6 +168,10 @@ typedef const char *string;
+--- os/connection.c 2009-04-14 10:14:57.000000000 -0700
++++ os/connection.c 2009-05-08 17:43:23.623731000 -0700
+@@ -131,6 +131,10 @@ typedef const char *string;
# include "../dix/Xserver-dtrace.h"
#endif
@@ -94,7 +94,7 @@
static int lastfdesc; /* maximum file descriptor */
fd_set WellKnownConnections; /* Listener mask */
-@@ -472,6 +476,12 @@ CreateWellKnownSockets(void)
+@@ -435,6 +439,12 @@ CreateWellKnownSockets(void)
XFD_COPYSET (&WellKnownConnections, &AllSockets);
ResetHosts(display);
--- a/open-src/xserver/xorg/faster-devPrivates.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-From b6ab114212c0e4c3346ceb5b207f14c526ab81e7 Mon Sep 17 00:00:00 2001
-From: Eamon Walsh <[email protected]>
-Date: Fri, 12 Sep 2008 19:11:53 -0400
-Subject: [PATCH] Array-index based devPrivates implementation.
-
-Note: DevPrivateKey is now pointer-to-int, which means
-each key now needs to point to some global storage of
-size at least sizeof(int).
----
- dix/privates.c | 209 +++++++++++++++++++++++++++-------------------------
- include/privates.h | 2
- 2 files changed, 109 insertions(+), 102 deletions(-)
-
-diff --git a/dix/privates.c b/dix/privates.c
-index efb3204..ca03317 100644
---- a/dix/privates.c
-+++ b/dix/privates.c
-@@ -40,9 +40,8 @@ #include "colormapst.h"
- #include "inputstr.h"
-
- struct _Private {
-- DevPrivateKey key;
-- pointer value;
-- struct _Private *next;
-+ int state;
-+ pointer value;
- };
-
- typedef struct _PrivateDesc {
-@@ -50,22 +49,36 @@ typedef struct _PrivateDesc {
- unsigned size;
- CallbackListPtr initfuncs;
- CallbackListPtr deletefuncs;
-- struct _PrivateDesc *next;
- } PrivateDescRec;
-
-+#define PRIV_MAX 256
-+#define PRIV_STEP 16
-+
- /* list of all allocated privates */
--static PrivateDescRec *items = NULL;
-+static PrivateDescRec items[PRIV_MAX];
-+static int nextPriv;
-
--static _X_INLINE PrivateDescRec *
-+static PrivateDescRec *
- findItem(const DevPrivateKey key)
- {
-- PrivateDescRec *item = items;
-- while (item) {
-- if (item->key == key)
-- return item;
-- item = item->next;
-+ if (!*key) {
-+ if (nextPriv >= PRIV_MAX)
-+ return NULL;
-+
-+ items[nextPriv].key = key;
-+ *key = nextPriv;
-+ nextPriv++;
- }
-- return NULL;
-+
-+ return items + *key;
-+}
-+
-+static _X_INLINE int
-+privateExists(PrivateRec **privates, const DevPrivateKey key)
-+{
-+ return *key && *privates &&
-+ (*privates)[0].state > *key &&
-+ (*privates)[*key].state;
- }
-
- /*
-@@ -75,21 +88,10 @@ _X_EXPORT int
- dixRequestPrivate(const DevPrivateKey key, unsigned size)
- {
- PrivateDescRec *item = findItem(key);
-- if (item) {
-- if (size > item->size)
-- item->size = size;
-- } else {
-- item = (PrivateDescRec *)xalloc(sizeof(PrivateDescRec));
-- if (!item)
-- return FALSE;
-- memset(item, 0, sizeof(PrivateDescRec));
--
-- /* add privates descriptor */
-- item->key = key;
-+ if (!item)
-+ return FALSE;
-+ if (size > item->size)
- item->size = size;
-- item->next = items;
-- items = item;
-- }
- return TRUE;
- }
-
-@@ -100,25 +102,52 @@ _X_EXPORT pointer *
- dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
- {
- PrivateDescRec *item = findItem(key);
-+ PrivateCallbackRec calldata;
- PrivateRec *ptr;
-- unsigned size = sizeof(PrivateRec);
--
-- if (item)
-- size += item->size;
-+ pointer value;
-+ int oldsize, newsize;
-+
-+ newsize = (*key / PRIV_STEP + 1) * PRIV_STEP;
-
-- ptr = (PrivateRec *)xcalloc(size, 1);
-- if (!ptr)
-+ /* resize or init privates array */
-+ if (!item)
- return NULL;
-- ptr->key = key;
-- ptr->value = (size > sizeof(PrivateRec)) ? (ptr + 1) : NULL;
-- ptr->next = *privates;
-- *privates = ptr;
--
-- /* call any init funcs and return */
-- if (item) {
-- PrivateCallbackRec calldata = { key, &ptr->value };
-- CallCallbacks(&item->initfuncs, &calldata);
-+
-+ /* initialize privates array if necessary */
-+ if (!*privates) {
-+ ptr = xcalloc(newsize, sizeof(*ptr));
-+ if (!ptr)
-+ return NULL;
-+ *privates = ptr;
-+ (*privates)[0].state = newsize;
-+ }
-+
-+ oldsize = (*privates)[0].state;
-+
-+ /* resize privates array if necessary */
-+ if (*key >= oldsize) {
-+ ptr = xrealloc(*privates, newsize * sizeof(*ptr));
-+ if (!ptr)
-+ return NULL;
-+ memset(ptr + oldsize, 0, (newsize - oldsize) * sizeof(*ptr));
-+ *privates = ptr;
-+ (*privates)[0].state = newsize;
-+ }
-+
-+ /* initialize slot */
-+ ptr = *privates + *key;
-+ ptr->state = 1;
-+ if (item->size) {
-+ value = xcalloc(item->size, 1);
-+ if (!value)
-+ return NULL;
-+ ptr->value = value;
- }
-+
-+ calldata.key = key;
-+ calldata.value = &ptr->value;
-+ CallCallbacks(&item->initfuncs, &calldata);
-+
- return &ptr->value;
- }
-
-@@ -128,14 +157,10 @@ dixAllocatePrivate(PrivateRec **privates
- _X_EXPORT pointer
- dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key)
- {
-- PrivateRec *rec = *privates;
- pointer *ptr;
-
-- while (rec) {
-- if (rec->key == key)
-- return rec->value;
-- rec = rec->next;
-- }
-+ if (privateExists(privates, key))
-+ return (*privates)[*key].value;
-
- ptr = dixAllocatePrivate(privates, key);
- return ptr ? *ptr : NULL;
-@@ -147,13 +172,8 @@ dixLookupPrivate(PrivateRec **privates,
- _X_EXPORT pointer *
- dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key)
- {
-- PrivateRec *rec = *privates;
--
-- while (rec) {
-- if (rec->key == key)
-- return &rec->value;
-- rec = rec->next;
-- }
-+ if (privateExists(privates, key))
-+ return &(*privates)[*key].value;
-
- return dixAllocatePrivate(privates, key);
- }
-@@ -164,16 +184,10 @@ dixLookupPrivateAddr(PrivateRec **privat
- _X_EXPORT int
- dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
- {
-- PrivateRec *rec;
--
- top:
-- rec = *privates;
-- while (rec) {
-- if (rec->key == key) {
-- rec->value = val;
-- return TRUE;
-- }
-- rec = rec->next;
-+ if (privateExists(privates, key)) {
-+ (*privates)[*key].value = val;
-+ return TRUE;
- }
-
- if (!dixAllocatePrivate(privates, key))
-@@ -187,27 +201,23 @@ dixSetPrivate(PrivateRec **privates, con
- _X_EXPORT void
- dixFreePrivates(PrivateRec *privates)
- {
-- PrivateRec *ptr, *next;
-- PrivateDescRec *item;
-+ int i;
- PrivateCallbackRec calldata;
-
-- /* first pass calls the delete callbacks */
-- for (ptr = privates; ptr; ptr = ptr->next) {
-- item = findItem(ptr->key);
-- if (item) {
-- calldata.key = ptr->key;
-- calldata.value = &ptr->value;
-- CallCallbacks(&item->deletefuncs, &calldata);
-- }
-- }
--
-- /* second pass frees the memory */
-- ptr = privates;
-- while (ptr) {
-- next = ptr->next;
-- xfree(ptr);
-- ptr = next;
-- }
-+ if (privates)
-+ for (i = 1; i < privates->state; i++)
-+ if (privates[i].state) {
-+ /* call the delete callbacks */
-+ calldata.key = items[i].key;
-+ calldata.value = &privates[i].value;
-+ CallCallbacks(&items[i].deletefuncs, &calldata);
-+
-+ /* free pre-allocated memory */
-+ if (items[i].size)
-+ xfree(privates[i].value);
-+ }
-+
-+ xfree(privates);
- }
-
- /*
-@@ -218,11 +228,9 @@ dixRegisterPrivateInitFunc(const DevPriv
- CallbackProcPtr callback, pointer data)
- {
- PrivateDescRec *item = findItem(key);
-- if (!item) {
-- if (!dixRequestPrivate(key, 0))
-- return FALSE;
-- item = findItem(key);
-- }
-+ if (!item)
-+ return FALSE;
-+
- return AddCallback(&item->initfuncs, callback, data);
- }
-
-@@ -231,11 +239,9 @@ dixRegisterPrivateDeleteFunc(const DevPr
- CallbackProcPtr callback, pointer data)
- {
- PrivateDescRec *item = findItem(key);
-- if (!item) {
-- if (!dixRequestPrivate(key, 0))
-- return FALSE;
-- item = findItem(key);
-- }
-+ if (!item)
-+ return FALSE;
-+
- return AddCallback(&item->deletefuncs, callback, data);
- }
-
-@@ -292,16 +298,17 @@ dixLookupPrivateOffset(RESTYPE type)
- int
- dixResetPrivates(void)
- {
-- PrivateDescRec *next;
--
-- /* reset internal structures */
-- while (items) {
-- next = items->next;
-- DeleteCallbackList(&items->initfuncs);
-- DeleteCallbackList(&items->deletefuncs);
-- xfree(items);
-- items = next;
-+ int i;
-+
-+ /* reset private descriptors */
-+ for (i = 1; i < nextPriv; i++) {
-+ *items[i].key = 0;
-+ DeleteCallbackList(&items[i].initfuncs);
-+ DeleteCallbackList(&items[i].deletefuncs);
- }
-+ nextPriv = 1;
-+
-+ /* reset offsets */
- if (offsets)
- xfree(offsets);
- offsetsSize = sizeof(offsetDefaults);
-diff --git a/include/privates.h b/include/privates.h
-index 98d893c..e3fa83c 100644
---- a/include/privates.h
-+++ b/include/privates.h
-@@ -19,7 +19,7 @@ #include "resource.h"
- * STUFF FOR PRIVATES
- *****************************************************************/
-
--typedef void *DevPrivateKey;
-+typedef int *DevPrivateKey;
- struct _Private;
- typedef struct _Private PrivateRec;
-
---
-1.4.1
-
--- a/open-src/xserver/xorg/fontmod.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/fontmod.patch Fri May 15 09:36:46 2009 -0700
@@ -30,9 +30,9 @@
"freetype"
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2008-09-24 20:21:42.861097000 -0700
-+++ hw/xfree86/common/xf86Config.c 2008-09-24 20:21:55.754653000 -0700
-@@ -254,7 +254,9 @@
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:44:04.908276000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:44:13.136269000 -0700
+@@ -249,7 +249,9 @@ xf86ModulelistFromConfig(pointer **optli
{
int count = 0, i = 0;
char **modulearray;
--- a/open-src/xserver/xorg/glapi-DEBUG.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-From 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc Mon Sep 17 00:00:00 2001
-From: Paulo Cesar Pereira de Andrade <[email protected]>
-Date: Thu, 5 Jun 2008 09:19:16 +0930
-Subject: [PATCH] gl: include assert.h if we're compiling with DEBUG.
-
-Signed-off-by: Peter Hutterer <[email protected]>
----
- glx/glapi.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/glx/glapi.c b/glx/glapi.c
-index c4d101a..94a8043 100644
---- a/glx/glapi.c
-+++ b/glx/glapi.c
-@@ -63,6 +63,9 @@
-
- #include <stdlib.h>
- #include <string.h>
-+#ifdef DEBUG
-+#include <assert.h>
-+#endif
-
- #include "glapi.h"
- #include "glapioffsets.h"
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/glx-impure.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/glx-impure.patch Fri May 15 09:36:46 2009 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2008-09-24 20:22:24.347811000 -0700
-+++ hw/xfree86/dixmods/Makefile.am 2008-09-24 20:22:41.701679000 -0700
-@@ -79,7 +79,7 @@ libwfb_la_LIBADD = $(top_builddir)/fb/li
+--- hw/xfree86/dixmods/Makefile.am 2009-01-22 20:34:57.149681000 -0800
++++ hw/xfree86/dixmods/Makefile.am 2009-01-22 20:35:04.779066000 -0800
+@@ -44,7 +44,7 @@ libwfb_la_LIBADD = $(top_builddir)/fb/li
libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
--- a/open-src/xserver/xorg/hal-input-fdi.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-
-Update HAL input device configuration for Solaris.
-
-Includes upstream commits:
-
-commit 3575d9584edf35ec1720bc3755b6576a56613685
-Author: Peter Hutterer <[email protected]>
-Date: Fri Jul 25 16:46:44 2008 +0930
-
- config: note that HAL options must be strings.
-
- Only strings are parsed by the server, all others are ignored. Doesn't
- matter, specifying int options as strings works fine anyway.
-
-
-commit d63ea510138c8b6de66184c78cda39ed9981fc1f
-Author: Alan Coopersmith <[email protected]>
-Date: Wed Nov 5 14:52:29 2008 -0800
-
- Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver
-
-
-diff -urp -x '*~' -x '*.orig' config/x11-input.fdi config/x11-input.fdi
---- config/x11-input.fdi 2008-11-05 08:52:17.000000000 -0800
-+++ config/x11-input.fdi 2009-01-14 19:06:14.942629000 -0800
-@@ -26,6 +26,9 @@
- Do not specify "input.x11_options.Device" since "input.device"
- will be used automatically.
-
-+ You MUST specify all options as strings, otherwise the server will
-+ ignore them.
-+
- Legacy Keys
- "input.xkb.rules"
- "input.xkb.model"
-@@ -58,20 +61,34 @@
- string="Linux">
- <merge key="input.x11_driver" type="string">evdev</merge>
- </match>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+ string="SunOS">
-+ <match key="input.device" contains="usb">
-+ <merge key="input.x11_options.StreamsModule" type="string">usbms</merge>
-+ <merge key="input.x11_options.Protocol" type="string">VUID</merge>
-+ </match>
-+ </match>
- </match>
-
- <match key="info.capabilities" contains="input.keys">
- <merge key="input.x11_options.XkbRules" type="string">base</merge>
-
- <!-- If we're using Linux, we use evdev by default (falling back to
-- keyboard otherwise). -->
-- <merge key="input.x11_driver" type="string">keyboard</merge>
-+ kbd otherwise). -->
-+ <merge key="input.x11_driver" type="string">kbd</merge>
- <merge key="input.x11_options.XkbModel" type="string">pc105</merge>
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
- <merge key="input.x11_driver" type="string">evdev</merge>
- <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
- </match>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+ string="SunOS">
-+ <match key="input.device" contains="usb">
-+ <merge key="input.x11_options.StreamsModule" type="string">usbkbm</merge>
-+ <merge key="input.x11_options.Protocol" type="string">VUID</merge>
-+ </match>
-+ </match>
-
- <merge key="input.x11_options.XkbLayout" type="string">us</merge>
-
--- a/open-src/xserver/xorg/hal-verbose-msg.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-From b4ca9dc2393ace2415163094b916f0d17ecba9ee Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 5 Nov 2008 21:58:04 -0800
-Subject: [PATCH] When HAL returns a NULL property, print "(null)" instead of a NULL pointer
-
-They've promised to fix Solaris printf soon to check for NULL pointers
-instead of segfaulting, but that won't help people on existing releases.
----
- config/hal.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config/hal.c b/config/hal.c
-index c29a573..8dfbb07 100644
---- a/config/hal.c
-+++ b/config/hal.c
-@@ -120,7 +120,7 @@ get_prop_string(LibHalContext *hal_ctx,
- char *prop, *ret;
-
- prop = libhal_device_get_property_string(hal_ctx, udi, name, NULL);
-- LogMessageVerb(X_INFO, 10, "config/hal: getting %s on %s returned %s\n", name, udi, prop);
-+ LogMessageVerb(X_INFO, 10, "config/hal: getting %s on %s returned %s\n", name, udi, prop ? prop : "(null)");
- if (prop) {
- ret = xstrdup(prop);
- libhal_free_string(prop);
---
-1.4.1
-
--- a/open-src/xserver/xorg/kdsetmode.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-From f094c8bae6188f8d6ba0913dcf6a657363948813 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 24 Nov 2008 14:58:43 -0800
-Subject: [PATCH] Solaris: Make KDSETMODE failure non fatal, and retry it on interrupts
-
----
- hw/xfree86/os-support/solaris/sun_init.c | 14 ++++++++++----
- 1 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
-index b79814d..795b0c1 100644
---- a/hw/xfree86/os-support/solaris/sun_init.c
-+++ b/hw/xfree86/os-support/solaris/sun_init.c
-@@ -49,8 +49,9 @@ static char fb_dev[PATH_MAX] = "/dev/console";
- void
- xf86OpenConsole(void)
- {
-+ int i;
- #ifdef HAS_USL_VTS
-- int fd, i;
-+ int fd;
- struct vt_mode VT;
- struct vt_stat vtinfo;
- int FreeVTslot;
-@@ -173,9 +174,14 @@ xf86OpenConsole(void)
- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
- FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
- #endif
-+
- #ifdef KDSETMODE
-- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-- FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n");
-+ SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-+ if (i < 0) {
-+ xf86Msg(X_WARNING,
-+ "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
-+ fb_dev, strerror(errno));
-+ }
- #endif
- }
- else /* serverGeneration != 1 */
-@@ -257,7 +263,7 @@ xf86CloseConsole(void)
-
- #ifdef KDSETMODE
- /* Reset the display back to text mode */
-- ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
-+ SYSCALL(ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
- #endif
-
- #ifdef HAS_USL_VTS
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/libmd-sha1.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-From b6a0c6d4864f73a18beb841b16e9be56f2fcd77e Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Tue, 6 May 2008 17:06:34 -0700
-Subject: [PATCH] Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c
-
-Builders can force one or the other by passing SHA1_LIB & SHA1_CFLAGS
-to configure
----
- configure.ac | 22 ++++++++++++++++------
- include/dix-config.h.in | 3 +++
- render/glyph.c | 17 +++++++++++++++--
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b77534..beef3a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1137,15 +1137,25 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUI
-
- # OpenSSL used for SHA1 hashing in render/glyph.c, but we don't need all of
- # the OpenSSL libraries, just libcrypto
--PKG_CHECK_EXISTS([openssl],
-- [PKG_CHECK_MODULES([OPENSSL], [openssl],
-+# Some systems have matching functionality in the smaller/simpler libmd
-+# Builders who want to force a choice can set SHA1_LIB and SHA1_CFLAGS
-+if test "x$SHA1_LIB" = "x" ; then
-+ AC_CHECK_LIB([md], [SHA1Init], [SHA1_LIB="-lmd"
-+ AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],
-+ [Define to use libmd SHA1 functions instead of OpenSSL libcrypto])])
-+fi
-+if test "x$SHA1_LIB" = "x" ; then
-+ PKG_CHECK_EXISTS([openssl],
-+ [PKG_CHECK_MODULES([OPENSSL], [openssl],
- [OPENSSL_LIB_FLAGS=`$PKG_CONFIG --libs-only-L --libs-only-other openssl`])])
--LIBCRYPTO="$OPENSSL_LIB_FLAGS -lcrypto"
-+ SHA1_LIB="$OPENSSL_LIB_FLAGS -lcrypto"
-+ SHA1_CFLAGS="$OPENSSL_CFLAGS"
-+fi
-
- # Autotools has some unfortunate issues with library handling. In order to
- # get a server to rebuild when a dependency in the tree is changed, it must
- # be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be
--# listed there, or some versions of autotols will break (especially if a -L
-+# listed there, or some versions of autotools will break (especially if a -L
- # is required to find the library). So, we keep two sets of libraries
- # detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which
- # will go into the _DEPENDENCIES and _LDADD of the server, and
-@@ -1157,9 +1167,9 @@ # XSERVER_LIBS is the set of in-tree lib
- # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
- # require.
- #
--XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${OPENSSL_CFLAGS}"
-+XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
- XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
--XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${LIBCRYPTO}"
-+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
- AC_SUBST([XSERVER_LIBS])
- AC_SUBST([XSERVER_SYS_LIBS])
-
-diff --git a/include/dix-config.h.in b/include/dix-config.h.in
-index fc1caa3..387f65a 100644
---- a/include/dix-config.h.in
-+++ b/include/dix-config.h.in
-@@ -193,6 +193,9 @@ #undef HAVE_NDIR_H
- /* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
- #undef HAVE_RPCSVC_DBM_H
-
-+/* Define to use libmd SHA1 functions instead of OpenSSL libcrypto */
-+#undef HAVE_SHA1_IN_LIBMD
-+
- /* Define to 1 if you have the `shmctl64' function. */
- #undef HAVE_SHMCTL64
-
-diff --git a/render/glyph.c b/render/glyph.c
-index 286e39d..de01970 100644
---- a/render/glyph.c
-+++ b/render/glyph.c
-@@ -26,8 +26,12 @@ #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
- #endif
-
--#include <stddef.h> /* buggy openssl/sha.h wants size_t */
--#include <openssl/sha.h>
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+# include <sha1.h>
-+#else /* Use OpenSSL's libcrypto */
-+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
-+# include <openssl/sha.h>
-+#endif
-
- #include "misc.h"
- #include "scrnintstr.h"
-@@ -202,6 +206,14 @@ HashGlyph (xGlyphInfo *gi,
- unsigned long size,
- unsigned char sha1[20])
- {
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+ SHA1_CTX ctx;
-+
-+ SHA1Init (&ctx);
-+ SHA1Update (&ctx, gi, sizeof (xGlyphInfo));
-+ SHA1Update (&ctx, bits, size);
-+ SHA1Final (sha1, &ctx);
-+#else /* Use OpenSSL's libcrypto */
- SHA_CTX ctx;
- int success;
-
-@@ -220,6 +232,7 @@ HashGlyph (xGlyphInfo *gi,
- success = SHA1_Final (sha1, &ctx);
- if (! success)
- return BadAlloc;
-+#endif
-
- return Success;
- }
---
-1.4.1
-
--- a/open-src/xserver/xorg/make_xkm_output_dir.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/make_xkm_output_dir.patch Fri May 15 09:36:46 2009 -0700
@@ -9,8 +9,8 @@
[Xorg has since dropped upstream, but we still use.]
diff -urp -x '*~' -x '*.orig' xkb/Makefile.am xkb/Makefile.am
---- xkb/Makefile.am 2008-03-07 05:31:29.000000000 -0800
-+++ xkb/Makefile.am 2008-09-22 21:39:13.086729000 -0700
+--- xkb/Makefile.am 2008-11-14 13:27:05.000000000 -0800
++++ xkb/Makefile.am 2009-01-22 20:33:49.220235000 -0800
@@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
@@ -20,8 +20,8 @@
DDX_SRCS = \
diff -urp -x '*~' -x '*.orig' xkb/ddxLoad.c xkb/ddxLoad.c
---- xkb/ddxLoad.c 2008-09-03 10:03:39.000000000 -0700
-+++ xkb/ddxLoad.c 2008-09-22 21:39:13.086234000 -0700
+--- xkb/ddxLoad.c 2009-01-09 09:47:04.000000000 -0800
++++ xkb/ddxLoad.c 2009-01-22 20:33:49.230965000 -0800
@@ -153,13 +153,29 @@ Win32System(const char *cmdline)
#define System(x) Win32System(x)
#endif
--- a/open-src/xserver/xorg/nvidia-autoconfig.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/nvidia-autoconfig.patch Fri May 15 09:36:46 2009 -0700
@@ -27,9 +27,9 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2008-09-24 20:22:56.371591000 -0700
-+++ hw/xfree86/common/xf86Config.c 2008-09-24 20:23:15.204372000 -0700
-@@ -563,11 +563,30 @@ fixup_video_driver_list(char **drivers)
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:44:39.416143000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:44:47.430402000 -0700
+@@ -532,11 +532,30 @@ fixup_video_driver_list(char **drivers)
if (!strcmp(*drv, "ati")) {
ati = drv;
x = *ati; *ati = *atimisc; *atimisc = x;
--- a/open-src/xserver/xorg/patch-list Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/patch-list Fri May 15 09:36:46 2009 -0700
@@ -1,69 +1,40 @@
-libmd-sha1.patch,-p1
-glapi-DEBUG.patch,-p1
-x86-64-ifdef.patch,-p1
-x86emu-fix-build.patch,-p1
-driver-autoconfig.patch,-p1
-remove-ppcPci.patch,-p1
-remove-sparcPci.patch,-p1
-sys-kd.h.patch,-p1
-pre-faster-devPrivates.patch,-p1
-solaris-mapping.patch,-p1
-popen-signal.patch,-p1
-hal-verbose-msg.patch,-p1
-pci-stubs.patch,-p1
-xephyr-man.patch,-p1
-kdsetmode.patch,-p1
-6685465.patch,-p1
-XkbSetRulesDflts.patch,-p1
+upstream-1.6.2.patch,-p1
xkb-defaults.patch,-p1
-xkb-ddx-defaults.patch,-p1
xkb-defaults-compat.patch
constify-atom-strings.patch,-p1
resource-names.patch,-p1
-rgbpath.patch,-p1
-xsync-idletime-counter.patch,-p1
-upstream-man-in-1.6.patch,-p1
-upstream-man-post-1.6.patch,-p1
-rrselectinput-access.patch,-p1
+apm-handlers.patch,-p1
+agpgart.patch,-p1
+6801386.patch,-p1
restore-kbd-mouse.patch,-p1
-6835232.patch
-hal-input-fdi.patch
+aei-default.false.patch
+restore-zap.patch,-p1
+solaris-asm.patch,-p1
sun-paths.patch
sun-extramodes.patch
sun-manpage.patch
-config-man-eofnotes.patch
cli-nolock.patch
cli-nobanner.patch
catch-dlerrors.patch
+sigio.patch,-p1
make_xkm_output_dir.patch
dtlogin-userinfo.patch
IA.patch
xtsol.patch
sun-loginfo.patch
-xorgconfig.patch
-xorgcfg.patch
amd64-loader-path.patch
Xorg-mapfile.patch
fontmod.patch
-xevie.patch
sparc-probe.patch
sparc-nopciprobe.patch
glx-impure.patch
-dri.patch
nvidia-autoconfig.patch
autoconfig.patch
autoconfig2.patch
6406044.patch
6535006.patch
signal-handler.patch
-KB_EncodingAtXCrash.patch
-6618220.patch
-6668806.patch
6721634.patch
-6801386.patch
xpstubs.patch
dixmods-deps.patch
-xprint.patch
-xprint01.patch
-xprint02.patch
--- a/open-src/xserver/xorg/pci-stubs.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-From 570835b9a89187a36e08defbccc56051bb349b52 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 19 Nov 2008 10:19:20 -0800
-Subject: [PATCH] Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
-
-Depends on commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 to get
-definition of xf86InitVidMem on Solaris.
----
- configure.ac | 5 ++++-
- hw/xfree86/os-support/bus/Pci.h | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bea8ac..048416f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1278,6 +1278,9 @@ if test "x$XORG" = xyes; then
- solaris*)
- XORG_OS="solaris"
- XORG_OS_SUBDIR="solaris"
-+ # Use the same stubs as BSD for old functions, since we now
-+ # use libpciaccess for PCI
-+ xorg_bus_bsdpci="yes"
- AC_CHECK_HEADERS([sys/kd.h])
- # This really should be tests for specific features, but the #ifdef's
- # were done as a simple version check in XFree86 4.x and haven't been
-@@ -1346,7 +1349,7 @@ if test "x$XORG" = xyes; then
- ;;
- i*86|x86_64*|amd64*)
- case $host_os in
-- *bsd*|linux*)
-+ *bsd*|linux*|solaris*)
- ;;
- *)
- xorg_bus_ix86pci="yes"
-diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
-index 31a7fbf..2eb1745 100644
---- a/hw/xfree86/os-support/bus/Pci.h
-+++ b/hw/xfree86/os-support/bus/Pci.h
-@@ -179,7 +179,7 @@
- #define PCI_CFGMECH1_MAXDEV 32
-
- #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-- defined(__DragonFly__)
-+ defined(__DragonFly__) || defined(__sun)
- #define ARCH_PCI_INIT bsdPciInit
- #endif
-
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/popen-signal.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-From c9051b684b524549eab6d5b88ee3e195a6f6fbe8 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 5 Nov 2008 18:25:57 -0800
-Subject: [PATCH] Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
----
- os/utils.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/os/utils.c b/os/utils.c
-index f0bb717..b100949 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -1393,7 +1393,7 @@ static struct pid {
- int pid;
- } *pidlist;
-
--void (*old_alarm)(int) = NULL; /* XXX horrible awful hack */
-+OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
-
- pointer
- Popen(char *command, char *type)
-@@ -1417,7 +1417,7 @@ Popen(char *command, char *type)
- }
-
- /* Ignore the smart scheduler while this is going on */
-- old_alarm = signal(SIGALRM, SIG_IGN);
-+ old_alarm = OsSignal(SIGALRM, SIG_IGN);
- if (old_alarm == SIG_ERR) {
- perror("signal");
- return NULL;
-@@ -1428,7 +1428,7 @@ Popen(char *command, char *type)
- close(pdes[0]);
- close(pdes[1]);
- xfree(cur);
-- if (signal(SIGALRM, old_alarm) == SIG_ERR)
-+ if (OsSignal(SIGALRM, old_alarm) == SIG_ERR)
- perror("signal");
- return NULL;
- case 0: /* child */
-@@ -1605,7 +1605,7 @@ #endif
- /* allow EINTR again */
- OsReleaseSignals ();
-
-- if (old_alarm && signal(SIGALRM, old_alarm) == SIG_ERR) {
-+ if (old_alarm && OsSignal(SIGALRM, old_alarm) == SIG_ERR) {
- perror("signal");
- return -1;
- }
---
-1.4.1
-
--- a/open-src/xserver/xorg/pre-faster-devPrivates.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1498 +0,0 @@
-[Adjusted to apply to xserver-1.5.2]
-
-From ebea78cdba0ff14a397239ee1936bd254c181e1b Mon Sep 17 00:00:00 2001
-From: Tomas Carnecky <[email protected]>
-Date: Thu, 28 Aug 2008 18:05:40 -0400
-Subject: [PATCH] Prepare for array-index based devPrivates.
-
-TODO: static indices can be made just an int; some indices
-can be combined.
----
- Xext/geext.c | 3 ++-
- Xext/mbuf.c | 6 ++++--
- Xext/panoramiX.c | 6 ++++--
- Xext/saver.c | 3 ++-
- Xext/security.c | 3 ++-
- Xext/shm.c | 3 ++-
- Xext/xevie.c | 4 +++-
- Xext/xselinux.c | 9 ++++++---
- Xext/xvmain.c | 3 ++-
- Xext/xvmc.c | 5 +++--
- Xi/extinit.c | 3 ++-
- composite/compext.c | 3 ++-
- composite/compinit.c | 9 ++++++---
- damageext/damageext.c | 4 +++-
- dbe/dbe.c | 6 ++++--
- dbe/midbe.c | 9 ++++++---
- dix/devices.c | 6 ++++--
- dix/events.c | 3 ++-
- dix/window.c | 3 ++-
- exa/exa.c | 6 ++++--
- fb/fballpriv.c | 11 ++++++++---
- fb/fboverlay.c | 3 ++-
- glx/glxext.c | 3 ++-
- glx/glxscreens.c | 3 ++-
- hw/dmx/dmxscrinit.c | 19 +++++++++++++------
- hw/kdrive/ephyr/ephyrdriext.c | 6 ++++--
- hw/kdrive/src/kdrive.c | 3 ++-
- hw/kdrive/src/kxv.c | 7 ++++---
- hw/xfree86/common/xf86DGA.c | 5 +++--
- hw/xfree86/common/xf86DPMS.c | 5 +++--
- hw/xfree86/common/xf86Globals.c | 9 ++++++---
- hw/xfree86/common/xf86RAC.c | 6 ++++--
- hw/xfree86/common/xf86RandR.c | 5 +++--
- hw/xfree86/common/xf86VidMode.c | 5 +++--
- hw/xfree86/common/xf86cmap.c | 8 +++++---
- hw/xfree86/common/xf86fbman.c | 8 +++++---
- hw/xfree86/common/xf86sbusBus.c | 3 ++-
- hw/xfree86/common/xf86xv.c | 6 ++++--
- hw/xfree86/common/xf86xvmc.c | 3 ++-
- hw/xfree86/dixmods/extmod/xf86dga2.c | 3 ++-
- hw/xfree86/dixmods/extmod/xf86vmode.c | 8 +++++---
- hw/xfree86/dri/dri.c | 7 ++++---
- hw/xfree86/dri2/dri2.c | 9 ++++++---
- hw/xfree86/exa/examodule.c | 3 ++-
- hw/xfree86/modes/xf86RandR12.c | 3 ++-
- hw/xfree86/ramdac/xf86Cursor.c | 3 ++-
- hw/xfree86/shadowfb/shadow.c | 6 ++++--
- hw/xfree86/xaa/xaaInit.c | 9 ++++++---
- hw/xfree86/xaa/xaaOverlayDF.c | 3 ++-
- hw/xfree86/xaa/xaaStateChange.c | 3 ++-
- hw/xfree86/xaa/xaaWrapper.c | 6 ++++--
- hw/xnest/GC.c | 3 ++-
- hw/xnest/Pixmap.c | 3 ++-
- hw/xnest/Screen.c | 3 ++-
- hw/xnest/Window.c | 3 ++-
- hw/xquartz/darwin.c | 3 ++-
- hw/xquartz/quartz.c | 3 ++-
- hw/xquartz/xpr/dri.c | 9 ++++++---
- hw/xquartz/xpr/xprCursor.c | 3 ++-
- hw/xwin/winglobals.c | 15 ++++++++++-----
- mi/mibank.c | 7 +++++--
- mi/midispcur.c | 7 ++++---
- mi/mioverlay.c | 6 ++++--
- mi/mipointer.c | 6 ++++--
- mi/miscrinit.c | 6 ++++--
- mi/misprite.c | 6 ++++--
- miext/cw/cw.c | 12 ++++++++----
- miext/damage/damage.c | 12 ++++++++----
- miext/rootless/rootlessScreen.c | 12 ++++++++----
- miext/shadow/shadow.c | 3 ++-
- randr/randr.c | 6 ++++--
- record/record.c | 3 ++-
- render/animcur.c | 4 +++-
- render/picture.c | 6 ++++--
- render/render.c | 3 ++-
- xfixes/cursor.c | 4 +++-
- xfixes/xfixes.c | 4 +++-
- xkb/xkbActions.c | 3 ++-
- 78 files changed, 287 insertions(+), 146 deletions(-)
-
-#diff --git a/Xext/geext.c b/Xext/geext.c
-#index 171fda1..8de4e7c 100644
-#--- a/Xext/geext.c
-#+++ b/Xext/geext.c
-#@@ -40,7 +40,8 @@ #define rClient(obj) (clients[CLIENT_ID(
-#
-# int GEEventBase;
-# int GEErrorBase;
-#-DevPrivateKey GEClientPrivateKey = &GEClientPrivateKey;
-#+static int GEClientPrivateKeyIndex;
-#+DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
-# int GEEventType; /* The opcode for all GenericEvents will have. */
-#
-# int RT_GECLIENT = 0;
-diff --git a/Xext/mbuf.c b/Xext/mbuf.c
-index 08b9334..a23a4fa 100644
---- a/Xext/mbuf.c
-+++ b/Xext/mbuf.c
-@@ -61,8 +61,10 @@ #define ValidEventMasks (ExposureMask|Mu
-
- static int MultibufferEventBase;
- static int MultibufferErrorBase;
--static DevPrivateKey MultibufferScreenPrivKey = &MultibufferScreenPrivKey;
--static DevPrivateKey MultibufferWindowPrivKey = &MultibufferWindowPrivKey;
-+static int MultibufferScreenPrivKeyIndex;
-+static DevPrivateKey MultibufferScreenPrivKey = &MultibufferScreenPrivKeyIndex;
-+static int MultibufferWindowPrivKeyIndex;
-+static DevPrivateKey MultibufferWindowPrivKey = &MultibufferWindowPrivKeyIndex;
-
- static void PerformDisplayRequest (
- MultibuffersPtr * /* ppMultibuffers */,
-diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
-index 17f587b..22b51aa 100644
---- a/Xext/panoramiX.c
-+++ b/Xext/panoramiX.c
-@@ -107,8 +107,10 @@ #include "panoramiXh.h"
-
- int (* SavedProcVector[256]) (ClientPtr client) = { NULL, };
-
--static DevPrivateKey PanoramiXGCKey = &PanoramiXGCKey;
--static DevPrivateKey PanoramiXScreenKey = &PanoramiXScreenKey;
-+static int PanoramiXGCKeyIndex;
-+static DevPrivateKey PanoramiXGCKey = &PanoramiXGCKeyIndex;
-+static int PanoramiXScreenKeyIndex;
-+static DevPrivateKey PanoramiXScreenKey = &PanoramiXScreenKeyIndex;
-
- typedef struct {
- DDXPointRec clipOrg;
-diff --git a/Xext/saver.c b/Xext/saver.c
-index d74495b..0bdcb8b 100644
---- a/Xext/saver.c
-+++ b/Xext/saver.c
-@@ -228,7 +228,8 @@ MakeScreenPrivate (
- ScreenPtr /* pScreen */
- );
-
--static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKey;
-+static int ScreenPrivateKeyIndex;
-+static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKeyIndex;
-
- #define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
- dixLookupPrivate(&(s)->devPrivates, ScreenPrivateKey))
-diff --git a/Xext/security.c b/Xext/security.c
-index bd92600..e379063 100644
---- a/Xext/security.c
-+++ b/Xext/security.c
-@@ -50,7 +50,8 @@ static RESTYPE RTEventClient;
- static CallbackListPtr SecurityValidateGroupCallback = NULL;
-
- /* Private state record */
--static DevPrivateKey stateKey = &stateKey;
-+static int stateKeyIndex;
-+static DevPrivateKey stateKey = &stateKeyIndex;
-
- /* This is what we store as client security state */
- typedef struct {
-diff --git a/Xext/shm.c b/Xext/shm.c
-index 312b9d1..a48d2bd 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -139,7 +139,8 @@ static ShmDescPtr Shmsegs;
- static Bool sharedPixmaps;
- static ShmFuncsPtr shmFuncs[MAXSCREENS];
- static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
--static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivate;
-+static int shmPixmapPrivateIndex;
-+static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivateIndex;
- static ShmFuncs miFuncs = {NULL, NULL};
- static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};
-
-diff --git a/Xext/xevie.c b/Xext/xevie.c
-index bbbf045..292f207 100644
---- a/Xext/xevie.c
-+++ b/Xext/xevie.c
-@@ -77,9 +77,11 @@ DeviceIntPtr xeviemouse = NULL;
- Mask xevieMask = 0;
- int xevieEventSent = 0;
- int xevieKBEventSent = 0;
--static DevPrivateKey xevieDevicePrivateKey = &xevieDevicePrivateKey;
- static Bool xevieModifiersOn = FALSE;
-
-+static int xevieDevicePrivateKeyIndex;
-+static DevPrivateKey xevieDevicePrivateKey = &xevieDevicePrivateKeyIndex;
-+
- #define XEVIEINFO(dev) ((xevieDeviceInfoPtr) \
- dixLookupPrivate(&(dev)->devPrivates, xevieDevicePrivateKey))
-
-diff --git a/Xext/xselinux.c b/Xext/xselinux.c
-index a47df03..2a8be0b 100644
---- a/Xext/xselinux.c
-+++ b/Xext/xselinux.c
-@@ -62,9 +62,12 @@ #include "modinit.h"
- */
-
- /* private state keys */
--static DevPrivateKey subjectKey = &subjectKey;
--static DevPrivateKey objectKey = &objectKey;
--static DevPrivateKey dataKey = &dataKey;
-+static int subjectKeyIndex;
-+static DevPrivateKey subjectKey = &subjectKeyIndex;
-+static int objectKeyIndex;
-+static DevPrivateKey objectKey = &objectKeyIndex;
-+static int dataKeyIndex;
-+static DevPrivateKey dataKey = &dataKeyIndex;
-
- /* subject state (clients and devices only) */
- typedef struct {
-diff --git a/Xext/xvmain.c b/Xext/xvmain.c
-index e92a248..fcca724 100644
---- a/Xext/xvmain.c
-+++ b/Xext/xvmain.c
-@@ -105,7 +105,8 @@ #include "panoramiXsrv.h"
- #endif
- #include "xvdisp.h"
-
--static DevPrivateKey XvScreenKey = &XvScreenKey;
-+static int XvScreenKeyIndex;
-+static DevPrivateKey XvScreenKey = &XvScreenKeyIndex;
- unsigned long XvExtensionGeneration = 0;
- unsigned long XvScreenGeneration = 0;
- unsigned long XvResourceGeneration = 0;
-diff --git a/Xext/xvmc.c b/Xext/xvmc.c
-index dc1e7dd..ad1b8ab 100644
---- a/Xext/xvmc.c
-+++ b/Xext/xvmc.c
-@@ -34,7 +34,8 @@ #endif /* HAS_XVMCSHM */
- #define DR_CLIENT_DRIVER_NAME_SIZE 48
- #define DR_BUSID_SIZE 48
-
--static DevPrivateKey XvMCScreenKey = NULL;
-+static int XvMCScreenKeyIndex;
-+static DevPrivateKey XvMCScreenKey;
-
- unsigned long XvMCGeneration = 0;
-
-@@ -709,7 +710,7 @@ XvMCScreenInit(ScreenPtr pScreen, int nu
- {
- XvMCScreenPtr pScreenPriv;
-
-- XvMCScreenKey = &XvMCScreenKey;
-+ XvMCScreenKey = &XvMCScreenKeyIndex;
-
- if(!(pScreenPriv = (XvMCScreenPtr)xalloc(sizeof(XvMCScreenRec))))
- return BadAlloc;
-#diff --git a/Xi/extinit.c b/Xi/extinit.c
-#index cb1f3a4..d8714ba 100644
-#--- a/Xi/extinit.c
-#+++ b/Xi/extinit.c
-#@@ -352,7 +352,8 @@ Mask PropagateMask[MAX_DEVICES];
-# *
-# */
-#
-#-DevPrivateKey XIClientPrivateKey = &XIClientPrivateKey;
-#+static int XIClientPrivateKeyIndex;
-#+DevPrivateKey XIClientPrivateKey = &XIClientPrivateKeyIndex;
-#
-# static XExtensionVersion thisversion = { XI_Present,
-# XI_2_Major,
-diff --git a/composite/compext.c b/composite/compext.c
-index 154f719..c154402 100644
---- a/composite/compext.c
-+++ b/composite/compext.c
-@@ -51,7 +51,8 @@ #define SERVER_COMPOSITE_MAJOR 0
- #define SERVER_COMPOSITE_MINOR 4
-
- static CARD8 CompositeReqCode;
--static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKey;
-+static int CompositeClientPrivateKeyIndex;
-+static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKeyIndex;
- RESTYPE CompositeClientWindowType;
- RESTYPE CompositeClientSubwindowsType;
- RESTYPE CompositeClientOverlayType;
-diff --git a/composite/compinit.c b/composite/compinit.c
-index 7914a8d..495188e 100644
---- a/composite/compinit.c
-+++ b/composite/compinit.c
-@@ -46,9 +46,12 @@ #endif
-
- #include "compint.h"
-
--DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKey;
--DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKey;
--DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKey;
-+static int CompScreenPrivateKeyIndex;
-+DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKeyIndex;
-+static int CompWindowPrivateKeyIndex;
-+DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKeyIndex;
-+static int CompSubwindowsPrivateKeyIndex;
-+DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKeyIndex;
-
-
- static Bool
-diff --git a/damageext/damageext.c b/damageext/damageext.c
-index 7dd328a..4d91580 100755
---- a/damageext/damageext.c
-+++ b/damageext/damageext.c
-@@ -29,10 +29,12 @@ #include "damageextint.h"
- static unsigned char DamageReqCode;
- static int DamageEventBase;
- static int DamageErrorBase;
--static DevPrivateKey DamageClientPrivateKey = &DamageClientPrivateKey;
- static RESTYPE DamageExtType;
- static RESTYPE DamageExtWinType;
-
-+static int DamageClientPrivateKeyIndex;
-+static DevPrivateKey DamageClientPrivateKey = &DamageClientPrivateKeyIndex;
-+
- /* Version of the damage extension supported by the server, as opposed to the
- * DAMAGE_* defines from damageproto for what version the proto header
- * supports.
-diff --git a/dbe/dbe.c b/dbe/dbe.c
-index d34708d..1a08bda 100644
---- a/dbe/dbe.c
-+++ b/dbe/dbe.c
-@@ -62,8 +62,10 @@ #include "xace.h"
- static Bool (* DbeInitFunct[MAXSCREENS])(); /* pScreen, pDbeScreenPriv */
-
- /* These are static globals copied to DBE's screen private for use by DDX */
--static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey;
--static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey;
-+static int dbeScreenPrivKeyIndex;
-+static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKeyIndex;
-+static int dbeWindowPrivKeyIndex;
-+static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKeyIndex;
-
- /* These are static globals copied to DBE's screen private for use by DDX */
- static RESTYPE dbeDrawableResType;
-diff --git a/dbe/midbe.c b/dbe/midbe.c
-index c02e591..f8a3acc 100644
---- a/dbe/midbe.c
-+++ b/dbe/midbe.c
-@@ -60,11 +60,14 @@ #include "xace.h"
-
- #include <stdio.h>
-
--static DevPrivateKey miDbeWindowPrivPrivKey = &miDbeWindowPrivPrivKey;
-+static int miDbeWindowPrivPrivKeyIndex;
-+static DevPrivateKey miDbeWindowPrivPrivKey = &miDbeWindowPrivPrivKeyIndex;
- static RESTYPE dbeDrawableResType;
- static RESTYPE dbeWindowPrivResType;
--static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey;
--static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey;
-+static int dbeScreenPrivKeyIndex;
-+static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKeyIndex;
-+static int dbeWindowPrivKeyIndex;
-+static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKeyIndex;
-
-
- /******************************************************************************
-diff --git a/dix/devices.c b/dix/devices.c
-index 2225e08..7e1ce35 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -91,7 +91,8 @@ #include "xiproperty.h"
- * This file handles input device-related stuff.
- */
-
--DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKey;
-+static int CoreDevicePrivateKeyIndex;
-+DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKeyIndex;
-
- /**
- * Create a new input device and init it to sane values. The device is added
-diff --git a/dix/events.c b/dix/events.c
-index 7a79d29..2947ff1 100644
-#--- a/dix/events.c
-#+++ b/dix/events.c
-#@@ -1504,7 +1504,8 @@ CheckGrabForSyncs(DeviceIntPtr thisDev,
-# }
-#
-# /* Only ever used if a grab is called on an attached slave device. */
-#-static DevPrivateKey GrabPrivateKey = &GrabPrivateKey;
-#+static int GrabPrivateKeyIndex;
-#+static DevPrivateKey GrabPrivateKey = &GrabPrivateKeyIndex;
-# typedef struct _GrabMemoryRec {
-# DeviceIntPtr oldmaster;
-# } GrabMemoryRec, *GrabMemoryPtr;
-#diff --git a/dix/window.c b/dix/window.c
-#index 9bcf546..b588f44 100644
-#--- a/dix/window.c
-#+++ b/dix/window.c
-#@@ -154,7 +154,8 @@ _X_EXPORT int screenIsSaved = SCREEN_SAV
-#
-# _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
-#
-#-_X_EXPORT DevPrivateKey FocusPrivatesKey = &FocusPrivatesKey;
-#+static int FocusPrivatesKeyIndex;
-#+_X_EXPORT DevPrivateKey FocusPrivatesKey = &FocusPrivatesKeyIndex;
-#
-# static Bool TileScreenSaver(int i, int kind);
-
-diff --git a/exa/exa.c b/exa/exa.c
-index 12c1549..677e2d5 100644
---- a/exa/exa.c
-+++ b/exa/exa.c
-@@ -38,8 +38,10 @@ #include "exa_priv.h"
- #include "exa.h"
- #include "cw.h"
-
--DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKey;
--DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKey;
-+static int exaScreenPrivateKeyIndex;
-+DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKeyIndex;
-+static int exaPixmapPrivateKeyIndex;
-+DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKeyIndex;
-
- static _X_INLINE void*
- ExaGetPixmapAddress(PixmapPtr p)
-diff --git a/fb/fballpriv.c b/fb/fballpriv.c
-index 2e77289..c40796c 100644
---- a/fb/fballpriv.c
-+++ b/fb/fballpriv.c
-@@ -27,19 +27,24 @@ #endif
- #include "fb.h"
-
- #ifdef FB_SCREEN_PRIVATE
--static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKey;
-+static int fbScreenPrivateKeyIndex;
-+static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex;
- DevPrivateKey fbGetScreenPrivateKey(void)
- {
- return fbScreenPrivateKey;
- }
- #endif
--static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKey;
-+
-+static int fbGCPrivateKeyIndex;
-+static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;
- DevPrivateKey fbGetGCPrivateKey(void)
- {
- return fbGCPrivateKey;
- }
-+
- #ifndef FB_NO_WINDOW_PIXMAPS
--static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey;
-+static int fbWinPrivateKeyIndex;
-+static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;
- DevPrivateKey fbGetWinPrivateKey(void)
- {
- return fbWinPrivateKey;
-diff --git a/fb/fboverlay.c b/fb/fboverlay.c
-index f9f7c52..1432cb6 100644
---- a/fb/fboverlay.c
-+++ b/fb/fboverlay.c
-@@ -33,7 +33,8 @@ #include "fb.h"
- #include "fboverlay.h"
- #include "shmint.h"
-
--static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKey;
-+static int fbOverlayScreenPrivateKeyIndex;
-+static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;
-
- DevPrivateKey fbOverlayGetScreenPrivateKey(void)
- {
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 6ba404f..c2171a8 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -54,7 +54,8 @@ RESTYPE __glXSwapBarrierRes;
- */
- xGLXSingleReply __glXReply;
-
--static DevPrivateKey glxClientPrivateKey = &glxClientPrivateKey;
-+static int glxClientPrivateKeyIndex;
-+static DevPrivateKey glxClientPrivateKey = &glxClientPrivateKeyIndex;
-
- /*
- ** Client that called into GLX dispatch.
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c
-index 505f797..d928bdf 100644
---- a/glx/glxscreens.c
-+++ b/glx/glxscreens.c
-@@ -48,7 +48,8 @@ #include "glxserver.h"
- #include "glxutil.h"
- #include "glxext.h"
-
--static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKey;
-+static int glxScreenPrivateKeyIndex;
-+static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex;
-
- const char GLServerVersion[] = "1.4";
- static const char GLServerExtensions[] =
-diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
-index 0e49e96..7360750 100644
---- a/hw/dmx/dmxscrinit.c
-+++ b/hw/dmx/dmxscrinit.c
-@@ -67,15 +67,22 @@ static Bool dmxSaveScreen(ScreenPtr pScr
- static unsigned long dmxGeneration;
- static unsigned long *dmxCursorGeneration;
-
-+static int dmxGCPrivateKeyIndex;
- DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKey; /**< Private index for GCs */
--DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKey; /**< Private index for Windows */
--DevPrivateKey dmxPixPrivateKey = &dmxPixPrivateKey; /**< Private index for Pixmaps */
-+static int dmxWinPrivateKeyIndex;
-+DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKeyIndex; /**< Private index for Windows */
-+static int dmxPixPrivateKeyIndex;
-+DevPrivateKey dmxPixPrivateKey = &dmxPixPrivateKeyIndex; /**< Private index for Pixmaps */
- int dmxFontPrivateIndex; /**< Private index for Fonts */
--DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKey; /**< Private index for Screens */
--DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKey; /**< Private index for Colormaps */
-+static int dmxScreenPrivateKeyIndex;
-+DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex; /**< Private index for Screens */
-+static int dmxColormapPrivateKeyIndex;
-+DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex; /**< Private index for Colormaps */
- #ifdef RENDER
--DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKey; /**< Private index for Picts */
--DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKey; /**< Private index for GlyphSets */
-+static int dmxPictPrivateKeyIndex;
-+DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex; /**< Private index for Picts */
-+static int dmxGlyphSetPrivateKeyIndex;
-+DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex; /**< Private index for GlyphSets */
- #endif
-
- /** Initialize the parts of screen \a idx that require access to the
-diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
-index 05cecf4..a906ad1 100644
---- a/hw/kdrive/ephyr/ephyrdriext.c
-+++ b/hw/kdrive/ephyr/ephyrdriext.c
-@@ -111,8 +111,10 @@ static Bool findWindowPairFromLocal (Win
-
- static unsigned char DRIReqCode = 0;
-
--static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKey;
--static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKey;
-+static int ephyrDRIWindowKeyIndex;
-+static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKeyIndex;
-+static int ephyrDRIScreenKeyIndex;
-+static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKeyIndex;
-
- #define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \
- dixLookupPrivate(&(win)->devPrivates, ephyrDRIWindowKey))
-diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
-index 9e27840..1478a94 100644
---- a/hw/kdrive/src/kdrive.c
-+++ b/hw/kdrive/src/kdrive.c
-@@ -67,7 +67,8 @@ #define NUM_KD_DEPTHS (sizeof (kdDepths)
-
- #define KD_DEFAULT_BUTTONS 5
-
--DevPrivateKey kdScreenPrivateKey = &kdScreenPrivateKey;
-+static int kdScreenPrivateKeyIndex;
-+DevPrivateKey kdScreenPrivateKey = &kdScreenPrivateKeyIndex;
- unsigned long kdGeneration;
-
- Bool kdVideoTest;
-diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
-index 83ca393..9a74654 100644
---- a/hw/kdrive/src/kxv.c
-+++ b/hw/kdrive/src/kxv.c
-@@ -103,9 +103,10 @@ static void KdXVClipNotify(WindowPtr pWi
- /* misc */
- static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);
-
--
--DevPrivateKey KdXVWindowKey = &KdXVWindowKey;
--DevPrivateKey KdXvScreenKey = &KdXvScreenKey;
-+static int KdXVWindowKeyIndex;
-+DevPrivateKey KdXVWindowKey = &KdXVWindowKeyIndex;
-+static int KdXvScreenKeyIndex;
-+DevPrivateKey KdXvScreenKey = &KdXvScreenKeyIndex;
- static unsigned long KdXVGeneration = 0;
- static unsigned long PortResource = 0;
-
-diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
-index a7e24a6..4dd31d8 100644
---- a/hw/xfree86/common/xf86DGA.c
-+++ b/hw/xfree86/common/xf86DGA.c
-@@ -50,7 +50,8 @@ #include "exglobals.h"
-
- #include "mi.h"
-
--static DevPrivateKey DGAScreenKey = NULL;
-+static int DGAScreenKeyIndex;
-+static DevPrivateKey DGAScreenKey;
- static int mieq_installed = 0;
-
- static Bool DGACloseScreen(int i, ScreenPtr pScreen);
-@@ -116,7 +117,7 @@ DGAInit(
- if(!modes || num <= 0)
- return FALSE;
-
-- DGAScreenKey = &DGAScreenKey;
-+ DGAScreenKey = &DGAScreenKeyIndex;
-
- if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
- return FALSE;
-diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
-index 4fb901a..5ee5e24 100644
---- a/hw/xfree86/common/xf86DPMS.c
-+++ b/hw/xfree86/common/xf86DPMS.c
-@@ -47,7 +47,8 @@ #endif
-
-
- #ifdef DPMSExtension
--static DevPrivateKey DPMSKey = NULL;
-+static int DPMSKeyIndex;
-+static DevPrivateKey DPMSKey;
- static Bool DPMSClose(int i, ScreenPtr pScreen);
- static int DPMSCount = 0;
- #endif
-@@ -62,7 +63,7 @@ #ifdef DPMSExtension
- pointer DPMSOpt;
- MessageType enabled_from = X_INFO;
-
-- DPMSKey = &DPMSKey;
-+ DPMSKey = &DPMSKeyIndex;
-
- if (DPMSDisabledSwitch)
- DPMSEnabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 2362629..dffe988 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -47,10 +47,13 @@ #include "xf86InPriv.h"
- /* Globals that video drivers may access */
-
- /* Index into pScreen.devPrivates */
--DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKey;
-+static int xf86CreateRootWindowKeyIndex;
-+DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex;
- /* Index of ScrnInfo in pScreen.devPrivates */
--_X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKey;
--_X_EXPORT DevPrivateKey xf86PixmapKey = &xf86PixmapKey;
-+static int xf86ScreenKeyIndex;
-+_X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex;
-+static int xf86PixmapKeyIndex;
-+_X_EXPORT DevPrivateKey xf86PixmapKey = &xf86PixmapKeyIndex;
- _X_EXPORT ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */
- _X_EXPORT const unsigned char byte_reversed[256] =
- {
-diff --git a/hw/xfree86/common/xf86RAC.c b/hw/xfree86/common/xf86RAC.c
-index 8215f98..24d29e4 100644
---- a/hw/xfree86/rac/xf86RAC.c
-+++ b/hw/xfree86/rac/xf86RAC.c
-@@ -256,8 +256,10 @@ static miPointerSpriteFuncRec RACSpriteF
- RACSpriteMoveCursor
- };
-
--static DevPrivateKey RACScreenKey = &RACScreenKey;
--static DevPrivateKey RACGCKey = &RACGCKey;
-+static int RACScreenKeyIndex;
-+static DevPrivateKey RACScreenKey = &RACScreenKeyIndex;
-+static int RACGCKeyIndex;
-+static DevPrivateKey RACGCKey = &RACGCKeyIndex;
-
-
- Bool
-diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
-index 10ec370..8471914 100644
---- a/hw/xfree86/common/xf86RandR.c
-+++ b/hw/xfree86/common/xf86RandR.c
-@@ -46,7 +46,8 @@ typedef struct _xf86RandRInfo {
- Rotation rotation;
- } XF86RandRInfoRec, *XF86RandRInfoPtr;
-
--static DevPrivateKey xf86RandRKey = NULL;
-+static int xf86RandRKeyIndex;
-+static DevPrivateKey xf86RandRKey;
-
- #define XF86RANDRINFO(p) ((XF86RandRInfoPtr)dixLookupPrivate(&(p)->devPrivates, xf86RandRKey))
-
-@@ -423,7 +424,7 @@ #ifdef PANORAMIX
- return TRUE;
- #endif
-
-- xf86RandRKey = &xf86RandRKey;
-+ xf86RandRKey = &xf86RandRKeyIndex;
-
- randrp = xalloc (sizeof (XF86RandRInfoRec));
- if (!randrp)
-diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
-index 9260bb5..24fccd3 100644
---- a/hw/xfree86/common/xf86VidMode.c
-+++ b/hw/xfree86/common/xf86VidMode.c
-@@ -47,7 +47,8 @@ #ifdef XF86VIDMODE
- #include "vidmodeproc.h"
- #include "xf86cmap.h"
-
--static DevPrivateKey VidModeKey = NULL;
-+static int VidModeKeyIndex;
-+static DevPrivateKey VidModeKey;
- static int VidModeCount = 0;
- static Bool VidModeClose(int i, ScreenPtr pScreen);
-
-@@ -72,7 +73,7 @@ #ifdef XF86VIDMODE
- return FALSE;
- }
-
-- VidModeKey = &VidModeKey;
-+ VidModeKey = &VidModeKeyIndex;
-
- if (!dixSetPrivate(&pScreen->devPrivates, VidModeKey,
- xcalloc(sizeof(VidModeRec), 1))) {
-diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
-index 8ae193a..e578447 100644
---- a/hw/xfree86/common/xf86cmap.c
-+++ b/hw/xfree86/common/xf86cmap.c
-@@ -101,8 +101,10 @@ typedef struct {
- int overscan;
- } CMapColormapRec, *CMapColormapPtr;
-
--static DevPrivateKey CMapScreenKey = NULL;
--static DevPrivateKey CMapColormapKey = &CMapColormapKey;
-+static int CMapScreenKeyIndex;
-+static DevPrivateKey CMapScreenKey;
-+static int CMapColormapKeyIndex;
-+static DevPrivateKey CMapColormapKey = &CMapColormapKeyIndex;
-
- static void CMapInstallColormap(ColormapPtr);
- static void CMapStoreColors(ColormapPtr, int, xColorItem *);
-@@ -142,7 +144,7 @@ _X_EXPORT Bool xf86HandleColormaps(
- if(!maxColors || !sigRGBbits || !loadPalette)
- return FALSE;
-
-- CMapScreenKey = &CMapScreenKey;
-+ CMapScreenKey = &CMapScreenKeyIndex;
-
- elements = 1 << sigRGBbits;
-
-diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
-index 9fd2e6c..5471c58 100644
---- a/hw/xfree86/common/xf86fbman.c
-+++ b/hw/xfree86/common/xf86fbman.c
-@@ -42,14 +42,15 @@ #include "xf86fbman.h"
- #define DEBUG
- */
-
--static DevPrivateKey xf86FBManagerKey = NULL;
-+static int xf86FBManagerKeyIndex;
-+static DevPrivateKey xf86FBManagerKey;
-
- _X_EXPORT Bool xf86RegisterOffscreenManager(
- ScreenPtr pScreen,
- FBManagerFuncsPtr funcs
- ){
-
-- xf86FBManagerKey = &xf86FBManagerKey;
-+ xf86FBManagerKey = &xf86FBManagerKeyIndex;
- dixSetPrivate(&pScreen->devPrivates, xf86FBManagerKey, funcs);
-
- return TRUE;
-@@ -269,7 +270,8 @@ xf86PurgeUnlockedOffscreenAreas(ScreenPt
-
- \************************************************************/
-
--static DevPrivateKey xf86FBScreenKey = &xf86FBScreenKey;
-+static int xf86FBScreenKeyIndex;
-+static DevPrivateKey xf86FBScreenKey = &xf86FBScreenKeyIndex;
-
- typedef struct _FBLink {
- FBArea area;
-diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
-index 63d1cb3..af2b145 100644
---- a/hw/xfree86/common/xf86sbusBus.c
-+++ b/hw/xfree86/common/xf86sbusBus.c
-@@ -602,7 +602,8 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn
- pScrn->virtualY = psdp->height;
- }
-
--static DevPrivateKey sbusPaletteKey = &sbusPaletteKey;
-+static sbusPaletteKeyIndex;
-+static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
- typedef struct _sbusCmap {
- sbusDevicePtr psdp;
- CloseScreenProcPtr CloseScreen;
-diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
-index 7483e20..b263f9b 100644
---- a/hw/xfree86/common/xf86xv.c
-+++ b/hw/xfree86/common/xf86xv.c
-@@ -110,8 +110,10 @@ static void xf86XVAdjustFrame(int index,
- static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int);
-
-
--static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKey;
--DevPrivateKey XF86XvScreenKey;
-+static int XF86XVWindowKeyIndex;
-+static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKeyIndex;
-+static int XF86XvScreenKeyIndex;
-+DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex;
- static unsigned long PortResource = 0;
-
- DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
-diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
-index 05267a2..41ef0a0 100644
---- a/hw/xfree86/common/xf86xvmc.c
-+++ b/hw/xfree86/common/xf86xvmc.c
-@@ -56,7 +56,8 @@ typedef struct {
- XvMCAdaptorPtr dixinfo;
- } xf86XvMCScreenRec, *xf86XvMCScreenPtr;
-
--static DevPrivateKey XF86XvMCScreenKey = &XF86XvMCScreenKey;
-+static int XF86XvMCScreenKeyIndex;
-+static DevPrivateKey XF86XvMCScreenKey = &XF86XvMCScreenKeyIndex;
-
- #define XF86XVMC_GET_PRIVATE(pScreen) (xf86XvMCScreenPtr) \
- dixLookupPrivate(&(pScreen)->devPrivates, XF86XvMCScreenKey)
-diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
-index 295e05e..c12178f 100644
---- a/hw/xfree86/dixmods/extmod/xf86dga2.c
-+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
-@@ -62,7 +62,8 @@ unsigned char DGAReqCode = 0;
- int DGAErrorBase;
- int DGAEventBase;
-
--static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKey;
-+static int DGAClientPrivateKeyIndex;
-+static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKeyIndex;
- static int DGACallbackRefCount = 0;
-
- /* This holds the client's version information */
-diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
-index 559f18b..6485a04 100644
---- a/hw/xfree86/dixmods/extmod/xf86vmode.c
-+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
-@@ -53,7 +53,8 @@ #include "globals.h"
- #define DEFAULT_XF86VIDMODE_VERBOSITY 3
-
- static int VidModeErrorBase;
--static DevPrivateKey VidModeClientPrivateKey = &VidModeClientPrivateKey;
-+static int VidModeClientPrivateKeyIndex;
-+static DevPrivateKey VidModeClientPrivateKey = &VidModeClientPrivateKeyIndex;
-
- /* This holds the client's version information */
- typedef struct {
-@@ -141,8 +142,9 @@ typedef struct _XF86VidModeScreenPrivate
- XF86VidModeEventPtr events;
- Bool hasWindow;
- } XF86VidModeScreenPrivateRec, *XF86VidModeScreenPrivatePtr;
--
--static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKey;
-+
-+static int ScreenPrivateKeyIndex;
-+static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKeyIndex;
-
- #define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
- dixLookupPrivate(&(s)->devPrivates, ScreenPrivateKey))
-diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
-index ac40e0f..d2599a9 100644
---- a/hw/xfree86/dri/dri.c
-+++ b/hw/xfree86/dri/dri.c
-@@ -79,8 +79,10 @@ extern Bool noPanoramiXExtension;
- #endif
-
- static int DRIEntPrivIndex = -1;
--static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
--static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
-+static int DRIScreenPrivKeyIndex;
-+static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex;
-+static int DRIWindowPrivKeyIndex;
-+static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKeyIndex;
- static unsigned long DRIGeneration = 0;
- static unsigned int DRIDrawableValidationStamp = 0;
-
-@@ -343,7 +345,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfo
-
- pDRIEntPriv = DRI_ENT_PRIV(pScrn);
-
-- DRIScreenPrivKey = &DRIScreenPrivKey;
- if (DRIGeneration != serverGeneration)
- DRIGeneration = serverGeneration;
-
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 74aef71..a5aef91 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -45,9 +45,12 @@ #include <GL/internal/dri_sarea.h>
-
- #include "xf86.h"
-
--static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKey;
--static DevPrivateKey dri2WindowPrivateKey = &dri2WindowPrivateKey;
--static DevPrivateKey dri2PixmapPrivateKey = &dri2PixmapPrivateKey;
-+static int dri2ScreenPrivateKeyIndex;
-+static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKeyIndex;
-+static int dri2WindowPrivateKeyIndex;
-+static DevPrivateKey dri2WindowPrivateKey = &dri2WindowPrivateKeyIndex;
-+static int dri2PixmapPrivateKeyIndex;
-+static DevPrivateKey dri2PixmapPrivateKey = &dri2PixmapPrivateKeyIndex;
-
- typedef struct _DRI2DrawablePriv {
- unsigned int refCount;
-diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
-index 4a8d8f2..601288c 100644
---- a/hw/xfree86/exa/examodule.c
-+++ b/hw/xfree86/exa/examodule.c
-@@ -42,7 +42,8 @@ typedef struct _ExaXorgScreenPrivRec {
- OptionInfoPtr options;
- } ExaXorgScreenPrivRec, *ExaXorgScreenPrivPtr;
-
--static DevPrivateKey exaXorgScreenPrivateKey = &exaXorgScreenPrivateKey;
-+static int exaXorgScreenPrivateKeyIndex;
-+static DevPrivateKey exaXorgScreenPrivateKey = &exaXorgScreenPrivateKeyIndex;
-
- typedef enum {
- EXAOPT_MIGRATION_HEURISTIC,
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index ac0b438..2ae8ea7 100644
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -63,7 +63,9 @@ #endif
- #endif
-
- static int xf86RandR12Generation;
-+
-+static int xf86RandR12KeyIndex;
- static DevPrivateKey xf86RandR12Key;
-
- #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
- dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))
-@@ -499,6 +500,6 @@ #endif
- xf86RandR12Generation = serverGeneration;
-
-- xf86RandR12Key = &xf86RandR12Key;
-+ xf86RandR12Key = &xf86RandR12KeyIndex;
-
- randrp = xalloc (sizeof (XF86RandRInfoRec));
- if (!randrp)
-diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
-index be4fb90..592eaad 100644
---- a/hw/xfree86/ramdac/xf86Cursor.c
-+++ b/hw/xfree86/ramdac/xf86Cursor.c
-@@ -18,7 +18,8 @@ #include "cursorstr.h"
- #include "inputstr.h"
- extern InputInfo inputInfo;
-
--DevPrivateKey xf86CursorScreenKey = &xf86CursorScreenKey;
-+static int xf86CursorScreenKeyIndex;
-+DevPrivateKey xf86CursorScreenKey = &xf86CursorScreenKeyIndex;
-
- /* sprite functions */
-
-diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
-index 74beefb..ff775ef 100644
---- a/hw/xfree86/shadowfb/shadow.c
-+++ b/hw/xfree86/shadowfb/shadow.c
-@@ -94,8 +94,10 @@ typedef struct {
- } ShadowGCRec, *ShadowGCPtr;
-
-
--static DevPrivateKey ShadowScreenKey = &ShadowScreenKey;
--static DevPrivateKey ShadowGCKey = &ShadowGCKey;
-+static int ShadowScreenKeyIndex;
-+static DevPrivateKey ShadowScreenKey = &ShadowScreenKeyIndex;
-+static int ShadowGCKeyIndex;
-+static DevPrivateKey ShadowGCKey = &ShadowGCKeyIndex;
-
- #define GET_SCREEN_PRIVATE(pScreen) \
- (ShadowScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, ShadowScreenKey)
-diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
-index 22a35a0..deb1989 100644
---- a/hw/xfree86/xaa/xaaInit.c
-+++ b/hw/xfree86/xaa/xaaInit.c
-@@ -39,9 +39,12 @@ static int XAASetDGAMode(int index, int
- static void XAAEnableDisableFBAccess (int index, Bool enable);
- static Bool XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask);
-
--static DevPrivateKey XAAScreenKey = &XAAScreenKey;
--static DevPrivateKey XAAGCKey = &XAAGCKey;
--static DevPrivateKey XAAPixmapKey = &XAAPixmapKey;
-+static int XAAScreenKeyIndex;
-+static DevPrivateKey XAAScreenKey = &XAAScreenKeyIndex;
-+static int XAAGCKeyIndex;
-+static DevPrivateKey XAAGCKey = &XAAGCKeyIndex;
-+static int XAAPixmapKeyIndex;
-+static DevPrivateKey XAAPixmapKey = &XAAPixmapKeyIndex;
-
- DevPrivateKey XAAGetScreenKey(void) {
- return XAAScreenKey;
-diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
-index 64ca998..8db816e 100644
---- a/hw/xfree86/xaa/xaaOverlayDF.c
-+++ b/hw/xfree86/xaa/xaaOverlayDF.c
-@@ -151,7 +151,8 @@ typedef struct {
- int (*TiledFillChooser)(GCPtr);
- } XAAOverlayRec, *XAAOverlayPtr;
-
--static DevPrivateKey XAAOverlayKey = &XAAOverlayKey;
-+static int XAAOverlayKeyIndex;
-+static DevPrivateKey XAAOverlayKey = &XAAOverlayKeyIndex;
-
- #define GET_OVERLAY_PRIV(pScreen) \
- (XAAOverlayPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAOverlayKey)
-diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
-index 443bda6..57d8aa3 100644
---- a/hw/xfree86/xaa/xaaStateChange.c
-+++ b/hw/xfree86/xaa/xaaStateChange.c
-@@ -274,7 +274,8 @@ #ifdef RENDER
- #endif
- } XAAStateWrapRec, *XAAStateWrapPtr;
-
--static DevPrivateKey XAAStateKey = &XAAStateKey;
-+static int XAAStateKeyIndex;
-+static DevPrivateKey XAAStateKey = &XAAStateKeyIndex;
-
- /* Wrap functions start here */
- #define GET_STATEPRIV_GC(pGC) XAAStateWrapPtr pStatePriv =\
-diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c
-index 5d6ea05..8841894 100644
---- a/hw/xfree86/xaa/xaaWrapper.c
-+++ b/hw/xfree86/xaa/xaaWrapper.c
-@@ -129,8 +129,10 @@ #define xaaWrapperGetGCPriv(pGC) ((xaaWr
- #define xaaWrapperGCPriv(pGC) xaaWrapperGCPrivPtr pGCPriv = xaaWrapperGetGCPriv(pGC)
-
-
--static DevPrivateKey xaaWrapperScrPrivateKey = &xaaWrapperScrPrivateKey;
--static DevPrivateKey xaaWrapperGCPrivateKey = &xaaWrapperGCPrivateKey;
-+static int xaaWrapperScrPrivateKeyIndex;
-+static DevPrivateKey xaaWrapperScrPrivateKey = &xaaWrapperScrPrivateKeyIndex;
-+static int xaaWrapperGCPrivateKeyIndex;
-+static DevPrivateKey xaaWrapperGCPrivateKey = &xaaWrapperGCPrivateKeyIndex;
-
- static Bool
- xaaWrapperCreateScreenResources(ScreenPtr pScreen)
-diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
-index 06e6e02..65425e9 100644
---- a/hw/xnest/GC.c
-+++ b/hw/xnest/GC.c
-@@ -35,7 +35,8 @@ #include "Drawable.h"
- #include "XNFont.h"
- #include "Color.h"
-
--DevPrivateKey xnestGCPrivateKey = &xnestGCPrivateKey;
-+static int xnestGCPrivateKeyIndex;
-+DevPrivateKey xnestGCPrivateKey = &xnestGCPrivateKeyIndex;
-
- static GCFuncs xnestFuncs = {
- xnestValidateGC,
-diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
-index 0431196..08305b1 100644
---- a/hw/xnest/Pixmap.c
-+++ b/hw/xnest/Pixmap.c
-@@ -33,7 +33,8 @@ #include "Display.h"
- #include "Screen.h"
- #include "XNPixmap.h"
-
--DevPrivateKey xnestPixmapPrivateKey = &xnestPixmapPrivateKey;
-+static int xnestPixmapPrivateKeyIndex;
-+DevPrivateKey xnestPixmapPrivateKey = &xnestPixmapPrivateKeyIndex;
-
- PixmapPtr
- xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
-#diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
-#index 4e8616d..ca903d7 100644
-#--- a/hw/xnest/Screen.c
-#+++ b/hw/xnest/Screen.c
-#@@ -45,7 +45,8 @@ #include "mipointrst.h"
-#
-# Window xnestDefaultWindows[MAXSCREENS];
-# Window xnestScreenSaverWindows[MAXSCREENS];
-#-DevPrivateKey xnestCursorScreenKey = &xnestCursorScreenKey;
-#+static int xnestCursorScreenKeyIndex;
-#+DevPrivateKey xnestCursorScreenKey = &xnestCursorScreenKeyIndex;
-#
-# ScreenPtr
-# xnestScreen(Window window)
-diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
-index 23383e1..ae3487f 100644
---- a/hw/xnest/Window.c
-+++ b/hw/xnest/Window.c
-@@ -39,7 +39,8 @@ #include "Visual.h"
- #include "Events.h"
- #include "Args.h"
-
--DevPrivateKey xnestWindowPrivateKey = &xnestWindowPrivateKey;
-+static int xnestWindowPrivateKeyIndex;
-+DevPrivateKey xnestWindowPrivateKey = &xnestWindowPrivateKeyIndex;
-
- static int
- xnestFindWindowMatch(WindowPtr pWin, pointer ptr)
-diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
-index 8107beb..559bc89 100644
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -85,7 +85,8 @@ #endif
- * X server shared global variables
- */
- int darwinScreensFound = 0;
--DevPrivateKey darwinScreenKey = &darwinScreenKey;
-+static int darwinScreenKeyIndex;
-+DevPrivateKey darwinScreenKey = &darwinScreenKeyIndex;
- io_connect_t darwinParamConnect = 0;
- int darwinEventReadFD = -1;
- int darwinEventWriteFD = -1;
-diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
-index c4b889e..b17e561 100644
---- a/hw/xquartz/quartz.c
-+++ b/hw/xquartz/quartz.c
-@@ -71,7 +71,8 @@ int quartzUseAGL = 1
- int quartzEnableKeyEquivalents = 1;
- int quartzServerVisible = TRUE;
- int quartzServerQuitting = FALSE;
--DevPrivateKey quartzScreenKey = &quartzScreenKey;
-+static int quartzScreenKeyIndex;
-+DevPrivateKey quartzScreenKey = &quartzScreenKeyIndex;
- int aquaMenuBarHeight = 0;
- QuartzModeProcsPtr quartzProcs = NULL;
- const char *quartzOpenGLBundle = NULL;
-diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
-index 3aacb19..5b79419 100644
---- a/hw/xquartz/xpr/dri.c
-+++ b/hw/xquartz/xpr/dri.c
-@@ -71,9 +71,12 @@ #include "x-hook.h"
-
- #include <AvailabilityMacros.h>
-
--static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
--static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
--static DevPrivateKey DRIPixmapPrivKey = &DRIPixmapPrivKey;
-+static int DRIScreenPrivKeyIndex;
-+static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex;
-+static int DRIWindowPrivKeyIndex;
-+static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKeyIndex;
-+static int DRIPixmapPrivKeyIndex;
-+static DevPrivateKey DRIPixmapPrivKey = &DRIPixmapPrivKeyIndex;
-
- static RESTYPE DRIDrawablePrivResType;
-
-diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
-index 76ab75c..c1890a2 100644
---- a/hw/xquartz/xpr/xprCursor.c
-+++ b/hw/xquartz/xpr/xprCursor.c
-@@ -56,7 +56,8 @@ typedef struct {
- miPointerSpriteFuncPtr spriteFuncs;
- } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
-
--static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey;
-+static int darwinCursorScreenKeyIndex;
-+static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKeyIndex;
-
- #define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
- dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
-diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c
-index fddada3..3eb6091 100644
---- a/hw/xwin/winglobals.c
-+++ b/hw/xwin/winglobals.c
-@@ -44,11 +44,16 @@ int g_iLastScreen = -1;
- #ifdef HAS_DEVWINDOWS
- int g_fdMessageQueue = WIN_FD_INVALID;
- #endif
--DevPrivateKey g_iScreenPrivateKey = &g_iScreenPrivateKey;
--DevPrivateKey g_iCmapPrivateKey = &g_iCmapPrivateKey;
--DevPrivateKey g_iGCPrivateKey = &g_iGCPrivateKey;
--DevPrivateKey g_iPixmapPrivateKey = &g_iPixmapPrivateKey;
--DevPrivateKey g_iWindowPrivateKey = &g_iWindowPrivateKey;
-+static int g_iScreenPrivateKeyIndex;
-+DevPrivateKey g_iScreenPrivateKey = &g_iScreenPrivateKeyIndex;
-+static int g_iCmapPrivateKeyIndex;
-+DevPrivateKey g_iCmapPrivateKey = &g_iCmapPrivateKeyIndex;
-+static int g_iGCPrivateKeyIndex;
-+DevPrivateKey g_iGCPrivateKey = &g_iGCPrivateKeyIndex;
-+static int g_iPixmapPrivateKeyIndex;
-+DevPrivateKey g_iPixmapPrivateKey = &g_iPixmapPrivateKeyIndex;
-+static int g_iWindowPrivateKeyIndex;
-+DevPrivateKey g_iWindowPrivateKey = &g_iWindowPrivateKeyIndex;
- unsigned long g_ulServerGeneration = 0;
- Bool g_fInitializedDefaultScreens = FALSE;
- DWORD g_dwEnginesSupported = 0;
-diff --git a/mi/mibank.c b/mi/mibank.c
-index ea79e9d..92288ab 100644
---- a/mi/mibank.c
-+++ b/mi/mibank.c
-@@ -175,8 +175,11 @@ #define SET_DESTINATION_BANK(_pPix, _wid
- #define xalloc_ARRAY(atype, ntype) \
- (atype *)xalloc((ntype) * sizeof(atype))
-
--static DevPrivateKey miBankScreenKey = &miBankScreenKey;
--static DevPrivateKey miBankGCKey = &miBankGCKey;
-+static int miBankScreenKeyIndex;
-+static DevPrivateKey miBankScreenKey = &miBankScreenKeyIndex;
-+static int miBankGCKeyIndex;
-+static DevPrivateKey miBankGCKey = &miBankGCKeyIndex;
-+
- static unsigned long miBankGeneration = 0;
-
- #define BANK_SCRPRIVLVAL dixLookupPrivate(&pScreen->devPrivates, miBankScreenKey)
-diff --git a/mi/midispcur.c b/mi/midispcur.c
-index 1f2d8cf..05352fc 100644
---- a/mi/midispcur.c
-+++ b/mi/midispcur.c
-@@ -55,8 +55,8 @@ #endif
- # include "inputstr.h" /* for MAX_DEVICES */
-
- /* per-screen private data */
--
--static DevPrivateKey miDCScreenKey = &miDCScreenKey;
-+static int miDCScreenKeyIndex;
-+static DevPrivateKey miDCScreenKey = &miDCScreenKeyIndex;
-
- static Bool miDCCloseScreen(int index, ScreenPtr pScreen);
-
-#-static DevPrivateKey miPointerPrivKey = &miPointerPrivKey;
-#+static int miPointerPrivKeyIndex;
-#+static DevPrivateKey miPointerPrivKey = &miPointerPrivKeyIndex;
-#
-# #define MIPOINTER(dev) \
-# ((DevHasCursor((dev)) || (!dev->isMaster && !dev->u.master)) ? \
-
-diff --git a/mi/mioverlay.c b/mi/mioverlay.c
-index 2fc583e..395b1aa 100644
---- a/mi/mioverlay.c
-+++ b/mi/mioverlay.c
-@@ -54,8 +54,10 @@ typedef struct {
- Bool copyUnderlay;
- } miOverlayScreenRec, *miOverlayScreenPtr;
-
--static DevPrivateKey miOverlayWindowKey = &miOverlayWindowKey;
--static DevPrivateKey miOverlayScreenKey = &miOverlayScreenKey;
-+static int miOverlayWindowKeyKeyIndex;
-+static DevPrivateKey miOverlayWindowKey = &miOverlayWindowKeyKeyIndex;
-+static int miOverlayScreenKeyIndex;
-+static DevPrivateKey miOverlayScreenKey = &miOverlayScreenKeyIndex;
-
- static void RebuildTree(WindowPtr);
- static Bool HasUnderlayChildren(WindowPtr);
-diff --git a/mi/mipointer.c b/mi/mipointer.c
-index 809ce5e..8293e9b 100644
---- a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -41,9 +41,10 @@ # include "cursorstr.h"
- # include "dixstruct.h"
- # include "inputstr.h"
-
--_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKey;
-+static int miPointerScreenKeyIndex;
-+_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKeyIndex;
-
- #define GetScreenPrivate(s) ((miPointerScreenPtr) \
- dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey))
- #define SetupScreen(s) miPointerScreenPtr pScreenPriv = GetScreenPrivate(s)
-
-#-static DevPrivateKey miPointerPrivKey = &miPointerPrivKey;
-#+static int miPointerPrivKeyIndex;
-#+static DevPrivateKey miPointerPrivKey = &miPointerPrivKeyIndex;
-#
-# #define MIPOINTER(dev) \
-# ((DevHasCursor((dev)) || (!dev->isMaster && !dev->u.master)) ? \
-#
-diff --git a/mi/miscrinit.c b/mi/miscrinit.c
-index 6cd4df3..df96993 100644
---- a/mi/miscrinit.c
-+++ b/mi/miscrinit.c
-@@ -280,7 +280,8 @@ #endif
- return miScreenDevPrivateInit(pScreen, width, pbits);
- }
-
--static DevPrivateKey privateKey = &privateKey;
-+static int privateKeyIndex;
-+static DevPrivateKey privateKey = &privateKeyIndex;
-
- _X_EXPORT DevPrivateKey
- miAllocateGCPrivateIndex()
-@@ -288,7 +289,8 @@ miAllocateGCPrivateIndex()
- return privateKey;
- }
-
--_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKey;
-+static int miZeroLineScreenKeyIndex;
-+_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKeyIndex;
-
- _X_EXPORT void
- miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias)
-diff --git a/mi/misprite.c b/mi/misprite.c
-index 85755b7..692e6c9 100644
---- a/mi/misprite.c
-+++ b/mi/misprite.c
-@@ -109,7 +109,8 @@ miSpriteIsDown(miCursorInfoPtr pDevCurso
- * screen wrappers
- */
-
--static DevPrivateKey miSpriteScreenKey = &miSpriteScreenKey;
-+static int miSpriteScreenKeyIndex;
-+static DevPrivateKey miSpriteScreenKey = &miSpriteScreenKeyIndex;
-
- static Bool miSpriteCloseScreen(int i, ScreenPtr pScreen);
- static void miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy,
-diff --git a/miext/cw/cw.c b/miext/cw/cw.c
-index efb0469..56066fe 100644
---- a/miext/cw/cw.c
-+++ b/miext/cw/cw.c
-@@ -43,11 +43,15 @@ #else
- #define CW_ASSERT(x) do {} while (0)
- #endif
-
--DevPrivateKey cwGCKey = &cwGCKey;
--DevPrivateKey cwScreenKey = &cwScreenKey;
--DevPrivateKey cwWindowKey = &cwWindowKey;
-+static int cwGCKeyIndex;
-+DevPrivateKey cwGCKey = &cwGCKeyIndex;
-+static int cwScreenKeyIndex;
-+DevPrivateKey cwScreenKey = &cwScreenKeyIndex;
-+static int cwWindowKeyIndex;
-+DevPrivateKey cwWindowKey = &cwWindowKeyIndex;
- #ifdef RENDER
--DevPrivateKey cwPictureKey = &cwPictureKey;
-+static int cwPictureKeyIndex;
-+DevPrivateKey cwPictureKey = &cwPictureKeyIndex;
- #endif
- extern GCOps cwGCOps;
-
-diff --git a/miext/damage/damage.c b/miext/damage/damage.c
-index 56864c5..5000a82 100755
---- a/miext/damage/damage.c
-+++ b/miext/damage/damage.c
-@@ -70,10 +70,14 @@ #define getPixmapDamageRef(pPixmap) ((Da
-
- #define pixmapDamage(pPixmap) damagePixPriv(pPixmap)
-
--static DevPrivateKey damageScrPrivateKey = &damageScrPrivateKey;
--static DevPrivateKey damagePixPrivateKey = &damagePixPrivateKey;
--static DevPrivateKey damageGCPrivateKey = &damageGCPrivateKey;
--static DevPrivateKey damageWinPrivateKey = &damageWinPrivateKey;
-+static int damageScrPrivateKeyIndex;
-+static DevPrivateKey damageScrPrivateKey = &damageScrPrivateKeyIndex;
-+static int damagePixPrivateKeyIndex;
-+static DevPrivateKey damagePixPrivateKey = &damagePixPrivateKeyIndex;
-+static int damageGCPrivateKeyIndex;
-+static DevPrivateKey damageGCPrivateKey = &damageGCPrivateKeyIndex;
-+static int damageWinPrivateKeyIndex;
-+static DevPrivateKey damageWinPrivateKey = &damageWinPrivateKeyIndex;
-
- static DamagePtr *
- getDrawableDamageRef (DrawablePtr pDrawable)
-diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
-index 8eaacca..421c03c 100644
---- a/miext/rootless/rootlessScreen.c
-+++ b/miext/rootless/rootlessScreen.c
-@@ -62,10 +62,14 @@ extern int RootlessMiValidateTree(Window
- extern Bool RootlessCreateGC(GCPtr pGC);
-
- // Initialize globals
--DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKey;
--DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKey;
--DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKey;
--DevPrivateKey rootlessWindowOldPixmapPrivateKey = &rootlessWindowOldPixmapPrivateKey;
-+static int rootlessGCPrivateKeyIndex;
-+DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKeyIndex;
-+static int rootlessScreenPrivateKeyIndex;
-+DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKeyIndex;
-+static int rootlessWindowPrivateKeyIndex;
-+DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKeyIndex;
-+static int rootlessWindowOldPixmapPrivateKeyIndex;
-+DevPrivateKey rootlessWindowOldPixmapPrivateKey = &rootlessWindowOldPixmapPrivateKeyIndex;
-
-
- /*
-diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
-index ef0df40..21f1de2 100644
---- a/miext/shadow/shadow.c
-+++ b/miext/shadow/shadow.c
-@@ -36,7 +36,8 @@ #include "globals.h"
- #include "gcstruct.h"
- #include "shadow.h"
-
--DevPrivateKey shadowScrPrivateKey = &shadowScrPrivateKey;
-+static int shadowScrPrivateKeyIndex;
-+DevPrivateKey shadowScrPrivateKey = &shadowScrPrivateKeyIndex;
-
- #define wrap(priv, real, mem) {\
- priv->mem = real->mem; \
-diff --git a/randr/randr.c b/randr/randr.c
-index 9bfed05..230d816 100644
---- a/randr/randr.c
-+++ b/randr/randr.c
-@@ -56,9 +56,11 @@ static int SProcRRDispatch (ClientPtr pC
- int RREventBase;
- int RRErrorBase;
- RESTYPE RRClientType, RREventType; /* resource types for event masks */
--DevPrivateKey RRClientPrivateKey = &RRClientPrivateKey;
-+static int RRClientPrivateKeyIndex;
-+DevPrivateKey RRClientPrivateKey = &RRClientPrivateKeyIndex;
-
--DevPrivateKey rrPrivKey = &rrPrivKey;
-+static int rrPrivKeyIndex;
-+DevPrivateKey rrPrivKey = &rrPrivKeyIndex;
-
- static void
- RRClientCallback (CallbackListPtr *list,
-diff --git a/record/record.c b/record/record.c
-index d7314b1..d6a1c98 100644
---- a/record/record.c
-+++ b/record/record.c
-@@ -165,7 +165,8 @@ typedef struct {
- ProcFunctionPtr recordVector[256];
- } RecordClientPrivateRec, *RecordClientPrivatePtr;
-
--static DevPrivateKey RecordClientPrivateKey = &RecordClientPrivateKey;
-+static int RecordClientPrivateKeyIndex;
-+static DevPrivateKey RecordClientPrivateKey = &RecordClientPrivateKeyIndex;
-
- /* RecordClientPrivatePtr RecordClientPrivate(ClientPtr)
- * gets the client private of the given client. Syntactic sugar.
-diff --git a/render/animcur.c b/render/animcur.c
-index 362607f..5723442 100644
---- a/render/animcur.c
-+++ b/render/animcur.c
-@@ -91,7 +91,9 @@ static CursorBits animCursorBits = {
- };
-
- static int AnimCurGeneration;
--static DevPrivateKey AnimCurScreenPrivateKey = &AnimCurScreenPrivateKey;
-+
-+static int AnimCurScreenPrivateKeyIndex;
-+static DevPrivateKey AnimCurScreenPrivateKey = &AnimCurScreenPrivateKeyIndex;
-
- #define IsAnimCur(c) ((c) && ((c)->bits == &animCursorBits))
- #define GetAnimCur(c) ((AnimCurPtr) ((c) + 1))
-diff --git a/render/picture.c b/render/picture.c
-index b7874bb..9def47b 100644
---- a/render/picture.c
-+++ b/render/picture.c
-@@ -43,8 +43,10 @@ #include "picturestr.h"
- #include "xace.h"
- #include "registry.h"
-
--_X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKey;
--DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKey;
-+static int PictureScreenPrivateKeyIndex;
-+_X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex;
-+static int PictureWindowPrivateKeyIndex;
-+DevPrivateKey PictureWindowPrivateKey = &PictureWindowPrivateKeyIndex;
- static int PictureGeneration;
- RESTYPE PictureType;
- RESTYPE PictFormatType;
-diff --git a/render/render.c b/render/render.c
-index b1d6d58..1b7d78b 100644
---- a/render/render.c
-+++ b/render/render.c
-@@ -211,7 +211,8 @@ int (*SProcRenderVector[RenderNumberRequ
- };
-
- int RenderErrBase;
--DevPrivateKey RenderClientPrivateKey;
-+static int RenderClientPrivateKeyIndex;
-+DevPrivateKey RenderClientPrivateKey = &RenderClientPrivateKeyIndex;
-
- typedef struct _RenderClient {
- int major_version;
-diff --git a/xfixes/cursor.c b/xfixes/cursor.c
-index ca17397..c4069d9 100755
---- a/xfixes/cursor.c
-+++ b/xfixes/cursor.c
-@@ -56,10 +56,12 @@ #include "xace.h"
- static RESTYPE CursorClientType;
- static RESTYPE CursorHideCountType;
- static RESTYPE CursorWindowType;
--static DevPrivateKey CursorScreenPrivateKey = &CursorScreenPrivateKey;
- static CursorPtr CursorCurrent;
- static CursorPtr pInvisibleCursor = NULL;
-
-+static int CursorScreenPrivateKeyIndex;
-+static DevPrivateKey CursorScreenPrivateKey = &CursorScreenPrivateKeyIndex;
-+
- static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
-
- #define VERIFY_CURSOR(pCursor, cursor, client, access) { \
-diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
-index 0db4989..d1225c6 100755
---- a/xfixes/xfixes.c
-+++ b/xfixes/xfixes.c
-@@ -56,7 +56,9 @@ #define SERVER_XFIXES_MINOR 0
- static unsigned char XFixesReqCode;
- int XFixesEventBase;
- int XFixesErrorBase;
--static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKey;
-+
-+static int XFixesClientPrivateKeyIndex;
-+static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex;
-
- static int
- ProcXFixesQueryVersion(ClientPtr client)
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 8a26825..35938a9 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -42,7 +42,8 @@ #include "xkb.h"
- #include <ctype.h>
- #define EXTENSION_EVENT_BASE 64
-
--DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKey;
-+static int xkbDevicePrivateKeyIndex;
-+DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex;
-
- void
- xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
---
-1.4.1
-
--- a/open-src/xserver/xorg/remove-ppcPci.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-From e1ae8db625b5e8c298a557592ef23656b3da4886 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Mon, 18 Aug 2008 09:53:48 -0400
-Subject: [PATCH] Drop dead PowerPC PCI code.
-
-Also add a warning for anyone still using legacy PCI code.
----
- configure.ac | 11 ----
- hw/xfree86/os-support/bus/Makefile.am | 4 --
- hw/xfree86/os-support/bus/Pci.h | 3 -
- hw/xfree86/os-support/bus/ppcPci.c | 82 ---------------------------------
- 4 files changed, 1 insertions(+), 99 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d42d7fd..95a084f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1217,7 +1217,6 @@ AC_MSG_RESULT([$XORG])
- xorg_bus_linuxpci=no
- xorg_bus_bsdpci=no
- xorg_bus_ix86pci=no
--xorg_bus_ppcpci=no
- xorg_bus_sparcpci=no
- xorg_bus_sparc=no
-
-@@ -1344,15 +1343,6 @@ if test "x$XORG" = xyes; then
- esac
-
- case $host_cpu in
-- powerpc*)
-- case $host_os in
-- linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
-- ;;
-- *)
-- xorg_bus_ppcpci="yes"
-- ;;
-- esac
-- ;;
- sparc*)
- xorg_bus_sparcpci="yes"
- xorg_bus_sparc="yes"
-@@ -1460,7 +1450,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" =
- AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
--AM_CONDITIONAL([XORG_BUS_PPCPCI], [test "x$xorg_bus_ppcpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_SPARCPCI], [test "x$xorg_bus_sparcpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
- AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
-diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
-index d48fcb6..94c3750 100644
---- a/hw/xfree86/os-support/bus/Makefile.am
-+++ b/hw/xfree86/os-support/bus/Makefile.am
-@@ -15,10 +15,6 @@ if XORG_BUS_IX86PCI
- PCI_SOURCES += ix86Pci.c
- endif
-
--if XORG_BUS_PPCPCI
--PCI_SOURCES += ppcPci.c
--endif
--
- if XORG_BUS_SPARCPCI
- PCI_SOURCES += sparcPci.c
- endif
-diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
-index a1390c0..488e1e3 100644
---- a/hw/xfree86/os-support/bus/Pci.h
-+++ b/hw/xfree86/os-support/bus/Pci.h
-@@ -199,13 +199,12 @@ #endif /* defined(linux) */
-
-
- #if !defined(ARCH_PCI_INIT)
-+#warning You really need to port to libpciaccess.
- /*
- * Select architecture specific PCI init function
- */
- #if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64)
- # define ARCH_PCI_INIT ix86PciInit
--#elif defined(__powerpc__) || defined(__powerpc64__)
--# define ARCH_PCI_INIT ppcPciInit
- #elif defined(__sparc__) || defined(sparc)
- # define ARCH_PCI_INIT sparcPciInit
- # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
-diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c
-deleted file mode 100644
-index 49c1a2a..0000000
---- a/hw/xfree86/os-support/bus/ppcPci.c
-+++ /dev/null
-@@ -1,82 +0,0 @@
--/*
-- * ppcPci.c - PowerPC PCI access functions
-- *
-- * PCI driver functions supporting Motorola PowerPC platforms
-- * including Powerstack(RiscPC/RiscPC+), PowerStackII, MTX, and
-- * MVME 160x/260x/360x/460x VME boards
-- *
-- * Gary Barton
-- * Concurrent Computer Corporation
-- * [email protected]
-- *
-- */
--
--/*
-- * 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.
-- */
--
--#ifdef HAVE_XORG_CONFIG_H
--#include <xorg-config.h>
--#endif
--
--#include <stdio.h>
--#include "compiler.h"
--#include "xf86.h"
--#include "xf86Priv.h"
--#include "xf86_OSlib.h"
--#include "Pci.h"
--
--#ifndef MAP_FAILED
--#define MAP_FAILED (pointer)(-1)
--#endif
--
--void
--ppcPciInit()
--{
--
-- static void motoppcPciInit(void);
-- motoppcPciInit();
--
--}
---
-1.4.1
-
--- a/open-src/xserver/xorg/remove-sparcPci.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1069 +0,0 @@
-From 3c03d9f1efbbacec6e8be58da99bf0977a8e0fec Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Mon, 18 Aug 2008 14:37:42 -0400
-Subject: [PATCH] Remove sparcPci.c
-
-There is no way this code can have been building for anyone since pciaccess
-was merged. BSD and Linux were already using OS code on sparc, the only
-people who could want this are Solaris, who should be using pciaccess
-anyway.
----
- configure.ac | 3
- hw/xfree86/os-support/bus/Makefile.am | 4
- hw/xfree86/os-support/bus/Pci.h | 10
- hw/xfree86/os-support/bus/sparcPci.c | 979 ---------------------------------
- 4 files changed, 2 insertions(+), 994 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 95a084f..52d35c3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1217,7 +1217,6 @@ AC_MSG_RESULT([$XORG])
- xorg_bus_linuxpci=no
- xorg_bus_bsdpci=no
- xorg_bus_ix86pci=no
--xorg_bus_sparcpci=no
- xorg_bus_sparc=no
-
- if test "x$XORG" = xyes; then
-@@ -1344,7 +1343,6 @@ if test "x$XORG" = xyes; then
-
- case $host_cpu in
- sparc*)
-- xorg_bus_sparcpci="yes"
- xorg_bus_sparc="yes"
- ;;
- i*86|x86_64*|amd64*)
-@@ -1450,7 +1448,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" =
- AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
--AM_CONDITIONAL([XORG_BUS_SPARCPCI], [test "x$xorg_bus_sparcpci" = xyes])
- AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
- AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
- AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
-diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
-index 94c3750..5199340 100644
---- a/hw/xfree86/os-support/bus/Makefile.am
-+++ b/hw/xfree86/os-support/bus/Makefile.am
-@@ -15,10 +15,6 @@ if XORG_BUS_IX86PCI
- PCI_SOURCES += ix86Pci.c
- endif
-
--if XORG_BUS_SPARCPCI
--PCI_SOURCES += sparcPci.c
--endif
--
- if XORG_BUS_SPARC
- PLATFORM_SOURCES = Sbus.c
- sdk_HEADERS += xf86Sbus.h
-diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
-index 26ba947..e56d61e 100644
---- a/hw/xfree86/os-support/bus/Pci.h
-+++ b/hw/xfree86/os-support/bus/Pci.h
-@@ -198,15 +198,9 @@ #endif /* defined(linux) */
-
- #if !defined(ARCH_PCI_INIT)
- #warning You really need to port to libpciaccess.
--/*
-- * Select architecture specific PCI init function
-- */
- #if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64)
--# define ARCH_PCI_INIT ix86PciInit
--#elif defined(__sparc__) || defined(sparc)
--# define ARCH_PCI_INIT sparcPciInit
--# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
--#endif
-+#define ARCH_PCI_INIT ix86PciInit
-+#endif /* i386/amd64 */
- #endif /* !defined(ARCH_PCI_INIT) */
-
- #ifndef ARCH_PCI_INIT
-diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c
-deleted file mode 100644
-index 2d8039c..0000000
---- a/hw/xfree86/os-support/bus/sparcPci.c
-+++ /dev/null
-@@ -1,979 +0,0 @@
--/*
-- * Copyright (C) 2001-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.
-- */
--
--#ifdef HAVE_XORG_CONFIG_H
--#include <xorg-config.h>
--#endif
--
--#include "xf86.h"
--#include "xf86Priv.h"
--#include "xf86_OSlib.h"
--#include "Pci.h"
--#include "xf86sbusBus.h"
--
--#if defined(sun)
--
--extern char *apertureDevName;
--static int apertureFd = -1;
--
--/*
-- * A version of xf86MapVidMem() that allows for 64-bit displacements (but not
-- * sizes). Areas thus mapped can be unmapped by xf86UnMapVidMem().
-- */
--static pointer
--sparcMapAperture(int iScreen, int Flags,
-- unsigned long long Base, unsigned long Size)
--{
-- pointer result;
-- static int lastFlags = 0;
--
-- /* Assume both Base & Size are multiples of the page size */
--
-- if ((apertureFd < 0) || (Flags != lastFlags)) {
-- if (apertureFd >= 0)
-- close(apertureFd);
-- lastFlags = Flags;
-- apertureFd = open(apertureDevName,
-- (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
-- if (apertureFd < 0)
-- FatalError("sparcMapAperture: open failure: %s\n",
-- strerror(errno));
-- }
--
-- result = mmap(NULL, Size,
-- (Flags & VIDMEM_READONLY) ?
-- PROT_READ : (PROT_READ | PROT_WRITE),
-- MAP_SHARED, apertureFd, (off_t)Base);
--
-- if (result == MAP_FAILED)
-- FatalError("sparcMapAperture: mmap failure: %s\n", strerror(errno));
--
-- return result;
--}
--
--/*
-- * Platform-specific bus privates.
-- */
--typedef struct _sparcDomainRec {
-- unsigned long long io_addr, io_size;
-- unsigned long long mem_addr, mem_size;
-- pointer pci, io;
-- int bus_min, bus_max;
-- unsigned char dfn_mask[256 / 8];
--} sparcDomainRec, *sparcDomainPtr;
--
--#define SetBitInMap(bit, map) \
-- do { \
-- int _bit = (bit); \
-- (map)[_bit >> 3] |= 1 << (_bit & 7); \
-- } while (0)
--
--#define IsBitSetInMap(bit, map) \
-- ((map)[(bit) >> 3] & (1 << ((bit) & 7)))
--
--/*
-- * Domain 0 is reserved for the one that represents the system as a whole, i.e.
-- * the one without any resource relocations.
-- */
--#define MAX_DOMAINS (MAX_PCI_BUSES / 256)
--static sparcDomainPtr xf86DomainInfo[MAX_DOMAINS];
--static int pciNumDomains = 1;
--
--/* Variables that are assigned this must be declared volatile */
--#define PciReg(base, tag, off, type) \
-- *(volatile type *)(pointer)((char *)(base) + \
-- (PCI_TAG_NO_DOMAIN(tag) | (off)))
--
--/* Generic SPARC PCI access functions */
--static CARD32
--sparcPciCfgRead32(PCITAG tag, int off)
--{
-- pciBusInfo_t *pBusInfo;
-- sparcDomainPtr pDomain;
-- volatile CARD32 result = (CARD32)(-1); /* Must be volatile */
-- int bus;
--
-- if ((off >= 0) && (off <= 252) && !(off & 3) &&
-- ((bus = PCI_BUS_FROM_TAG(tag)) < pciNumBuses) &&
-- (pBusInfo = pciBusInfo[bus]) && (pDomain = pBusInfo->pciBusPriv) &&
-- (bus >= pDomain->bus_min) && (bus < pDomain->bus_max) &&
-- ((bus > pDomain->bus_min) ||
-- IsBitSetInMap(PCI_DFN_FROM_TAG(tag), pDomain->dfn_mask))) {
-- result = PciReg(pDomain->pci, tag, off, CARD32);
--
-- result = PCI_CPU(result);
-- }
--
-- return result;
--}
--
--static void
--sparcPciCfgWrite32(PCITAG tag, int off, CARD32 val)
--{
-- pciBusInfo_t *pBusInfo;
-- sparcDomainPtr pDomain;
-- int bus;
--
-- if ((off < 0) || (off > 252) || (off & 3) ||
-- ((bus = PCI_BUS_FROM_TAG(tag)) >= pciNumBuses) ||
-- !(pBusInfo = pciBusInfo[bus]) || !(pDomain = pBusInfo->pciBusPriv) ||
-- (bus < pDomain->bus_min) || (bus >= pDomain->bus_max) ||
-- ((bus == pDomain->bus_min) &&
-- !IsBitSetInMap(PCI_DFN_FROM_TAG(tag), pDomain->dfn_mask)))
-- return;
--
-- val = PCI_CPU(val);
-- PciReg(pDomain->pci, tag, off, CARD32) = val;
--}
--
--static void
--sparcPciCfgSetBits32(PCITAG tag, int off, CARD32 mask, CARD32 bits)
--{
-- CARD32 PciVal;
--
-- PciVal = sparcPciCfgRead32(tag, off);
-- PciVal &= ~mask;
-- PciVal |= bits;
-- sparcPciCfgWrite32(tag, off, PciVal);
--}
--
--static pciBusFuncs_t sparcPCIFunctions =
--{
-- sparcPciCfgRead32,
-- sparcPciCfgWrite32,
-- sparcPciCfgSetBits32,
-- pciAddrNOOP,
-- pciAddrNOOP
--};
--
--/*
-- * Sabre-specific versions of the above because of its peculiar access size
-- * requirements.
-- */
--static CARD32
--sabrePciCfgRead32(PCITAG tag, int off)
--{
-- pciBusInfo_t *pBusInfo;
-- sparcDomainPtr pDomain;
-- volatile CARD32 result; /* Must be volatile */
-- int bus;
--
-- if (PCI_BDEV_FROM_TAG(tag))
-- return sparcPciCfgRead32(tag, off);
--
-- if (PCI_FUNC_FROM_TAG(tag) || (off < 0) || (off > 252) || (off & 3) ||
-- ((bus = PCI_BUS_FROM_TAG(tag)) >= pciNumBuses) ||
-- !(pBusInfo = pciBusInfo[bus]) || !(pDomain = pBusInfo->pciBusPriv) ||
-- (bus != pDomain->bus_min))
-- return (CARD32)(-1);
--
-- if (off < 8) {
-- result = (PciReg(pDomain->pci, tag, off, CARD16) << 16) |
-- PciReg(pDomain->pci, tag, off + 2, CARD16);
-- return PCI_CPU(result);
-- }
--
-- result = (PciReg(pDomain->pci, tag, off + 3, CARD8) << 24) |
-- (PciReg(pDomain->pci, tag, off + 2, CARD8) << 16) |
-- (PciReg(pDomain->pci, tag, off + 1, CARD8) << 8) |
-- (PciReg(pDomain->pci, tag, off , CARD8) );
-- return result;
--}
--
--static void
--sabrePciCfgWrite32(PCITAG tag, int off, CARD32 val)
--{
-- pciBusInfo_t *pBusInfo;
-- sparcDomainPtr pDomain;
-- int bus;
--
-- if (PCI_BDEV_FROM_TAG(tag))
-- sparcPciCfgWrite32(tag, off, val);
-- else if (!PCI_FUNC_FROM_TAG(tag) &&
-- (off >= 0) && (off <= 252) && !(off & 3) &&
-- ((bus = PCI_BUS_FROM_TAG(tag)) < pciNumBuses) &&
-- (pBusInfo = pciBusInfo[bus]) &&
-- (pDomain = pBusInfo->pciBusPriv) &&
-- (bus == pDomain->bus_min)) {
-- if (off < 8) {
-- val = PCI_CPU(val);
-- PciReg(pDomain->pci, tag, off , CARD16) = val >> 16;
-- PciReg(pDomain->pci, tag, off + 2, CARD16) = val;
-- } else {
-- PciReg(pDomain->pci, tag, off , CARD8) = val;
-- PciReg(pDomain->pci, tag, off + 1, CARD8) = val >> 8;
-- PciReg(pDomain->pci, tag, off + 2, CARD8) = val >> 16;
-- PciReg(pDomain->pci, tag, off + 3, CARD8) = val >> 24;
-- }
-- }
--}
--
--static void
--sabrePciCfgSetBits32(PCITAG tag, int off, CARD32 mask, CARD32 bits)
--{
-- CARD32 PciVal;
--
-- PciVal = sabrePciCfgRead32(tag, off);
-- PciVal &= ~mask;
-- PciVal |= bits;
-- sabrePciCfgWrite32(tag, off, PciVal);
--}
--
--static pciBusFuncs_t sabrePCIFunctions =
--{
-- sabrePciCfgRead32,
-- sabrePciCfgWrite32,
-- sabrePciCfgSetBits32,
-- pciAddrNOOP,
-- pciAddrNOOP
--};
--
--static int pagemask;
--
--/* Scan PROM for all PCI host bridges in the system */
--void
--sparcPciInit(void)
--{
-- int node, node2;
--
-- if (!xf86LinearVidMem())
-- return;
--
-- apertureFd = open(apertureDevName, O_RDWR);
-- if (apertureFd < 0) {
-- xf86Msg(X_ERROR,
-- "sparcPciInit: open failure: %s\n", strerror(errno));
-- return;
-- }
--
-- sparcPromInit();
-- pagemask = getpagesize() - 1;
--
-- for (node = promGetChild(promRootNode);
-- node;
-- node = promGetSibling(node)) {
-- unsigned long long pci_addr;
-- sparcDomainRec domain;
-- sparcDomainPtr pDomain;
-- pciBusFuncs_p pFunctions;
-- char *prop_val;
-- int prop_len, bus;
--
-- prop_val = promGetProperty("name", &prop_len);
-- /* Some PROMs include the trailing null; some don't */
-- if (!prop_val || (prop_len < 3) || (prop_len > 4) ||
-- strcmp(prop_val, "pci"))
-- continue;
--
-- prop_val = promGetProperty("model", &prop_len);
-- if (!prop_val || (prop_len <= 0)) {
-- prop_val = promGetProperty("compatible", &prop_len);
-- if (!prop_val || (prop_len <= 0))
-- continue;
-- }
--
-- pFunctions = &sparcPCIFunctions;
-- (void)memset(&domain, 0, sizeof(domain));
--
-- if (!strncmp("SUNW,sabre", prop_val, prop_len) ||
-- !strncmp("pci108e,a000", prop_val, prop_len) ||
-- !strncmp("pci108e,a001", prop_val, prop_len)) {
-- /*
-- * There can only be one "Sabre" bridge in a system. It provides
-- * PCI configuration space, a 24-bit I/O space and a 32-bit memory
-- * space, all three of which are at fixed physical CPU addresses.
-- */
-- static Bool sabre_seen = FALSE;
--
-- xf86Msg(X_INFO,
-- "Sabre or Hummingbird PCI host bridge found (\"%s\")\n",
-- prop_val);
--
-- /* There can only be one Sabre */
-- if (sabre_seen)
-- continue;
-- sabre_seen = TRUE;
--
-- /* Get "bus-range" property */
-- prop_val = promGetProperty("bus-range", &prop_len);
-- if (!prop_val || (prop_len != 8) ||
-- (((unsigned int *)prop_val)[0]) ||
-- (((unsigned int *)prop_val)[1] >= 256))
-- continue;
--
-- pci_addr = 0x01fe01000000ull;
-- domain.io_addr = 0x01fe02000000ull;
-- domain.io_size = 0x000001000000ull;
-- domain.mem_addr = 0x01ff00000000ull;
-- domain.mem_size = 0x000100000000ull;
-- domain.bus_min = 0; /* Always */
-- domain.bus_max = ((int *)prop_val)[1];
--
-- pFunctions = &sabrePCIFunctions;
-- } else
-- if (!strncmp("SUNW,psycho", prop_val, prop_len) ||
-- !strncmp("pci108e,8000", prop_val, prop_len)) {
-- /*
-- * A "Psycho" host bridge provides two PCI interfaces, each with
-- * its own 16-bit I/O and 31-bit memory spaces. Both share the
-- * same PCI configuration space. Here, they are assigned separate
-- * domain numbers to prevent unintentional I/O and/or memory
-- * resource conflicts.
-- */
-- xf86Msg(X_INFO,
-- "Psycho PCI host bridge found (\"%s\")\n", prop_val);
--
-- /* Get "bus-range" property */
-- prop_val = promGetProperty("bus-range", &prop_len);
-- if (!prop_val || (prop_len != 8) ||
-- (((unsigned int *)prop_val)[1] >= 256) ||
-- (((unsigned int *)prop_val)[0] > ((unsigned int *)prop_val)[1]))
-- continue;
--
-- domain.bus_min = ((int *)prop_val)[0];
-- domain.bus_max = ((int *)prop_val)[1];
--
-- /* Get "ranges" property */
-- prop_val = promGetProperty("ranges", &prop_len);
-- if (!prop_val || (prop_len != 112) ||
-- prop_val[0] || (prop_val[28] != 0x01u) ||
-- (prop_val[56] != 0x02u) || (prop_val[84] != 0x03u) ||
-- (((unsigned int *)prop_val)[4] != 0x01000000u) ||
-- ((unsigned int *)prop_val)[5] ||
-- ((unsigned int *)prop_val)[12] ||
-- (((unsigned int *)prop_val)[13] != 0x00010000u) ||
-- ((unsigned int *)prop_val)[19] ||
-- (((unsigned int *)prop_val)[20] != 0x80000000u) ||
-- ((((unsigned int *)prop_val)[11] & ~0x00010000u) !=
-- 0x02000000u) ||
-- (((unsigned int *)prop_val)[18] & ~0x80000000u) ||
-- (((unsigned int *)prop_val)[3] !=
-- ((unsigned int *)prop_val)[10]) ||
-- (((unsigned int *)prop_val)[17] !=
-- ((unsigned int *)prop_val)[24]) ||
-- (((unsigned int *)prop_val)[18] !=
-- ((unsigned int *)prop_val)[25]) ||
-- (((unsigned int *)prop_val)[19] !=
-- ((unsigned int *)prop_val)[26]) ||
-- (((unsigned int *)prop_val)[20] !=
-- ((unsigned int *)prop_val)[27]))
-- continue;
--
-- /* Use memcpy() to avoid alignment issues */
-- (void)memcpy(&pci_addr, prop_val + 12,
-- sizeof(pci_addr));
-- (void)memcpy(&domain.io_addr, prop_val + 40,
-- sizeof(domain.io_addr));
-- (void)memcpy(&domain.mem_addr, prop_val + 68,
-- sizeof(domain.mem_addr));
--
-- domain.io_size = 0x000000010000ull;
-- domain.mem_size = 0x000080000000ull;
-- } else
-- if (!strncmp("SUNW,schizo", prop_val, prop_len) ||
-- !strncmp("pci108e,8001", prop_val, prop_len)) {
-- /*
-- * I have no docs on the "Schizo", but judging from the Linux
-- * kernel, it also provides two PCI domains. Each PCI
-- * configuration space is the usual 16M in size, followed by a
-- * variable-length I/O space. Each domain also provides a
-- * variable-length memory space. The kernel seems to think the I/O
-- * spaces are 16M long, and the memory spaces, 2G, but these
-- * assumptions are actually only present in source code comments.
-- * Sun has, however, confirmed to me the validity of these
-- * assumptions.
-- */
-- volatile unsigned long long mem_match, mem_mask, io_match, io_mask;
-- unsigned long Offset;
-- pointer pSchizo;
--
-- xf86Msg(X_INFO,
-- "Schizo PCI host bridge found (\"%s\")\n", prop_val);
--
-- /* Get "bus-range" property */
-- prop_val = promGetProperty("bus-range", &prop_len);
-- if (!prop_val || (prop_len != 8) ||
-- (((unsigned int *)prop_val)[1] >= 256) ||
-- (((unsigned int *)prop_val)[0] > ((unsigned int *)prop_val)[1]))
-- continue;
--
-- domain.bus_min = ((int *)prop_val)[0];
-- domain.bus_max = ((int *)prop_val)[1];
--
-- /* Get "reg" property */
-- prop_val = promGetProperty("reg", &prop_len);
-- if (!prop_val || (prop_len != 48))
-- continue;
--
-- /* Temporarily map some of Schizo's registers */
-- pSchizo = sparcMapAperture(-1, VIDMEM_MMIO,
-- ((unsigned long long *)prop_val)[2] - 0x000000010000ull,
-- 0x00010000ul);
--
-- /* Determine where PCI config, I/O and memory spaces reside */
-- if ((((unsigned long long *)prop_val)[0] & 0x000000700000ull) ==
-- 0x000000600000ull)
-- Offset = 0x0040;
-- else
-- Offset = 0x0060;
--
-- mem_match = PciReg(pSchizo, 0, Offset, unsigned long long);
-- mem_mask = PciReg(pSchizo, 0, Offset + 8, unsigned long long);
-- io_match = PciReg(pSchizo, 0, Offset + 16, unsigned long long);
-- io_mask = PciReg(pSchizo, 0, Offset + 24, unsigned long long);
--
-- /* Unmap Schizo registers */
-- xf86UnMapVidMem(-1, pSchizo, 0x00010000ul);
--
-- /* Calculate sizes */
-- mem_mask = (((mem_mask - 1) ^ mem_mask) >> 1) + 1;
-- io_mask = (((io_mask - 1) ^ io_mask ) >> 1) + 1;
--
-- if (io_mask <= 0x000001000000ull) /* Nothing left for I/O */
-- continue;
--
-- domain.mem_addr = mem_match & ~0x8000000000000000ull;
-- domain.mem_size = mem_mask;
-- pci_addr = io_match & ~0x8000000000000000ull;
-- domain.io_addr = pci_addr + 0x0000000001000000ull;
-- domain.io_size = io_mask - 0x0000000001000000ull;
-- } else {
-- xf86Msg(X_WARNING, "Unknown PCI host bridge: \"%s\"\n", prop_val);
-- continue;
-- }
--
-- /* Only map as much PCI configuration as we need */
-- domain.pci = (char *)sparcMapAperture(-1, VIDMEM_MMIO,
-- pci_addr + PCI_MAKE_TAG(domain.bus_min, 0, 0),
-- PCI_MAKE_TAG(domain.bus_max - domain.bus_min + 1, 0, 0)) -
-- PCI_MAKE_TAG(domain.bus_min, 0, 0);
--
-- /* Allocate a domain record */
-- pDomain = xnfalloc(sizeof(sparcDomainRec));
-- *pDomain = domain;
--
-- /*
-- * Allocate and prime pciBusInfo records. These are allocated one at a
-- * time because those for empty buses are eventually released.
-- */
-- bus = pDomain->bus_min =
-- PCI_MAKE_BUS(pciNumDomains, domain.bus_min);
-- pciNumBuses = pDomain->bus_max =
-- PCI_MAKE_BUS(pciNumDomains, domain.bus_max) + 1;
--
-- pciBusInfo[bus] = xnfcalloc(1, sizeof(pciBusInfo_t));
-- pciBusInfo[bus]->configMech = PCI_CFG_MECH_OTHER;
-- pciBusInfo[bus]->numDevices = 32;
-- pciBusInfo[bus]->funcs = pFunctions;
-- pciBusInfo[bus]->pciBusPriv = pDomain;
-- while (++bus < pciNumBuses) {
-- pciBusInfo[bus] = xnfalloc(sizeof(pciBusInfo_t));
-- *(pciBusInfo[bus]) = *(pciBusInfo[bus - 1]);
-- pciBusInfo[bus]->funcs = &sparcPCIFunctions;
-- }
--
-- /* Next domain, please... */
-- xf86DomainInfo[pciNumDomains++] = pDomain;
--
-- /*
-- * OK, enough of the straight-forward stuff. Time to deal with some
-- * brokenness...
-- *
-- * The PCI specs require that when a bus transaction remains unclaimed
-- * for too long, the master entity on that bus is to cancel the
-- * transaction it issued or passed on with a master abort. Two
-- * outcomes are possible:
-- *
-- * - the master abort can be treated as an error that is propogated
-- * back through the bus tree to the entity that ultimately originated
-- * the transaction; or
-- * - the transaction can be allowed to complete normally, which means
-- * that writes are ignored and reads return all ones.
-- *
-- * In the first case, if the CPU happens to be at the tail end of the
-- * tree path through one of its host bridges, it will be told there is
-- * a hardware mal-function, despite being generated by software.
-- *
-- * For a software function (be it firmware, OS or userland application)
-- * to determine how a PCI bus tree is populated, it must be able to
-- * detect when master aborts occur. Obviously, PCI discovery is much
-- * simpler when master aborts are allowed to complete normally.
-- *
-- * Unfortunately, a number of non-Intel PCI implementations have chosen
-- * to treat master aborts as severe errors. The net effect is to
-- * cripple PCI discovery algorithms in userland.
-- *
-- * On SPARCs, master aborts cause a number of different behaviours,
-- * including delivering a signal to the userland application, rebooting
-- * the system, "dropping down" to firmware, or, worst of all, bus
-- * lockouts. Even in the first case, the SIGBUS signal that is
-- * eventually generated isn't delivered in a timely enough fashion to
-- * allow an application to reliably detect the master abort that
-- * ultimately caused it.
-- *
-- * This can be somewhat mitigated. On all architectures, master aborts
-- * that occur on secondary buses can be forced to complete normally
-- * because the PCI-to-PCI bridges that serve them are governed by an
-- * industry-wide specification. (This is just another way of saying
-- * that whatever justification there might be for erroring out master
-- * aborts is deemed by the industry as insufficient to generate more
-- * PCI non-compliance than there already is...)
-- *
-- * This leaves us with master aborts that occur on primary buses.
-- * There is no specification for host-to-PCI bridges. Bridges used in
-- * SPARCs can be told to ignore all PCI errors, but not specifically
-- * master aborts. Not only is this too coarse-grained, but
-- * master-aborted read transactions on the primary bus end up returning
-- * garbage rather than all ones.
-- *
-- * I have elected to work around this the only way I can think of doing
-- * so right now. The following scans an additional PROM level and
-- * builds a device/function map for the primary bus. I can only hope
-- * this PROM information represents all devices on the primary bus,
-- * rather than only a subset of them.
-- *
-- * Master aborts are useful in other ways too, that are not addressed
-- * here. These include determining whether or not a domain provides
-- * VGA, or if a PCI device actually implements PCI disablement.
-- *
-- * --- TSI @ UQV 2001.09.19
-- */
-- for (node2 = promGetChild(node);
-- node2;
-- node2 = promGetSibling(node2)) {
-- /* Get "reg" property */
-- prop_val = promGetProperty("reg", &prop_len);
-- if (!prop_val || (prop_len % 20))
-- continue;
--
-- /*
-- * It's unnecessary to scan the entire "reg" property, but I'll do
-- * so anyway.
-- */
-- prop_len /= 20;
-- for (; prop_len--; prop_val += 20)
-- SetBitInMap(PCI_DFN_FROM_TAG(*(PCITAG *)prop_val),
-- pDomain->dfn_mask);
-- }
--
-- /* Assume the host bridge is device 0, function 0 on its bus */
-- SetBitInMap(0, pDomain->dfn_mask);
-- }
--
-- sparcPromClose();
--
-- close(apertureFd);
-- apertureFd = -1;
--}
--
--#ifndef INCLUDE_XF86_NO_DOMAIN
--
--_X_EXPORT int
--xf86GetPciDomain(PCITAG Tag)
--{
-- return PCI_DOM_FROM_TAG(Tag);
--}
--
--_X_EXPORT pointer
--xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
-- ADDRESS Base, unsigned long Size)
--{
-- sparcDomainPtr pDomain;
-- pointer result;
-- int domain = PCI_DOM_FROM_TAG(Tag);
--
-- if ((domain <= 0) || (domain >= pciNumDomains) ||
-- !(pDomain = xf86DomainInfo[domain]) ||
-- (((unsigned long long)Base + (unsigned long long)Size) >
-- pDomain->mem_size))
-- FatalError("xf86MapDomainMemory() called with invalid parameters.\n");
--
-- result = sparcMapAperture(ScreenNum, Flags, pDomain->mem_addr + Base, Size);
--
-- if (apertureFd >= 0) {
-- close(apertureFd);
-- apertureFd = -1;
-- }
--
-- return result;
--}
--
--_X_EXPORT IOADDRESS
--xf86MapLegacyIO(int ScreenNum, int Flags, PCITAG Tag,
-- IOADDRESS Base, unsigned long Size)
--{
-- sparcDomainPtr pDomain;
-- int domain = PCI_DOM_FROM_TAG(Tag);
--
-- if ((domain <= 0) || (domain >= pciNumDomains) ||
-- !(pDomain = xf86DomainInfo[domain]) ||
-- (((unsigned long long)Base + (unsigned long long)Size) >
-- pDomain->io_size))
-- FatalError("xf86MapLegacyIO() called with invalid parameters.\n");
--
-- /* Permanently map all of I/O space */
-- if (!pDomain->io) {
-- pDomain->io = sparcMapAperture(ScreenNum, Flags,
-- pDomain->io_addr, pDomain->io_size);
--
-- if (apertureFd >= 0) {
-- close(apertureFd);
-- apertureFd = -1;
-- }
-- }
--
-- return (IOADDRESS)pDomain->io + Base;
--}
--
--resPtr
--xf86AccResFromOS(resPtr pRes)
--{
-- sparcDomainPtr pDomain;
-- resRange range;
-- int domain;
--
-- for (domain = 1; domain < pciNumDomains; domain++) {
-- if (!(pDomain = xf86DomainInfo[domain]))
-- continue;
--
-- /*
-- * At minimum, the top and bottom resources must be claimed, so that
-- * resources that are (or appear to be) unallocated can be relocated.
-- */
-- RANGE(range, 0x00000000u, 0x0009ffffu,
-- RANGE_TYPE(ResExcMemBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
-- RANGE(range, 0x000c0000u, 0x000effffu,
-- RANGE_TYPE(ResExcMemBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
-- RANGE(range, 0x000f0000u, 0x000fffffu,
-- RANGE_TYPE(ResExcMemBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
--
-- RANGE(range, pDomain->mem_size - 1, pDomain->mem_size - 1,
-- RANGE_TYPE(ResExcMemBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
--
-- RANGE(range, 0x00000000u, 0x00000000u,
-- RANGE_TYPE(ResExcIoBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
-- RANGE(range, pDomain->io_size - 1, pDomain->io_size - 1,
-- RANGE_TYPE(ResExcIoBlock, domain));
-- pRes = xf86AddResToList(pRes, &range, -1);
-- }
--
-- return pRes;
--}
--
--#endif /* !INCLUDE_XF86_NO_DOMAIN */
--
--#endif /* defined(sun) */
--
--#if defined(ARCH_PCI_PCI_BRIDGE)
--
--/* Definitions specific to Sun's APB P2P bridge (a.k.a. Simba) */
--#define APB_IO_ADDRESS_MAP 0xDE
--#define APB_MEM_ADDRESS_MAP 0xDF
--
--/*
-- * Simba's can only occur on bus 0. Furthermore, Simba's must have a non-zero
-- * device/function number because the Sabre interface they must connect to
-- * occupies the 0:0:0 slot. Also, there can be only one Sabre interface in the
-- * system, and therefore, only one Simba function can route any particular
-- * resource. Thus, it is appropriate to use a single set of static variables
-- * to hold the tag of the Simba function routing a VGA resource range at any
-- * one time, and to test these variables for non-zero to determine whether or
-- * not the Sabre would master-abort a VGA access (and kill the system).
-- *
-- * The trick is to determine when it is safe to re-route VGA, because doing so
-- * re-routes much more.
-- */
--static PCITAG simbavgaIOTag = 0, simbavgaMemTag = 0;
--static Bool simbavgaRoutingAllow = TRUE;
--
--/*
-- * Scan the bus subtree rooted at 'bus' for a non-display device that might be
-- * decoding the bottom 2 MB of I/O space and/or the bottom 512 MB of memory
-- * space. Reset simbavgaRoutingAllow if such a device is found.
-- *
-- * XXX For now, this is very conservative and should be made less so as the
-- * need arises.
-- */
--static void
--simbaCheckBus(CARD16 pcicommand, int bus)
--{
-- pciConfigPtr pPCI, *ppPCI = xf86scanpci(0);
--
-- while ((pPCI = *ppPCI++)) {
-- if (pPCI->busnum < bus)
-- continue;
-- if (pPCI->busnum > bus)
-- break;
--
-- /* XXX Assume all devices respect PCI disablement */
-- if (!(pcicommand & pPCI->pci_command))
-- continue;
--
-- /* XXX This doesn't deal with mis-advertised classes */
-- switch (pPCI->pci_base_class) {
-- case PCI_CLASS_PREHISTORIC:
-- if (pPCI->pci_sub_class == PCI_SUBCLASS_PREHISTORIC_VGA)
-- continue; /* Ignore VGA */
-- break;
--
-- case PCI_CLASS_DISPLAY:
-- continue;
--
-- case PCI_CLASS_BRIDGE:
-- switch (pPCI->pci_sub_class) {
-- case PCI_SUBCLASS_BRIDGE_PCI:
-- case PCI_SUBCLASS_BRIDGE_CARDBUS:
-- /* Scan secondary bus */
-- /* XXX First check bridge routing? */
-- simbaCheckBus(pcicommand & pPCI->pci_command,
-- PCI_SECONDARY_BUS_EXTRACT(pPCI->pci_pp_bus_register,
-- pPCI->tag));
-- if (!simbavgaRoutingAllow)
-- return;
--
-- default:
-- break;
-- }
--
-- default:
-- break;
-- }
--
-- /*
-- * XXX We could check the device's bases here, but PCI doesn't limit
-- * the device's decoding to them.
-- */
--
-- simbavgaRoutingAllow = FALSE;
-- break;
-- }
--}
--
--static pciConfigPtr
--simbaVerifyBus(int bus)
--{
-- pciConfigPtr pPCI;
-- if ((bus < 0) || (bus >= pciNumBuses) ||
-- !pciBusInfo[bus] || !(pPCI = pciBusInfo[bus]->bridge) ||
-- (pPCI->pci_device_vendor != DEVID(VENDOR_SUN, CHIP_SIMBA)))
-- return NULL;
--
-- return pPCI;
--}
--
--static CARD16
--simbaControlBridge(int bus, CARD16 mask, CARD16 value)
--{
-- pciConfigPtr pPCI;
-- CARD16 current = 0, tmp;
-- CARD8 iomap, memmap;
--
-- if ((pPCI = simbaVerifyBus(bus))) {
-- /*
-- * The Simba does not implement VGA enablement as described in the P2P
-- * spec. It does however route I/O and memory in large enough chunks
-- * so that we can determine were VGA resources would be routed
-- * (including ISA VGA I/O aliases). We can allow changes to that
-- * routing only under certain circumstances.
-- */
-- iomap = pciReadByte(pPCI->tag, APB_IO_ADDRESS_MAP);
-- memmap = pciReadByte(pPCI->tag, APB_MEM_ADDRESS_MAP);
-- if (iomap & memmap & 0x01) {
-- current |= PCI_PCI_BRIDGE_VGA_EN;
-- if ((mask & PCI_PCI_BRIDGE_VGA_EN) &&
-- !(value & PCI_PCI_BRIDGE_VGA_EN)) {
-- if (!simbavgaRoutingAllow) {
-- xf86MsgVerb(X_WARNING, 3, "Attempt to disable VGA routing"
-- " through Simba at %x:%x:%x disallowed.\n",
-- pPCI->busnum, pPCI->devnum, pPCI->funcnum);
-- value |= PCI_PCI_BRIDGE_VGA_EN;
-- } else {
-- pciWriteByte(pPCI->tag, APB_IO_ADDRESS_MAP,
-- iomap & ~0x01);
-- pciWriteByte(pPCI->tag, APB_MEM_ADDRESS_MAP,
-- memmap & ~0x01);
-- simbavgaIOTag = simbavgaMemTag = 0;
-- }
-- }
-- } else {
-- if (mask & value & PCI_PCI_BRIDGE_VGA_EN) {
-- if (!simbavgaRoutingAllow) {
-- xf86MsgVerb(X_WARNING, 3, "Attempt to enable VGA routing"
-- " through Simba at %x:%x:%x disallowed.\n",
-- pPCI->busnum, pPCI->devnum, pPCI->funcnum);
-- value &= ~PCI_PCI_BRIDGE_VGA_EN;
-- } else {
-- if (pPCI->tag != simbavgaIOTag) {
-- if (simbavgaIOTag) {
-- tmp = pciReadByte(simbavgaIOTag,
-- APB_IO_ADDRESS_MAP);
-- pciWriteByte(simbavgaIOTag, APB_IO_ADDRESS_MAP,
-- tmp & ~0x01);
-- }
--
-- pciWriteByte(pPCI->tag, APB_IO_ADDRESS_MAP,
-- iomap | 0x01);
-- simbavgaIOTag = pPCI->tag;
-- }
--
-- if (pPCI->tag != simbavgaMemTag) {
-- if (simbavgaMemTag) {
-- tmp = pciReadByte(simbavgaMemTag,
-- APB_MEM_ADDRESS_MAP);
-- pciWriteByte(simbavgaMemTag, APB_MEM_ADDRESS_MAP,
-- tmp & ~0x01);
-- }
--
-- pciWriteByte(pPCI->tag, APB_MEM_ADDRESS_MAP,
-- memmap | 0x01);
-- simbavgaMemTag = pPCI->tag;
-- }
-- }
-- }
-- }
--
-- /* Move on to master abort failure enablement (as per P2P spec) */
-- tmp = pciReadWord(pPCI->tag, PCI_PCI_BRIDGE_CONTROL_REG);
-- current |= tmp;
-- if (tmp & PCI_PCI_BRIDGE_MASTER_ABORT_EN) {
-- if ((mask & PCI_PCI_BRIDGE_MASTER_ABORT_EN) &&
-- !(value & PCI_PCI_BRIDGE_MASTER_ABORT_EN))
-- pciWriteWord(pPCI->tag, PCI_PCI_BRIDGE_CONTROL_REG,
-- tmp & ~PCI_PCI_BRIDGE_MASTER_ABORT_EN);
-- } else {
-- if (mask & value & PCI_PCI_BRIDGE_MASTER_ABORT_EN)
-- pciWriteWord(pPCI->tag, PCI_PCI_BRIDGE_CONTROL_REG,
-- tmp | PCI_PCI_BRIDGE_MASTER_ABORT_EN);
-- }
--
-- /* Insert emulation of other P2P controls here */
-- }
--
-- return (current & ~mask) | (value & mask);
--}
--
--static void
--simbaGetBridgeResources(int bus,
-- pointer *ppIoRes,
-- pointer *ppMemRes,
-- pointer *ppPmemRes)
--{
-- pciConfigPtr pPCI = simbaVerifyBus(bus);
-- resRange range;
-- int i;
--
-- if (!pPCI)
-- return;
--
-- if (ppIoRes) {
-- xf86FreeResList(*ppIoRes);
-- *ppIoRes = NULL;
--
-- if (pPCI->pci_command & PCI_CMD_IO_ENABLE) {
-- unsigned char iomap = pciReadByte(pPCI->tag, APB_IO_ADDRESS_MAP);
-- if (simbavgaRoutingAllow)
-- iomap |= 0x01;
-- for (i = 0; i < 8; i++) {
-- if (iomap & (1 << i)) {
-- RANGE(range, i << 21, ((i + 1) << 21) - 1,
-- RANGE_TYPE(ResExcIoBlock,
-- xf86GetPciDomain(pPCI->tag)));
-- *ppIoRes = xf86AddResToList(*ppIoRes, &range, -1);
-- }
-- }
-- }
-- }
--
-- if (ppMemRes) {
-- xf86FreeResList(*ppMemRes);
-- *ppMemRes = NULL;
--
-- if (pPCI->pci_command & PCI_CMD_MEM_ENABLE) {
-- unsigned char memmap = pciReadByte(pPCI->tag, APB_MEM_ADDRESS_MAP);
-- if (simbavgaRoutingAllow)
-- memmap |= 0x01;
-- for (i = 0; i < 8; i++) {
-- if (memmap & (1 << i)) {
-- RANGE(range, i << 29, ((i + 1) << 29) - 1,
-- RANGE_TYPE(ResExcMemBlock,
-- xf86GetPciDomain(pPCI->tag)));
-- *ppMemRes = xf86AddResToList(*ppMemRes, &range, -1);
-- }
-- }
-- }
-- }
--
-- if (ppPmemRes) {
-- xf86FreeResList(*ppPmemRes);
-- *ppPmemRes = NULL;
-- }
--}
--
--void ARCH_PCI_PCI_BRIDGE(pciConfigPtr pPCI)
--{
-- static pciBusFuncs_t simbaBusFuncs;
-- pciBusInfo_t *pBusInfo;
-- CARD16 pcicommand;
--
-- if (pPCI->pci_device_vendor != DEVID(VENDOR_SUN, CHIP_SIMBA))
-- return;
--
-- pBusInfo = pPCI->businfo;
--
-- simbaBusFuncs = *(pBusInfo->funcs);
-- simbaBusFuncs.pciControlBridge = simbaControlBridge;
-- simbaBusFuncs.pciGetBridgeResources = simbaGetBridgeResources;
--
-- pBusInfo->funcs = &simbaBusFuncs;
--
-- if (!simbavgaRoutingAllow)
-- return;
--
-- pcicommand = 0;
--
-- if (pciReadByte(pPCI->tag, APB_IO_ADDRESS_MAP) & 0x01) {
-- pcicommand |= PCI_CMD_IO_ENABLE;
-- simbavgaIOTag = pPCI->tag;
-- }
--
-- if (pciReadByte(pPCI->tag, APB_MEM_ADDRESS_MAP) & 0x01) {
-- pcicommand |= PCI_CMD_MEM_ENABLE;
-- simbavgaMemTag = pPCI->tag;
-- }
--
-- if (!pcicommand)
-- return;
--
-- simbaCheckBus(pcicommand,
-- PCI_SECONDARY_BUS_EXTRACT(pPCI->pci_pp_bus_register, pPCI->tag));
--}
--
--#endif /* defined(ARCH_PCI_PCI_BRIDGE) */
---
-1.4.1
-
--- a/open-src/xserver/xorg/resource-names.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/resource-names.patch Fri May 15 09:36:46 2009 -0700
@@ -407,10 +407,10 @@
index a7a21ec..ffc4299 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
-@@ -1143,8 +1143,10 @@ XInputExtensionInit(void)
- IEventBase = extEntry->eventBase;
+@@ -988,8 +988,10 @@ XInputExtensionInit(void)
AllExtensionVersions[IReqCode - 128] = thisversion;
MakeDeviceTypeAtoms();
+ XIInitKnownProperties();
- RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
- RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
+ RT_INPUTCLIENT = CreateNewResourceTypeNamed(
--- a/open-src/xserver/xorg/restore-kbd-mouse.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/restore-kbd-mouse.patch Fri May 15 09:36:46 2009 -0700
@@ -1,19 +1,68 @@
-From aeb01b73c94b5c2154406695970494a408ba1fba Mon Sep 17 00:00:00 2001
+From f4111b898ea33d8d5015347f6192fc704dd1381a Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <[email protected]>
-Date: Wed, 14 Jan 2009 18:53:15 -0800
+Date: Thu, 22 Jan 2009 19:46:25 -0800
+Subject: [PATCH] Revert "If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'."
+
+This reverts commit d6129ebf8dad9cfbc13dc8db7c780b023bf9a60b.
+---
+ hw/xfree86/common/xf86Config.c | 5 ++---
+ hw/xfree86/doc/man/xorg.conf.man.pre | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 6c6fac3..241c19d 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -2472,14 +2472,13 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
+ while(*dev)
+ {
+ if (strcmp((*dev)->driver, "kbd") == 0 ||
+- strcmp((*dev)->driver, "mouse") == 0 ||
+- strcmp((*dev)->driver, "vmmouse") == 0)
++ strcmp((*dev)->driver, "mouse") == 0)
+ {
+ IDevPtr *current;
+ if (!warned)
+ {
+ xf86Msg(X_WARNING, "AllowEmptyInput is on, devices using "
+- "drivers 'kbd', 'mouse' or 'vmmouse' will be disabled.\n");
++ "drivers 'kbd' or 'mouse' will be disabled.\n");
+ warned = TRUE;
+ }
+
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index d9a4b35..4f1ba00 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -662,7 +662,7 @@ the X server to load. Disabled by default.
+ If enabled, don't add the standard keyboard and mouse drivers, if there are no
+ input devices in the config file. Enabled by default if AutoAddDevices and
+ AutoEnableDevices is enabled, otherwise disabled.
+-If AllowEmptyInput is on, devices using the kbd, mouse or vmmouse driver are ignored.
++If AllowEmptyInput is on, devices using the kbd or mouse driver are ignored.
+ .TP 7
+ .BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
+ If this option is disabled, then no devices will be added from HAL events.
+
+--
+1.5.6.5
+
+From e4d881a4a8ef743361ff62bcb766dd0e8d15c02e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 22 Jan 2009 19:47:11 -0800
Subject: [PATCH] Revert "xfree86: If AEI is on, disable "kbd" and "mouse" devices."
-This reverts commit 3245bf113619500b7b6cae3a3f31ddd2984cbc05.
+This reverts commit c264826da96ad1859dd112b17eb8aa9e5278478f.
---
hw/xfree86/common/xf86Config.c | 39 +--------------------------------
hw/xfree86/doc/man/xorg.conf.man.pre | 1 -
2 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index e91eadd..a1c2e34 100644
+index 241c19d..5b981e5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
-@@ -1340,7 +1340,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
+@@ -1292,7 +1292,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
}
/* 4. First pointer with 'mouse' as the driver. */
@@ -22,7 +71,7 @@
confInput = xf86findInput(CONF_IMPLICIT_POINTER,
xf86configptr->conf_input_lst);
if (!confInput) {
-@@ -1480,7 +1480,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
+@@ -1432,7 +1432,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
}
/* 4. First keyboard with 'keyboard' or 'kbd' as the driver. */
@@ -31,7 +80,7 @@
confInput = xf86findInput(CONF_IMPLICIT_KEYBOARD,
xf86configptr->conf_input_lst);
if (!confInput) {
-@@ -2481,41 +2481,6 @@ addDefaultModes(MonPtr monitorp)
+@@ -2460,41 +2460,6 @@ addDefaultModes(MonPtr monitorp)
static void
checkInput(serverLayoutPtr layout, Bool implicit_layout) {
checkCoreInputDevices(layout, implicit_layout);
@@ -74,10 +123,10 @@
/*
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index de93aaf..74f8cef 100644
+index 4f1ba00..34339a9 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -698,7 +698,6 @@ the X server to load. Disabled by default.
+@@ -662,7 +662,6 @@ the X server to load. Disabled by default.
If enabled, don't add the standard keyboard and mouse drivers, if there are no
input devices in the config file. Enabled by default if AutoAddDevices and
AutoEnableDevices is enabled, otherwise disabled.
@@ -85,61 +134,6 @@
.TP 7
.BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
If this option is disabled, then no devices will be added from HAL events.
---
-1.5.6.5
-
-From 93d5891e83cc264c31f4da269434fec43a1900eb Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Wed, 14 Jan 2009 23:17:23 -0800
-Subject: [PATCH] Revert "xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled."
-
-This reverts commit c30f36c8c1dfd85deaf1c109823a1f15dd218ac7.
----
- hw/xfree86/common/xf86Config.c | 8 +++++---
- hw/xfree86/doc/man/xorg.conf.man.pre | 3 +--
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index a1c2e34..3812fe0 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -1088,9 +1088,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
- }
- #endif
-
-- /* AllowEmptyInput is automatically true if we're hotplugging */
-- xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
-- xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
-+ xf86Info.allowEmptyInput = FALSE;
-+ if (xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &value))
-+ xf86Info.allowEmptyInput = TRUE;
-
- xf86Info.useDefaultFontPath = TRUE;
- xf86Info.useDefaultFontPathFrom = X_DEFAULT;
-@@ -1879,6 +1879,8 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen)
- indp = xnfalloc(sizeof(IDevPtr));
- *indp = NULL;
- servlayoutp->inputs = indp;
-+ if (!xf86Info.allowEmptyInput && !checkCoreInputDevices(servlayoutp, TRUE))
-+ return FALSE;
-
- return TRUE;
- }
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 74f8cef..9f39808 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -696,8 +696,7 @@ the X server to load. Disabled by default.
- .TP 7
- .BI "Option \*qAllowEmptyInput\*q \*q" boolean \*q
- If enabled, don't add the standard keyboard and mouse drivers, if there are no
--input devices in the config file. Enabled by default if AutoAddDevices and
--AutoEnableDevices is enabled, otherwise disabled.
-+input devices in the config file. Disabled by default.
- .TP 7
- .BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
- If this option is disabled, then no devices will be added from HAL events.
--
1.5.6.5
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/restore-zap.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,84 @@
+From 737b49199a05299486064e6e762cf2a2f6f95be6 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[email protected]>
+Date: Thu, 9 Apr 2009 15:40:24 +1000
+Subject: [PATCH] xfree86: restore default off for DontZap
+
+Zapping is triggered by xkb these days, so note in the man page that it's the
+Terminate_Server action. Since it's XKB, personal preferences towards or
+against zapping should be achieved through xkb rulesets.
+If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
+don't need a default of DontZap "on".
+
+This patch restores the old meaning of DontZap - disallow zapping altogether,
+regardless of XKB's current keymap.
+Ideally, this patch should be accompanied by b0f64bdab00db652e in
+xkeyboard-config.
+
+Signed-off-by: Peter Hutterer <[email protected]>
+---
+ doc/Xserver.man.pre | 2 +-
+ hw/xfree86/common/xf86Config.c | 5 ++---
+ hw/xfree86/doc/man/xorg.conf.man.pre | 11 +++++------
+ 3 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
+index e9a3b9c..e2673f7 100644
+--- a/doc/Xserver.man.pre
++++ b/doc/Xserver.man.pre
+@@ -219,7 +219,7 @@ turns on auto-repeat.
+ starts the stipple with the classic stipple and cursor visible. The default
+ is to start with a black root window, and to suppress display of the cursor
+ until the first time an application calls XDefineCursor(). For the Xorg
+-server, this also changes the default for the DontZap option to FALSE. For
++server, this also sets the default for the DontZap option to FALSE. For
+ kdrive servers, this implies -zap.
+ .TP 8
+ .B \-s \fIminutes\fP
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 7ea6197..8b07566 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -726,7 +726,7 @@ static OptionInfoRec FlagOptions[] = {
+ { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
+ {0}, FALSE },
+ { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
+- {0}, TRUE },
++ {0}, FALSE },
+ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
+ {0}, FALSE },
+ { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
+@@ -834,8 +834,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+
+ xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
+ xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
+- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
+- xf86Info.dontZap = !party_like_its_1989;
++ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
+
+ xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index 7349def..fbb2c6b 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -464,12 +464,11 @@ Default: off.
+ .TP 7
+ .BI "Option \*qDontZap\*q \*q" boolean \*q
+ This disallows the use of the
+-.B Ctrl+Alt+Backspace
+-sequence.
+-That sequence is normally used to terminate the __xservername__ server.
+-When this option is enabled (as per default), that key sequence has no
+-special meaning.
+-Default: on.
++.B Terminate_Server
++XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
++This action is normally used to terminate the __xservername__ server.
++When this option is enabled, the action has no effect.
++Default: off.
+ .TP 7
+ .BI "Option \*qDontZoom\*q \*q" boolean \*q
+ This disallows the use of the
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/rgbpath.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-From 7c6e0368e315b5e2f51d3b8d2f1d10c8143abeff Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Tue, 17 Feb 2009 18:48:52 -0800
-Subject: [PATCH] Make RGBPath keyword in xorg.conf a non-fatal error
-
-Xorg shouldn't refuse to run just because the user has an xorg.conf that
-had the previously-used RGBPath keyword in it.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- hw/xfree86/parser/Files.c | 6 ++++++
- hw/xfree86/parser/xf86tokens.h | 1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
-index 3777432..11c635b 100644
---- a/hw/xfree86/parser/Files.c
-+++ b/hw/xfree86/parser/Files.c
-@@ -72,6 +72,8 @@ static xf86ConfigSymTabRec FilesTab[] =
- {MODULEPATH, "modulepath"},
- {INPUTDEVICES, "inputdevices"},
- {LOGFILEPATH, "logfile"},
-+ /* Obsolete keywords that aren't used but shouldn't cause errors: */
-+ {OBSOLETE_TOKEN, "rgbpath"},
- {-1, ""},
- };
-
-@@ -183,6 +185,10 @@ xf86parseFilesSection (void)
- case EOF_TOKEN:
- Error (UNEXPECTED_EOF_MSG, NULL);
- break;
-+ case OBSOLETE_TOKEN:
-+ xf86parseError (OBSOLETE_MSG, xf86tokenString ());
-+ xf86getSubToken (&(ptr->file_comment));
-+ break;
- default:
- Error (INVALID_KEYWORD_MSG, xf86tokenString ());
- break;
-diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
-index 6e4fdea..dd67f72 100644
---- a/hw/xfree86/parser/xf86tokens.h
-+++ b/hw/xfree86/parser/xf86tokens.h
-@@ -70,6 +70,7 @@
-
- typedef enum {
- /* errno-style tokens */
-+ OBSOLETE_TOKEN = -5,
- EOF_TOKEN = -4,
- LOCK_TOKEN = -3,
- ERROR_TOKEN = -2,
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/rrselectinput-access.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-From 6544490700051b3b5e88ac1890d71b35634c9100 Mon Sep 17 00:00:00 2001
-From: Eamon Walsh <[email protected]>
-Date: Mon, 9 Mar 2009 17:28:40 -0400
-Subject: [PATCH] Correct access mode in call to dixLookupWindow() within RRSelectInput.
-
-Reported by Alan Coopersmith.
----
- randr/rrdispatch.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
-index 5a2ea71..0925875 100644
---- a/randr/rrdispatch.c
-+++ b/randr/rrdispatch.c
-@@ -76,7 +76,7 @@ ProcRRSelectInput (ClientPtr client)
- int rc;
-
- REQUEST_SIZE_MATCH(xRRSelectInputReq);
-- rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
-+ rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
- if (rc != Success)
- return rc;
- pHead = (RREventPtr *)SecurityLookupIDByType(client,
---
-1.5.6.5
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/sigio.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,135 @@
+From 64b7f96dca23d2b33e0b8a8785d628d9a2f50e7b Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 24 Apr 2009 00:14:12 -0700
+Subject: [PATCH] Add SIGIO/SIGPOLL support for Solaris
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ configure.ac | 2 +-
+ hw/xfree86/os-support/shared/sigio.c | 42 ++++++++++++++++++++++++----
+ hw/xfree86/os-support/solaris/Makefile.am | 3 +-
+ include/xorg-config.h.in | 3 ++
+ 4 files changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ef50627..f0317bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,7 +113,7 @@ AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])
+
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h])
++AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h])
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
+index 54c02cc..2565782 100644
+--- a/hw/xfree86/os-support/shared/sigio.c
++++ b/hw/xfree86/os-support/shared/sigio.c
+@@ -63,6 +63,10 @@
+ # include "xf86_OSlib.h"
+ # include "inputstr.h"
+
++#ifdef HAVE_STROPTS_H
++# include <stropts.h>
++#endif
++
+ /*
+ * Linux libc5 defines FASYNC, but not O_ASYNC. Don't know if it is
+ * functional or not.
+@@ -139,6 +143,7 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
+ struct sigaction osa;
+ int i;
+ int blocked;
++ int installed = FALSE;
+
+ for (i = 0; i < MAX_FUNCS; i++)
+ {
+@@ -147,15 +152,30 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
+ if (xf86IsPipe (fd))
+ return 0;
+ blocked = xf86BlockSIGIO();
++#ifdef O_ASYNC
+ if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
+- xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
++ xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
+ fd, strerror(errno));
+- xf86UnblockSIGIO(blocked);
+- return 0;
++ } else {
++ if (fcntl(fd, F_SETOWN, getpid()) != -1) {
++ xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
++ fd, strerror(errno));
++ } else {
++ installed = TRUE;
++ }
+ }
+- if (fcntl(fd, F_SETOWN, getpid()) == -1) {
+- xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
+- fd, strerror(errno));
++#endif
++#ifdef I_SETSIG /* System V Streams - used on Solaris for input devices */
++ if (!installed && isastream(fd)) {
++ if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
++ xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
++ fd, strerror(errno));
++ } else {
++ installed = TRUE;
++ }
++ }
++#endif
++ if (!installed) {
+ xf86UnblockSIGIO(blocked);
+ return 0;
+ }
+@@ -221,7 +241,17 @@ xf86RemoveSIGIOHandler(int fd)
+ }
+ if (ret)
+ {
++#ifdef O_ASYNC
+ fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_ASYNC);
++#endif
++#ifdef I_SETSIG
++ if (isastream(fd)) {
++ if (ioctl(fd, I_SETSIG, 0) == -1) {
++ xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
++ fd, strerror(errno));
++ }
++ }
++#endif
+ xf86SigIOMax = max;
+ xf86SigIOMaxFd = maxfd;
+ if (!max)
+diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
+index a4ef67b..bcb9874 100644
+--- a/hw/xfree86/os-support/solaris/Makefile.am
++++ b/hw/xfree86/os-support/solaris/Makefile.am
+@@ -21,7 +21,8 @@ noinst_LTLIBRARIES = libsolaris.la
+ libsolaris_la_SOURCES = sun_init.c \
+ sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
+ $(srcdir)/../shared/kmod_noop.c \
+- $(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
++ $(srcdir)/../shared/posix_tty.c \
++ $(srcdir)/../shared/sigio.c \
+ $(srcdir)/../shared/stdResource.c \
+ $(srcdir)/../shared/vidmem.c \
+ $(VTSW_SRC)
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index f9b77d0..ebeb44a 100644
+--- a/include/xorg-config.h.in
++++ b/include/xorg-config.h.in
+@@ -54,6 +54,9 @@
+ /* Solaris 8 or later? */
+ #undef __SOL8__
+
++/* Define to 1 if you have the <stropts.h> header file. */
++#undef HAVE_STROPTS_H
++
+ /* Define to 1 if you have the <sys/kd.h> header file. */
+ #undef HAVE_SYS_KD_H
+
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/signal-handler.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/signal-handler.patch Fri May 15 09:36:46 2009 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' hw/xfree86/dri/dri.c hw/xfree86/dri/dri.c
---- hw/xfree86/dri/dri.c 2008-10-17 15:49:03.916893000 -0700
-+++ hw/xfree86/dri/dri.c 2008-10-17 15:49:21.389521000 -0700
-@@ -2466,7 +2466,11 @@ int drmInstallSIGIOHandler(int fd, void
+--- hw/xfree86/dri/dri.c 2009-05-08 17:45:21.396957000 -0700
++++ hw/xfree86/dri/dri.c 2009-05-08 17:45:31.288131000 -0700
+@@ -2491,7 +2491,11 @@ int drmInstallSIGIOHandler(int fd, void
entry = drmGetEntry(fd);
entry->f = f;
@@ -13,7 +13,7 @@
}
int drmRemoveSIGIOHandler(int fd)
-@@ -2475,5 +2479,9 @@ int drmRemoveSIGIOHandler(int fd)
+@@ -2500,5 +2504,9 @@ int drmRemoveSIGIOHandler(int fd)
entry->f = NULL;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/solaris-asm.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,54 @@
+From 97f2f54b44f4fe28973a15d17eede98137cef689 Mon Sep 17 00:00:00 2001
+From: David Marx <[email protected]>
+Date: Wed, 13 May 2009 17:53:30 -0700
+Subject: [PATCH] Solaris: Make sure non-inline versions of asm routines end with ret statements
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ hw/xfree86/os-support/solaris/solaris-amd64.S | 2 +-
+ hw/xfree86/os-support/solaris/solaris-ia32.S | 2 +-
+ .../os-support/solaris/solaris-sparcv8plus.S | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/os-support/solaris/solaris-amd64.S b/hw/xfree86/os-support/solaris/solaris-amd64.S
+index 9f5e58c..4a0e0f4 100644
+--- a/hw/xfree86/os-support/solaris/solaris-amd64.S
++++ b/hw/xfree86/os-support/solaris/solaris-amd64.S
+@@ -32,7 +32,7 @@
+ #define _ASM
+ #include <sys/asm_linkage.h>
+ #define FUNCTION_START(f,n) ENTRY(f)
+-#define FUNCTION_END(f) SET_SIZE(f)
++#define FUNCTION_END(f) ret; SET_SIZE(f)
+ #endif
+
+ FUNCTION_START(inb,4)
+diff --git a/hw/xfree86/os-support/solaris/solaris-ia32.S b/hw/xfree86/os-support/solaris/solaris-ia32.S
+index e2d9cf6..280154b 100644
+--- a/hw/xfree86/os-support/solaris/solaris-ia32.S
++++ b/hw/xfree86/os-support/solaris/solaris-ia32.S
+@@ -32,7 +32,7 @@
+ #define _ASM
+ #include <sys/asm_linkage.h>
+ #define FUNCTION_START(f,n) ENTRY(f)
+-#define FUNCTION_END(f) SET_SIZE(f)
++#define FUNCTION_END(f) ret; SET_SIZE(f)
+ #endif
+
+ FUNCTION_START(inb,4)
+diff --git a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
+index fb23942..dbaa030 100644
+--- a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
++++ b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
+@@ -33,7 +33,7 @@
+ #define _ASM
+ #include <sys/asm_linkage.h>
+ #define FUNCTION_START(f,n) ENTRY(f)
+-#define FUNCTION_END(f) SET_SIZE(f)
++#define FUNCTION_END(f) retl; nop; SET_SIZE(f)
+ #endif
+
+ /* Converted from common/compiler.h gcc inline format to Sun cc inline
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/solaris-mapping.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,568 +0,0 @@
-[Adjusted to apply to Xorg 1.5.3 tree]
-
-From 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 30 Oct 2008 20:38:34 -0700
-Subject: [PATCH] Refactor Solaris mapping code to work with standard shared/vidmem.c
-
-Also merge sun_bios.c into sun_vid.c and upstream Solaris patch to
-keep aperture device open, to allow mappings to occur after X server
-has given up uid 0.
----
- hw/xfree86/os-support/solaris/Makefile.am | 3 +-
- hw/xfree86/os-support/solaris/sun_bios.c | 103 ---------
- hw/xfree86/os-support/solaris/sun_vid.c | 328 ++++++++++++++++++-----------
- 3 files changed, 202 insertions(+), 232 deletions(-)
- delete mode 100644 hw/xfree86/os-support/solaris/sun_bios.c
-
-diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
-index ca3dd31..a4ef67b 100644
---- a/hw/xfree86/os-support/solaris/Makefile.am
-+++ b/hw/xfree86/os-support/solaris/Makefile.am
-@@ -18,11 +18,12 @@ solaris-@[email protected]: solaris-@[email protected]
- $(CPP) -P -DINLINE_ASM solaris-@[email protected] > $@
-
- noinst_LTLIBRARIES = libsolaris.la
--libsolaris_la_SOURCES = sun_bios.c sun_init.c \
-+libsolaris_la_SOURCES = sun_init.c \
- sun_mouse.c sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
- $(srcdir)/../shared/kmod_noop.c \
- $(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
- $(srcdir)/../shared/stdResource.c \
-+ $(srcdir)/../shared/vidmem.c \
- $(VTSW_SRC)
- nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
-
-diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c
-deleted file mode 100644
-index a27a5a5..0000000
---- a/hw/xfree86/os-support/solaris/sun_bios.c
-+++ /dev/null
-@@ -1,103 +0,0 @@
--/*
-- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-- * Copyright 1993 by David Wexelblat <[email protected]>
-- * Copyright 1999 by David Holland <[email protected]>
-- *
-- * Permission to use, copy, modify, distribute, and sell this software and its
-- * documentation for any purpose is hereby granted without fee, provided that
-- * the above copyright notice appear in all copies and that both that copyright
-- * notice and this permission notice appear in supporting documentation, and
-- * that the names of the copyright holders not be used in advertising or
-- * publicity pertaining to distribution of the software without specific,
-- * written prior permission. The copyright holders make no representations
-- * about the suitability of this software for any purpose. It is provided "as
-- * is" without express or implied warranty.
-- *
-- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
-- * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-- * OF THIS SOFTWARE.
-- */
--
--#ifdef HAVE_XORG_CONFIG_H
--#include <xorg-config.h>
--#endif
--
--#if defined(__i386__) || defined(__i386)
--#define _NEED_SYSI86
--#endif
--#include "xf86.h"
--#include "xf86Priv.h"
--#include "xf86_OSlib.h"
--
--#ifndef MAP_FAILED
--#define MAP_FAILED ((void *)-1)
--#endif
--
--extern char *apertureDevName;
--
--/*
-- * Read BIOS via mmap()ing physical memory.
-- */
--_X_EXPORT int
--xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-- int Len)
--{
-- int fd;
-- unsigned char *ptr;
-- char solx86_vtname[20];
-- int psize;
-- int mlen;
--
-- /*
-- * Solaris 2.1 x86 SVR4 (10/27/93)
-- * The server must treat the virtual terminal device file
-- * as the standard SVR4 /dev/pmem. By default, then used VT
-- * is considered the "default" file to open.
-- *
-- * Solaris 2.8 x86 (7/26/99) - DWH
-- *
-- * Use /dev/xsvc for everything.
-- */
-- psize = getpagesize();
-- Offset += Base & (psize - 1);
-- Base &= ~(psize - 1);
-- mlen = (Offset + Len + psize - 1) & ~(psize - 1);
--#if (defined(__i386__) || defined(__i386)) && !defined(__SOL8__)
-- if (Base >= 0xA0000 && Base + mlen < 0xFFFFF && xf86Info.vtno >= 0)
-- sprintf(solx86_vtname, "/dev/vt%02d", xf86Info.vtno);
-- else
--#endif
-- {
-- if (!xf86LinearVidMem())
-- FatalError("xf86ReadBIOS: Could not mmap BIOS"
-- " [a=%lx]\n", Base);
-- sprintf(solx86_vtname, apertureDevName);
-- }
--
-- if ((fd = open(solx86_vtname, O_RDONLY)) < 0)
-- {
-- xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
-- solx86_vtname, strerror(errno));
-- return(-1);
-- }
-- ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-- MAP_SHARED, fd, (off_t)Base);
-- if (ptr == MAP_FAILED)
-- {
-- xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed "
-- "[0x%08lx, 0x%04x]\n",
-- solx86_vtname, Base, mlen);
-- close(fd);
-- return -1;
-- }
--
-- (void)memcpy(Buf, (void *)(ptr + Offset), Len);
-- (void)munmap((caddr_t)ptr, mlen);
-- (void)close(fd);
--
-- return Len;
--}
-diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
-index e7b529c..2b50dd6 100644
---- a/hw/xfree86/os-support/solaris/sun_vid.c
-+++ b/hw/xfree86/os-support/solaris/sun_vid.c
-@@ -1,6 +1,7 @@
- /*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <[email protected]>
-+ * Copyright 1999 by David Holland <[email protected]>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
-@@ -21,6 +22,33 @@
- * OF THIS SOFTWARE.
- *
- */
-+/* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-
- #ifdef HAVE_XORG_CONFIG_H
- #include <xorg-config.h>
-@@ -29,121 +57,176 @@
- #include <sys/types.h> /* get __x86 definition if not set by compiler */
-
- #if defined(__i386__) || defined(__i386) || defined(__x86)
--#define _NEED_SYSI86
-+# define _NEED_SYSI86
- #endif
- #include "xf86.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
--
--#ifndef MAP_FAILED
--#define MAP_FAILED ((void *)-1)
--#endif
-+#include "xf86OSpriv.h"
-+#include <sys/mman.h>
-
- /***************************************************************************/
- /* Video Memory Mapping section */
- /***************************************************************************/
-
--char *apertureDevName = NULL;
-+static char *apertureDevName = NULL;
-+static int apertureDevFD_ro = -1;
-+static int apertureDevFD_rw = -1;
-
--_X_EXPORT Bool
--xf86LinearVidMem(void)
-+static Bool
-+solOpenAperture(void)
- {
-- int mmapFd;
--
-- if (apertureDevName)
-- return TRUE;
--
-+ if (apertureDevName == NULL)
-+ {
- apertureDevName = "/dev/xsvc";
-- if ((mmapFd = open(apertureDevName, O_RDWR)) < 0)
-+ if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)
- {
-+ xf86MsgVerb(X_WARNING, 0,
-+ "solOpenAperture: failed to open %s (%s)\n",
-+ apertureDevName, strerror(errno));
- apertureDevName = "/dev/fbs/aperture";
-- if((mmapFd = open(apertureDevName, O_RDWR)) < 0)
-+ apertureDevFD_rw = open(apertureDevName, O_RDWR);
-+ }
-+ apertureDevFD_ro = open(apertureDevName, O_RDONLY);
-+
-+ if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))
-+ {
-+ xf86MsgVerb(X_WARNING, 0,
-+ "solOpenAperture: failed to open %s (%s)\n",
-+ apertureDevName, strerror(errno));
-+ xf86MsgVerb(X_WARNING, 0,
-+ "solOpenAperture: either /dev/fbs/aperture"
-+ " or /dev/xsvc required\n");
-+
-+ apertureDevName = NULL;
-+
-+ if (apertureDevFD_rw >= 0)
- {
-- xf86MsgVerb(X_WARNING, 0,
-- "xf86LinearVidMem: failed to open %s (%s)\n",
-- apertureDevName, strerror(errno));
-- xf86MsgVerb(X_WARNING, 0,
-- "xf86LinearVidMem: either /dev/fbs/aperture or /dev/xsvc"
-- " device driver required\n");
-- xf86MsgVerb(X_WARNING, 0,
-- "xf86LinearVidMem: linear memory access disabled\n");
-- apertureDevName = NULL;
-- return FALSE;
-+ close(apertureDevFD_rw);
- }
-+ apertureDevFD_rw = -1;
-+
-+ if (apertureDevFD_ro >= 0)
-+ {
-+ close(apertureDevFD_ro);
-+ }
-+ apertureDevFD_ro = -1;
-+
-+ return FALSE;
- }
-- close(mmapFd);
-- return TRUE;
-+ }
-+ return TRUE;
- }
-
--_X_EXPORT pointer
--xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
-+static pointer
-+solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
- {
-- pointer base;
-- int fd;
-- char vtname[20];
--
-- /*
-- * Solaris 2.1 x86 SVR4 (10/27/93)
-- * The server must treat the virtual terminal device file as the
-- * standard SVR4 /dev/pmem.
-- *
-- * Using the /dev/vtXX device as /dev/pmem only works for the
-- * A0000-FFFFF region - If we wish you mmap the linear aperture
-- * it requires a device driver.
-- *
-- * So what we'll do is use /dev/vtXX for the A0000-FFFFF stuff, and
-- * try to use the /dev/fbs/aperture or /dev/xsvc driver if the server
-- * tries to mmap anything > FFFFF. Its very very unlikely that the
-- * server will try to mmap anything below FFFFF that can't be handled
-- * by /dev/vtXX.
-- *
-- * DWH - 2/23/94
-- * DWH - 1/31/99 (Gee has it really been 5 years?)
-- *
-- * Solaris 2.8 7/26/99
-- * Use /dev/xsvc for everything
-- *
-- * DWH - 7/26/99 - Solaris8/dev/xsvc changes
-- *
-- * TSI - 2001.09 - SPARC changes
-- */
--
--#if defined(__i386__) && !defined(__SOL8__)
-- if(Base < 0xFFFFF)
-- sprintf(vtname, "/dev/vt%02d", xf86Info.vtno);
-- else
--#endif
-- {
-- if (!xf86LinearVidMem())
-- FatalError("xf86MapVidMem: no aperture device\n");
-+ pointer base;
-+ int fd;
-+ int prot;
-+
-+ if (Flags & VIDMEM_READONLY)
-+ {
-+ fd = apertureDevFD_ro;
-+ prot = PROT_READ;
-+ }
-+ else
-+ {
-+ fd = apertureDevFD_rw;
-+ prot = PROT_READ | PROT_WRITE;
-+ }
-+
-+ if (fd < 0)
-+ {
-+ xf86DrvMsg(ScreenNum, X_ERROR,
-+ "solMapVidMem: failed to open %s (%s)\n",
-+ apertureDevName, strerror(errno));
-+ return NULL;
-+ }
-+
-+ base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);
-+
-+ if (base == MAP_FAILED) {
-+ xf86DrvMsg(ScreenNum, X_ERROR,
-+ "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
-+ apertureDevName, Base, Size, strerror(errno));
-+ return NULL;
-+ }
-+
-+ return base;
-+}
-
-- strcpy(vtname, apertureDevName);
-- }
-+/* ARGSUSED */
-+static void
-+solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-+{
-+ if (munmap(Base, Size) != 0) {
-+ xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
-+ "solUnMapVidMem: failed to unmap %s"
-+ " (0x%08lx,0x%lx) (%s)\n",
-+ apertureDevName, Base, Size,
-+ strerror(errno));
-+ }
-+}
-
-- fd = open(vtname, (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
-- if (fd < 0)
-- FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-- vtname, strerror(errno));
--
-- base = mmap(NULL, Size,
-- (Flags & VIDMEM_READONLY) ?
-- PROT_READ : (PROT_READ | PROT_WRITE),
-- MAP_SHARED, fd, (off_t)Base);
-- close(fd);
-- if (base == MAP_FAILED)
-- FatalError("xf86MapVidMem: mmap failure: %s\n",
-- strerror(errno));
--
-- return(base);
-+_X_HIDDEN void
-+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-+{
-+ pVidMem->linearSupported = solOpenAperture();
-+ if (pVidMem->linearSupported) {
-+ pVidMem->mapMem = solMapVidMem;
-+ pVidMem->unmapMem = solUnMapVidMem;
-+ } else {
-+ xf86MsgVerb(X_WARNING, 0,
-+ "xf86OSInitVidMem: linear memory access disabled\n");
-+ }
-+ pVidMem->initialised = TRUE;
- }
-
--/* ARGSUSED */
--_X_EXPORT void
--xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-+/*
-+ * Read BIOS via mmap()ing physical memory.
-+ */
-+_X_EXPORT int
-+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-+ int Len)
- {
-- munmap(Base, Size);
-+ unsigned char *ptr;
-+ int psize;
-+ int mlen;
-+
-+ psize = getpagesize();
-+ Offset += Base & (psize - 1);
-+ Base &= ~(psize - 1);
-+ mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-+
-+ if (solOpenAperture() == FALSE)
-+ {
-+ xf86Msg(X_WARNING,
-+ "xf86ReadBIOS: Failed to open aperture to read BIOS\n");
-+ return -1;
-+ }
-+
-+ ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,
-+ MAP_SHARED, apertureDevFD_ro, (off_t)Base);
-+ if (ptr == MAP_FAILED)
-+ {
-+ xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
-+ apertureDevName, Base, mlen);
-+ return -1;
-+ }
-+
-+ (void)memcpy(Buf, (void *)(ptr + Offset), Len);
-+ if (munmap((caddr_t)ptr, mlen) != 0) {
-+ xf86MsgVerb(X_WARNING, 0,
-+ "solUnMapVidMem: failed to unmap %s"
-+ " (0x%08lx,0x%lx) (%s)\n",
-+ apertureDevName, ptr, mlen, strerror(errno));
-+ }
-+
-+ return Len;
- }
-
-+
- /***************************************************************************/
- /* I/O Permissions section */
- /***************************************************************************/
-@@ -156,28 +239,28 @@ _X_EXPORT Bool
- xf86EnableIO(void)
- {
- #if defined(__i386__) || defined(__i386) || defined(__x86)
-- if (ExtendedEnabled)
-- return TRUE;
-+ if (ExtendedEnabled)
-+ return TRUE;
-
-- if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-- xf86Msg(X_WARNING,"xf86EnableIOPorts: Failed to set IOPL for I/O\n");
-- return FALSE;
-- }
-- ExtendedEnabled = TRUE;
-+ if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-+ xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
-+ return FALSE;
-+ }
-+ ExtendedEnabled = TRUE;
- #endif /* i386 */
-- return TRUE;
-+ return TRUE;
- }
-
- _X_EXPORT void
- xf86DisableIO(void)
- {
- #if defined(__i386__) || defined(__i386) || defined(__x86)
-- if(!ExtendedEnabled)
-- return;
-+ if(!ExtendedEnabled)
-+ return;
-
-- sysi86(SI86V86, V86SC_IOPL, 0);
-+ sysi86(SI86V86, V86SC_IOPL, 0);
-
-- ExtendedEnabled = FALSE;
-+ ExtendedEnabled = FALSE;
- #endif /* i386 */
- }
-
-@@ -186,51 +269,40 @@ xf86DisableIO(void)
- /* Interrupt Handling section */
- /***************************************************************************/
-
--_X_EXPORT Bool xf86DisableInterrupts(void)
-+_X_EXPORT Bool
-+xf86DisableInterrupts(void)
- {
- #if defined(__i386__) || defined(__i386) || defined(__x86)
-- if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
-- return FALSE;
-+ if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
-+ return FALSE;
-
- #ifdef __GNUC__
-- __asm__ __volatile__("cli");
-+ __asm__ __volatile__("cli");
- #else
-- asm("cli");
-+ asm("cli");
- #endif /* __GNUC__ */
-
-- if (!ExtendedEnabled)
-- sysi86(SI86V86, V86SC_IOPL, 0);
-+ if (!ExtendedEnabled)
-+ sysi86(SI86V86, V86SC_IOPL, 0);
- #endif /* i386 */
-
-- return TRUE;
-+ return TRUE;
- }
-
--_X_EXPORT void xf86EnableInterrupts(void)
-+_X_EXPORT void
-+xf86EnableInterrupts(void)
- {
- #if defined(__i386__) || defined(__i386) || defined(__x86)
-- if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
-- return;
-+ if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
-+ return;
-
- #ifdef __GNUC__
-- __asm__ __volatile__("sti");
-+ __asm__ __volatile__("sti");
- #else
-- asm("sti");
-+ asm("sti");
- #endif /* __GNUC__ */
-
-- if (!ExtendedEnabled)
-- sysi86(SI86V86, V86SC_IOPL, 0);
-+ if (!ExtendedEnabled)
-+ sysi86(SI86V86, V86SC_IOPL, 0);
- #endif /* i386 */
- }
--
--_X_EXPORT void
--xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
-- unsigned long Size)
--{
--}
--
--_X_EXPORT Bool
--xf86CheckMTRR(int ScreenNum)
--{
-- return FALSE;
--}
--
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/sparc-nopciprobe.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sparc-nopciprobe.patch Fri May 15 09:36:46 2009 -0700
@@ -29,18 +29,17 @@
Omit Bus probing on sparc. It is terribly slow and we get the same info thru /dev/fb
*** hw/xfree86/common/xf86Init.c.orig Thu Dec 18 18:01:47 2008
---- hw/xfree86/common/xf86Init.c Thu Dec 18 18:02:31 2008
-***************
-*** 734,741 ****
---- 734,744 ----
- xf86OpenConsole();
-
- /* Do a general bus probe. This will be a PCI probe for x86 platforms */
-+ #if (!defined(__sparc__) && !defined(__sparc))
- xf86BusProbe();
-+ #endif
-
-+
- if (xf86DoProbe)
- DoProbe();
-
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
+--- hw/xfree86/common/xf86Init.c 2009-01-22 20:34:49.294385000 -0800
++++ hw/xfree86/common/xf86Init.c 2009-01-22 20:34:57.326657000 -0800
+@@ -790,7 +790,10 @@ InitOutput(ScreenInfo *pScreenInfo, int
+ xf86OpenConsole();
+
+ /* Do a general bus probe. This will be a PCI probe for x86 platforms */
++#if (!defined(__sparc__) && !defined(__sparc))
+ xf86BusProbe();
++#endif
++
+
+ if (xf86DoProbe)
+ DoProbe();
--- a/open-src/xserver/xorg/sparc-probe.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sparc-probe.patch Fri May 15 09:36:46 2009 -0700
@@ -28,9 +28,9 @@
Allow probing for /dev/fb cards other than the traditional sbus devices.
-diff -urp -x '*~' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c
---- hw/xfree86/common/xf86sbusBus.c 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/common/xf86sbusBus.c 2006-12-21 14:24:29.543917000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.c hw/xfree86/common/xf86sbusBus.c
+--- hw/xfree86/common/xf86sbusBus.c 2009-01-09 09:47:04.000000000 -0800
++++ hw/xfree86/common/xf86sbusBus.c 2009-01-22 20:34:49.343790000 -0800
@@ -41,6 +41,10 @@
#include "xf86sbusBus.h"
#include "xf86Sbus.h"
@@ -69,9 +69,9 @@
xf86ErrorF("\n");
}
if (useProm)
-diff -urp -x '*~' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h
---- hw/xfree86/common/xf86sbusBus.h 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/common/xf86sbusBus.h 2006-12-21 14:24:29.546593000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86sbusBus.h hw/xfree86/common/xf86sbusBus.h
+--- hw/xfree86/common/xf86sbusBus.h 2009-01-09 09:47:04.000000000 -0800
++++ hw/xfree86/common/xf86sbusBus.h 2009-01-22 20:34:49.344526000 -0800
@@ -39,6 +39,7 @@
#define SBUS_DEVICE_FFB 0x000b
#define SBUS_DEVICE_GT 0x000c
@@ -80,14 +80,14 @@
typedef struct sbus_prom_node {
int node;
-diff -urp -x '*~' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c
---- hw/xfree86/os-support/bus/Sbus.c 2006-11-13 16:59:40.000000000 -0800
-+++ hw/xfree86/os-support/bus/Sbus.c 2006-12-21 14:24:29.547071000 -0800
+diff -urp -x '*~' -x '*.orig' hw/xfree86/os-support/bus/Sbus.c hw/xfree86/os-support/bus/Sbus.c
+--- hw/xfree86/os-support/bus/Sbus.c 2009-01-09 09:47:04.000000000 -0800
++++ hw/xfree86/os-support/bus/Sbus.c 2009-01-22 20:34:49.345181000 -0800
@@ -68,6 +68,7 @@ struct sbus_devtable sbusDeviceTable[] =
- { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "Sun TCX" },
- { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "Sun FFB" },
- { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "Sun Elite3D" },
-+ { SBUS_DEVICE_UNK, FBTYPE_LASTPLUSONE + 1, "unknown", "Unknown FB" },
+ { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },
+ { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
+ { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },
++ { SBUS_DEVICE_UNK, FBTYPE_LASTPLUSONE + 1, "unknown", "unknown", "Unknown FB" },
{ 0, 0, NULL }
};
--- a/open-src/xserver/xorg/sun-loginfo.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-loginfo.patch Fri May 15 09:36:46 2009 -0700
@@ -27,37 +27,37 @@
# of the copyright holder.
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86Init.c
---- hw/xfree86/common/xf86Init.c 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/common/xf86Init.c 2008-09-23 16:32:10.752446000 -0700
-@@ -102,6 +102,7 @@ static void xf86PrintBanner(void);
- static void xf86PrintMarkers(void);
- static void xf86PrintDefaultModulePath(void);
- static void xf86PrintDefaultLibraryPath(void);
+--- hw/xfree86/common/xf86Init.c 2009-04-14 10:14:57.000000000 -0700
++++ hw/xfree86/common/xf86Init.c 2009-05-08 17:43:47.964208000 -0700
+@@ -96,6 +96,7 @@
+ static Bool probe_devices_from_device_sections(DriverPtr drvp);
+ static Bool add_matching_devices_to_configure_list(DriverPtr drvp);
+ static Bool check_for_matching_devices(DriverPtr drvp);
+static void sunLogInfo(void);
- static Bool probe_devices_from_device_sections(DriverPtr drvp);
- static Bool add_matching_devices_to_configure_list(DriverPtr drvp);
-@@ -1778,7 +1779,7 @@ ddxUseMsg()
+ #ifdef XF86PM
+ void (*xf86OSPMClose)(void) = NULL;
+@@ -134,7 +135,7 @@ static Bool formatsDone = FALSE;
static void
- xf86PrintBanner()
+ xf86PrintBanner(void)
{
-#if PRE_RELEASE
+#if 0
ErrorF("\n"
"This is a pre-release version of the X server from " XVENDORNAME ".\n"
"It is not supported in any way.\n"
-@@ -1878,6 +1879,7 @@ xf86PrintBanner()
+@@ -234,6 +235,7 @@ xf86PrintBanner(void)
#if defined(BUILDERSTRING)
ErrorF("%s \n",BUILDERSTRING);
#endif
+ sunLogInfo();
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
"\tto make sure that you have the latest version.\n");
- ErrorF("Module Loader present\n");
-@@ -2004,3 +2006,73 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, i
+ }
+@@ -2014,3 +2016,73 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, i
+ else
return 0;
}
-
+/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
@@ -129,9 +129,9 @@
+ }
+}
diff -urp -x '*~' -x '*.orig' hw/xfree86/loader/loadmod.c hw/xfree86/loader/loadmod.c
---- hw/xfree86/loader/loadmod.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/loader/loadmod.c 2008-09-23 16:32:10.776094000 -0700
-@@ -1239,6 +1239,15 @@ LoaderErrorMsg(const char *name, const c
+--- hw/xfree86/loader/loadmod.c 2009-05-08 17:43:39.413495000 -0700
++++ hw/xfree86/loader/loadmod.c 2009-05-08 17:43:47.987132000 -0700
+@@ -1220,6 +1220,15 @@ LoaderErrorMsg(const char *name, const c
default:
msg = "unknown error";
}
--- a/open-src/xserver/xorg/sun-manpage.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch Fri May 15 09:36:46 2009 -0700
@@ -1,6 +1,6 @@
diff -urp -x '*~' -x '*.orig' cpprules.in cpprules.in
--- cpprules.in 2007-05-29 12:36:50.000000000 -0700
-+++ cpprules.in 2009-03-10 22:46:35.671590000 -0700
++++ cpprules.in 2009-05-08 17:42:34.541312000 -0700
@@ -25,7 +25,7 @@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
XSERVERNAME = Xorg
@@ -11,10 +11,10 @@
-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
-D__appmansuffix__=$(APP_MAN_SUFFIX) \
diff -urp -x '*~' -x '*.orig' doc/Xserver.man.pre doc/Xserver.man.pre
---- doc/Xserver.man.pre 2009-03-10 22:45:58.609756000 -0700
-+++ doc/Xserver.man.pre 2009-03-10 22:46:35.714098000 -0700
+--- doc/Xserver.man.pre 2009-05-08 17:42:26.287194000 -0700
++++ doc/Xserver.man.pre 2009-05-08 17:42:34.544517000 -0700
@@ -1,3 +1,32 @@
-+.\" ident "@(#)sun-manpage.patch 1.7 09/03/11 SMI"
++.\" ident "@(#)sun-manpage.patch 1.8 09/05/15 SMI"
+.\"
+.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+.\"
@@ -193,7 +193,7 @@
.TP 8
.B \-r
turns off auto-repeat.
-@@ -268,6 +377,10 @@ This is a no-op for most implementations
+@@ -275,6 +384,10 @@ This is a no-op for most implementations
.B [+-]xinerama
enables(+) or disables(-) the XINERAMA extension. The default state is
platform and configuration specific.
@@ -204,7 +204,7 @@
.SH SERVER DEPENDENT OPTIONS
Some X servers accept the following options:
.TP 8
-@@ -311,15 +424,24 @@ use a gray map of 13 color cells for the
+@@ -318,15 +431,24 @@ use a gray map of 13 color cells for the
.TP 8
.I color
use a color cube of at most 4*4*4 colors (that is 64 color cells).
@@ -229,7 +229,7 @@
.SH XDMCP OPTIONS
X servers that support XDMCP have the following options.
See the \fIX Display Manager Control Protocol\fP specification for more
-@@ -357,6 +479,9 @@ specifies the local address to connect f
+@@ -364,6 +486,9 @@ specifies the local address to connect f
has multiple network interfaces). The \fIlocal-address\fP may be expressed
in any form acceptable to the host platform's \fIgethostbyname\fP(3)
implementation.
@@ -239,7 +239,7 @@
.TP 8
.B \-once
causes the server to terminate (rather than reset) when the XDMCP session
-@@ -384,22 +509,45 @@ relative path from the XKB base director
+@@ -391,22 +516,45 @@ relative path from the XKB base director
.TP 8
.B [+-]kb
enables(+) or disables(-) the XKEYBOARD extension.
@@ -286,7 +286,7 @@
.TP 8
.B \-xkbmap \fIfilename\fP
loads keyboard description in \fIfilename\fP on server startup.
-@@ -541,6 +689,96 @@ the following font path:
+@@ -548,6 +696,96 @@ the following font path:
/usr/share/fonts/default/Type1,
/usr/share/fonts/default/ghostscript
.fi
@@ -383,7 +383,7 @@
.SH FILES
.TP 30
-@@ -549,12 +787,22 @@ Initial access control list for display
+@@ -556,12 +794,22 @@ Initial access control list for display
.TP 30
.IR __projectroot__/lib/X11/fonts/misc , __projectroot__/lib/X11/fonts/75dpi , __projectroot__/lib/X11/fonts/100dpi
Bitmap font directories
@@ -406,7 +406,7 @@
.TP 30
.IR /tmp/rcX\fBn\fP
Kerberos 5 replay cache for display number \fBn\fP
-@@ -564,6 +812,15 @@ Error log file for display number \fBn\f
+@@ -571,6 +819,15 @@ Error log file for display number \fBn\f
.TP 30
.I __projectroot__/lib/X11/xdm/xdm-errors
Default error log file if the server is run from \fIxdm\fP(1)
@@ -422,7 +422,7 @@
.SH "SEE ALSO"
General information: \fIX\fP(__miscmansuffix__)
.PP
-@@ -580,14 +837,28 @@ Security: \fIXsecurity\fP(__miscmansuffi
+@@ -587,14 +844,28 @@ Security: \fIXsecurity\fP(__miscmansuffi
\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
.I "Security Extension Specification"
.PP
--- a/open-src/xserver/xorg/sun-paths.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-paths.patch Fri May 15 09:36:46 2009 -0700
@@ -1,18 +1,7 @@
---- hw/xfree86/common/xf86Config.c 2009-03-31 11:15:39.134549000 -0700
-+++ hw/xfree86/common/xf86Config.c 2009-03-31 11:14:16.834280000 -0700
-@@ -908,7 +908,7 @@ configServerFlags(XF86ConfFlagsPtr flags
- MessageType from;
- const char *s;
- #ifdef XKB
-- char *rules = "base";
-+ char *rules = XKB_DFLT_RULES;
- #endif
-
- /*
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Configure.c hw/xfree86/common/xf86Configure.c
---- hw/xfree86/common/xf86Configure.c 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/common/xf86Configure.c 2008-09-24 20:18:22.067988000 -0700
-@@ -555,7 +555,8 @@ configureModuleSection (void)
+--- hw/xfree86/common/xf86Configure.c 2009-01-09 09:47:03.000000000 -0800
++++ hw/xfree86/common/xf86Configure.c 2009-01-22 20:33:12.636229000 -0800
+@@ -518,7 +518,8 @@ configureModuleSection (void)
/* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
if (defaultFontPath && (
(strcmp(*el, "freetype") == 0 &&
@@ -23,9 +12,9 @@
strstr(defaultFontPath, "/Type1"))))
ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
diff -urp -x '*~' -x '*.orig' xkb/xkbInit.c xkb/xkbInit.c
---- xkb/xkbInit.c 2008-09-23 11:25:01.000000000 -0700
-+++ xkb/xkbInit.c 2008-09-24 20:18:22.068856000 -0700
-@@ -123,7 +123,7 @@ typedef struct _SrvXkmInfo {
+--- xkb/xkbInit.c 2009-01-22 20:33:05.826163000 -0800
++++ xkb/xkbInit.c 2009-01-22 20:33:12.637635000 -0800
+@@ -94,7 +94,7 @@ typedef struct _SrvXkmInfo {
#endif
char * XkbBaseDirectory= XKB_BASE_DIRECTORY;
--- a/open-src/xserver/xorg/sun-src/IA/interactive.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/IA/interactive.c Fri May 15 09:36:46 2009 -0700
@@ -27,7 +27,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)interactive.c 35.19 09/01/14 SMI"
+#pragma ident "@(#)interactive.c 35.20 09/05/15 SMI"
/************************************************************
Basic boilerplate extension.
@@ -759,9 +759,10 @@
register ClientPtr requestee;
WindowPtr pWin = NULL;
+ DeviceIntPtr pPtr = PickPointer(client);
if (stuff->destination == PointerWindow)
- pWin = GetSpriteWindow();
+ pWin = GetSpriteWindow(pPtr);
else if (stuff->destination == InputFocus)
{
WindowPtr inputFocus = inputInfo.keyboard->focus->win;
@@ -772,10 +773,10 @@
/* If the input focus is PointerRootWin, send the event to where
the pointer is if possible, then perhaps propogate up to root. */
if (inputFocus == PointerRootWin)
- inputFocus = GetCurrentRootWindow();
+ inputFocus = GetCurrentRootWindow(pPtr);
- if (IsParent(inputFocus, GetSpriteWindow()))
- pWin = GetSpriteWindow();
+ if (IsParent(inputFocus, GetSpriteWindow(pPtr)))
+ pWin = GetSpriteWindow(pPtr);
else
pWin = inputFocus;
}
--- a/open-src/xserver/xorg/sun-src/tsol/tsol.h Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsol.h Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsol.h 1.10 09/04/02 SMI"
+#pragma ident "@(#)tsol.h 1.11 09/05/15 SMI"
/*
* tsol.h server side extension
@@ -66,7 +66,7 @@
/* tsolutils.c */
extern void init_xtsol(void);
extern void InitHotKey(HotKeyPtr hk);
-extern void HandleHotKey(void);
+extern void HandleHotKey(DeviceIntPtr keybd);
extern void LoadTsolConfig(void);
extern void MakeTSOLAtoms(void);
extern int SpecialName(const char *string, int len);
--- a/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolextension.c 1.38 09/05/04 SMI"
+#pragma ident "@(#)tsolextension.c 1.39 09/05/15 SMI"
#include <stdio.h>
#include "auditwrite.h"
@@ -1094,7 +1094,7 @@
MakeAtom("_TSOL_CMWLABEL_CHANGE", 21, 1);
message.u.clientMessage.u.l.longs0 = RootOfClient(pWin);
message.u.clientMessage.u.l.longs1 = stuff->id;
- DeliverEventsToWindow(pWin, &message, 1,
+ DeliverEventsToWindow(PickPointer(client), pWin, &message, 1,
SubstructureRedirectMask, NullGrab, 0);
}
@@ -1707,21 +1707,21 @@
BreakAllGrabs(ClientPtr client)
{
ClientPtr grabclient;
- DeviceIntPtr keybd = inputInfo.keyboard;
- GrabPtr kbdgrab = keybd->grab;
- DeviceIntPtr mouse = inputInfo.pointer;
- GrabPtr ptrgrab = mouse->grab;
+ DeviceIntPtr keybd = PickKeyboard(client);
+ GrabPtr kbdgrab = keybd->deviceGrab.grab;
+ DeviceIntPtr mouse = PickPointer(client);
+ GrabPtr ptrgrab = mouse->deviceGrab.grab;
if (kbdgrab) {
grabclient = clients[CLIENT_ID(kbdgrab->resource)];
if (client->index != grabclient->index)
- (*keybd->DeactivateGrab)(keybd);
+ (*keybd->deviceGrab.DeactivateGrab)(keybd);
}
if (ptrgrab) {
grabclient = clients[CLIENT_ID(ptrgrab->resource)];
if (client->index != grabclient->index)
- (*mouse->DeactivateGrab)(mouse);
+ (*mouse->deviceGrab.DeactivateGrab)(mouse);
}
}
@@ -2113,7 +2113,7 @@
(keyc->state != 0 && keyc->state == hotkey.shift)) ||
((xE->u.u.detail == hotkey.altkey) &&
(keyc->state != 0 && keyc->state == hotkey.altshift)))
- HandleHotKey();
+ HandleHotKey(keybd);
}
}
--- a/open-src/xserver/xorg/sun-src/tsol/tsolinfo.h Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolinfo.h Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolinfo.h 1.23 09/04/02 SMI"
+#pragma ident "@(#)tsolinfo.h 1.24 09/05/15 SMI"
#ifndef _TSOL_INFO_H
@@ -41,6 +41,7 @@
#include <ucred.h>
#include "misc.h"
#include "dixstruct.h"
+#include "globals.h"
#include <X11/keysym.h>
/*********************************
@@ -356,7 +357,6 @@
*********************************/
-extern WindowPtr *WindowTable;
extern int PolyProperty(Atom atom, WindowPtr pWin);
extern int PolySelection(Atom atom);
extern TsolPolyInstInfoRec tsolpolyinstinfo;
--- a/open-src/xserver/xorg/sun-src/tsol/tsolpolicy.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolpolicy.c Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolpolicy.c 1.26 09/04/02 SMI"
+#pragma ident "@(#)tsolpolicy.c 1.27 09/05/15 SMI"
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -2129,6 +2129,7 @@
ClientPtr client = subject;
TsolInfoPtr tsolinfo = GetClientTsolInfo(client);
TsolResPtr tsolres;
+ DeviceIntPtr device = PickPointer(client);
/*
* Allow pointer grab on root window, as long as
@@ -2138,7 +2139,7 @@
if (WindowIsRoot(pWin))
{
- pWin = TsolPointerWindow();
+ pWin = GetSpriteWindow(device);
if (WindowIsRoot(pWin))
return (PASSED);
}
@@ -2564,6 +2565,8 @@
TsolResPtr tsolres = TsolWindowPriv(pWin);
#if 0
GrabPtr grab;
+ DeviceIntPtr keybd = inputInfo.keyboard;
+ DeviceIntPtr mouse = inputInfo.pointer;
#endif
/*
@@ -2633,9 +2636,9 @@
* If ptr/kbd is grabbed, then this client must be
* the grabbing client
*/
- grab = inputInfo.pointer->grab;
+ grab = mouse->grab;
if (grab == NULL)
- grab = inputInfo.keyboard->grab;
+ grab = keybd->grab;
if (grab)
{
if (!SameClient(grab, client))
--- a/open-src/xserver/xorg/sun-src/tsol/tsolprotocol.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolprotocol.c Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolprotocol.c 1.29 09/04/02 SMI"
+#pragma ident "@(#)tsolprotocol.c 1.30 09/05/15 SMI"
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -576,21 +576,20 @@
/*
* HandleHotKey -
* HotKey is Meta(Diamond)+ Stop Key
- * Breaks untusted Ptr and Kbd grabs.
+ * Breaks untrusted Ptr and Kbd grabs.
* Trusted Grabs are NOT broken
* Warps pointer to the Trusted Stripe if not Trusted grabs in force.
*/
void
-HandleHotKey(void)
+HandleHotKey(DeviceIntPtr keybd)
{
int x, y;
Bool trusted_grab = FALSE;
ClientPtr client;
- DeviceIntPtr mouse = inputInfo.pointer;
- DeviceIntPtr keybd = inputInfo.keyboard;
+ DeviceIntPtr mouse = GetPairedDevice(keybd);
TsolInfoPtr tsolinfo;
- GrabPtr ptrgrab = mouse->grab;
- GrabPtr kbdgrab = keybd->grab;
+ GrabPtr ptrgrab = mouse->deviceGrab.grab;
+ GrabPtr kbdgrab = keybd->deviceGrab.grab;
ScreenPtr pScreen;
if (kbdgrab)
@@ -603,7 +602,7 @@
if (HasTrustedPath(tsolinfo))
trusted_grab = TRUE;
else
- (*keybd->DeactivateGrab)(keybd);
+ (*keybd->deviceGrab.DeactivateGrab)(keybd);
}
if (ptrgrab)
@@ -616,7 +615,7 @@
if (HasTrustedPath(tsolinfo))
trusted_grab = TRUE;
else
- (*mouse->DeactivateGrab)(mouse);
+ (*mouse->deviceGrab.DeactivateGrab)(mouse);
}
}
}
@@ -629,7 +628,7 @@
pScreen = screenInfo.screens[0];
x = pScreen->width/2;
y = pScreen->height - StripeHeight/2;
- (*pScreen->SetCursorPosition)(pScreen, x, y, TRUE);
+ (*pScreen->SetCursorPosition)(mouse, pScreen, x, y, TRUE);
}
}
@@ -638,13 +637,13 @@
{
xGetInputFocusReply rep;
/* REQUEST(xReq); */
- FocusClassPtr focus = inputInfo.keyboard->focus;
+ DeviceIntPtr kbd = PickKeyboard(client);
+ FocusClassPtr focus = kbd->focus;
int rc;
REQUEST_SIZE_MATCH(xReq);
- rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
- DixGetFocusAccess);
+ rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetFocusAccess);
if (rc != Success)
return rc;
@@ -1102,7 +1101,8 @@
{
xQueryPointerReply rep;
WindowPtr pWin, ptrWin;
- DeviceIntPtr mouse = inputInfo.pointer;
+ DeviceIntPtr mouse = PickPointer(client);
+ DeviceIntPtr kbd = PickKeyboard(client);
int rc;
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
@@ -1111,7 +1111,7 @@
if (rc != Success)
return rc;
- ptrWin = TsolPointerWindow();
+ ptrWin = GetSpriteWindow(mouse);
if (!xtsol_policy(TSOL_RES_WINDOW, TSOL_READ, ptrWin, 0,
client, TSOL_ALL, &(MAJOROP)))
return (*TsolSavedProcVector[X_QueryPointer])(client);
@@ -1120,7 +1120,7 @@
MaybeStopHint(mouse, client);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
- rep.mask = mouse->button->state | inputInfo.keyboard->key->state;
+ rep.mask = mouse->button->state | kbd->key->state;
rep.length = 0;
rep.root = RootOf(pWin);
rep.rootX = 0;
@@ -1213,7 +1213,7 @@
{
if (DrawableIsRoot(pDraw))
{
- pWin = XYToWindow(x, y);
+ pWin = XYToWindow(PickPointer(client), x, y);
if (!WindowIsRoot(pWin))
{
pDrawtmp = &(pWin->parent->drawable);
--- a/open-src/xserver/xorg/sun-src/tsol/tsolutils.c Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolutils.c Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
* of the copyright holder.
*/
-#pragma ident "@(#)tsolutils.c 1.22 09/04/02 SMI"
+#pragma ident "@(#)tsolutils.c 1.23 09/05/15 SMI"
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -929,15 +929,6 @@
}
return (pWin);
}
-/*
- * returns the window under pointer. This is function because
- * sprite is static & TsolPointerWindow is called in policy functions.
- */
-WindowPtr
-TsolPointerWindow(void)
-{
- return (GetSpriteWindow()); /* Window currently under mouse */
-}
/*
* Matches in the list of disabled extensions via
--- a/open-src/xserver/xorg/sys-kd.h.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-From cc78d977cac74fcfb7c9b27e7109a1e369018dd8 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Fri, 22 Aug 2008 10:14:11 -0700
-Subject: [PATCH] Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
-
-Upcoming virtual terminal support changes in Solaris kernel will provide
-<sys/kd.h> on SPARC too, so this gets us ready for them.
----
- configure.ac | 1 +
- hw/xfree86/os-support/solaris/sun_init.c | 2 +-
- include/xorg-config.h.in | 3 +++
- 3 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 52d35c3..4250f80 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1280,6 +1280,7 @@ if test "x$XORG" = xyes; then
- solaris*)
- XORG_OS="solaris"
- XORG_OS_SUBDIR="solaris"
-+ AC_CHECK_HEADERS([sys/kd.h])
- # This really should be tests for specific features, but the #ifdef's
- # were done as a simple version check in XFree86 4.x and haven't been
- # fixed yet
-diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
-index 1f389cb..b2237d9 100644
---- a/hw/xfree86/os-support/solaris/sun_init.c
-+++ b/hw/xfree86/os-support/solaris/sun_init.c
-@@ -29,7 +29,7 @@
- #include "xf86.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
--#if defined(__i386__) || defined(__i386) || defined(__x86)
-+#ifdef HAVE_SYS_KD_H
- # include <sys/kd.h>
- #endif
-
-diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
-index 6137406..f9b77d0 100644
---- a/include/xorg-config.h.in
-+++ b/include/xorg-config.h.in
-@@ -54,6 +54,9 @@
- /* Solaris 8 or later? */
- #undef __SOL8__
-
-+/* Define to 1 if you have the <sys/kd.h> header file. */
-+#undef HAVE_SYS_KD_H
-+
- /* Define to 1 if you have the `walkcontext' function (used on Solaris for
- xorg_backtrace in hw/xfree86/common/xf86Events.c */
- #undef HAVE_WALKCONTEXT
---
-1.5.6.5
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/upstream-1.6.2.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,455 @@
+Patches already committed to the server-1.6-branch upstream for
+the upcoming 1.6.2 release, since the xorg-server-1.6.1.901 tag.
+(as of 10am PDT May 9)
+
+From 31536307703fcffa14a027ec777310c9962f816c Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sat, 2 May 2009 00:26:18 -0700
+Subject: [PATCH] XkbSetNamedIndicator should ignore SD's without LED's
+
+When ProcXkbSetNamedIndicator is called on a core device, and we
+walk the slaves to set the LED's on each of them, ignore any slaves
+that do not have either a KbdFeedbackCtrl or LedCtrl structure.
+
+(This is much more critical in xserver-1.5-branch, where we walk
+ *all* devices, not just the slaves of the specified master, and
+ thus return failure when setting an LED on the Core Keyboard and
+ hit a xf86-input-mouse device with no LED's to set.)
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Acked-by: Peter Hutterer <[email protected]>
+(cherry picked from commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ xkb/xkb.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/xkb/xkb.c b/xkb/xkb.c
+index 7c1edea..15a0f43 100644
+--- a/xkb/xkb.c
++++ b/xkb/xkb.c
+@@ -3438,6 +3438,7 @@ ProcXkbSetNamedIndicator(ClientPtr client)
+ for (other = inputInfo.devices; other; other = other->next)
+ {
+ if ((other != dev) && !other->isMaster && (other->u.master == dev) &&
++ (other->kbdfeed || other->leds) &&
+ (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
+ {
+ rc = _XkbCreateIndicatorMap(other, stuff->indicator,
+@@ -3461,6 +3462,7 @@ ProcXkbSetNamedIndicator(ClientPtr client)
+ for (other = inputInfo.devices; other; other = other->next)
+ {
+ if ((other != dev) && !other->isMaster && (other->u.master == dev) &&
++ (other->kbdfeed || other->leds) &&
+ (XaceHook(XACE_DEVICE_ACCESS, client, other, DixSetAttrAccess) == Success))
+ {
+ _XkbSetNamedIndicator(client, other, stuff);
+--
+1.5.6.5
+
+From 78eb366c65a953bbc059a989a92dfe28fbe1ae29 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <[email protected]>
+Date: Thu, 12 Feb 2009 16:02:17 +0000
+Subject: [PATCH] Remove long-gone '-co' option from Xserver man page
+
+The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
+
+Signed-off-by: Jon TURNEY <[email protected]>
+(cherry picked from commit b0ad9e1ced9619f37acf77764c395c57b86cf463)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ doc/Xserver.man.pre | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
+index 8897e1a..eace57d 100644
+--- a/doc/Xserver.man.pre
++++ b/doc/Xserver.man.pre
+@@ -117,10 +117,6 @@ sets key-click volume (allowable range: 0-100).
+ sets the visual class for the root window of color screens.
+ The class numbers are as specified in the X protocol.
+ Not obeyed by all servers.
+-.TP 8
+-.B \-co \fIfilename\fP
+-sets name of RGB color database. The default is
+-.IR __projectroot__/share/X11/rgb .
+ .ig
+ .TP 8
+ .B \-config \fIfilename\fP
+--
+1.5.6.5
+
+From 3f0c73694b9ddc85b82a7a82a5d98fa8b18a01a8 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <[email protected]>
+Date: Thu, 12 Feb 2009 16:03:16 +0000
+Subject: [PATCH] Remove references to rgb.txt from files section of Xserver and Xorg man pages
+
+The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
+
+Signed-off-by: Jon TURNEY <[email protected]>
+(cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ doc/Xserver.man.pre | 3 ---
+ hw/xfree86/doc/man/Xorg.man.pre | 3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
+index eace57d..cd5bdbd 100644
+--- a/doc/Xserver.man.pre
++++ b/doc/Xserver.man.pre
+@@ -560,9 +560,6 @@ Bitmap font directories
+ .IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
+ Outline font directories
+ .TP 30
+-.I __projectroot__/share/X11/rgb.txt
+-Color database
+-.TP 30
+ .I /tmp/.X11-unix/X\fBn\fP
+ Unix domain socket for display number \fBn\fP
+ .TP 30
+diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
+index bf29fcb..4992dc7 100644
+--- a/hw/xfree86/doc/man/Xorg.man.pre
++++ b/hw/xfree86/doc/man/Xorg.man.pre
+@@ -542,9 +542,6 @@ Libraries.
+ .B __projectroot__/lib/X11/fonts/\(**
+ Fonts.
+ .TP 30
+-.B __projectroot__/share/X11/rgb.txt
+-Color names to RGB mapping.
+-.TP 30
+ .B __projectroot__/share/X11/XErrorDB
+ Client error message database.
+ .TP 30
+--
+1.5.6.5
+
+From bc95f29441b3daa7b9d91bd3c2b3e502a3a8cc81 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 23 Apr 2009 08:42:38 -0700
+Subject: [PATCH] Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
+
+Fixes OpenSolaris Bug 8315:
+Xorg segfaults when screensaver fades in cross-endian xdmcp session
+<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+(cherry picked from commit 7d0f7518c2235a9dc783029971259ddaada2db20)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ hw/xfree86/dixmods/extmod/xf86vmode.c | 16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
+index 6485a04..aecaf94 100644
+--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
+@@ -1543,6 +1543,7 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
+ {
+ CARD16 *ramp = NULL;
+ int n, length, i;
++ size_t ramplen;
+ xXF86VidModeGetGammaRampReply rep;
+ REQUEST(xXF86VidModeGetGammaRampReq);
+
+@@ -1557,7 +1558,8 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
+ length = (stuff->size + 1) & ~1;
+
+ if(stuff->size) {
+- if(!(ramp = xalloc(length * 3 * sizeof(CARD16))))
++ ramplen = length * 3 * sizeof(CARD16);
++ if (!(ramp = xalloc(ramplen)))
+ return BadAlloc;
+
+ if (!VidModeGetGammaRamp(stuff->screen, stuff->size,
+@@ -1575,13 +1577,12 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
+ swaps(&rep.sequenceNumber, n);
+ swapl(&rep.length, n);
+ swaps(&rep.size, n);
+- for(i = 0; i < length * 3; i++)
+- swaps(&ramp[i],n);
++ SwapShorts(ramp, length * 3);
+ }
+ WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep);
+
+ if(stuff->size) {
+- WriteToClient(client, rep.length << 2, (char*)ramp);
++ WriteToClient(client, ramplen, (char*)ramp);
+ xfree(ramp);
+ }
+
+@@ -2062,7 +2063,6 @@ SProcXF86VidModeGetGamma(ClientPtr client)
+ static int
+ SProcXF86VidModeSetGammaRamp(ClientPtr client)
+ {
+- CARD16 *ramp;
+ int length, n;
+ REQUEST(xXF86VidModeSetGammaRampReq);
+ swaps(&stuff->length, n);
+@@ -2071,11 +2071,7 @@ SProcXF86VidModeSetGammaRamp(ClientPtr client)
+ swaps(&stuff->screen, n);
+ length = ((stuff->size + 1) & ~1) * 6;
+ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
+- ramp = (CARD16*)&stuff[1];
+- while(length--) {
+- swaps(ramp, n);
+- ramp++;
+- }
++ SwapRestS(stuff);
+ return ProcXF86VidModeSetGammaRamp(client);
+ }
+
+--
+1.5.6.5
+
+From 7cd596e0dd6b9c195d7e395c26bfb00ef544c525 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <[email protected]>
+Date: Wed, 15 Apr 2009 18:26:06 +1000
+Subject: [PATCH] randr12: looking up these bits if randr isn't initialised is bad.
+
+When xinerama is enabled we don't get randr protocol, but the
+driver might still want randr internals
+(cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ hw/xfree86/modes/xf86RandR12.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
+index 6f93a0d..4546492 100644
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -752,8 +752,8 @@ _X_EXPORT Bool
+ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+ {
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+- XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
++ xf86CrtcConfigPtr config;
++ XF86RandRInfoPtr randrp;
+ int c;
+ int width, height;
+ int mmWidth, mmHeight;
+@@ -763,6 +763,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+ return TRUE;
+ #endif
+
++ config = XF86_CRTC_CONFIG_PTR(pScrn);
++ randrp = XF86RANDRINFO(pScreen);
+ /*
+ * Compute size of screen
+ */
+--
+1.5.6.5
+
+From 9c643b1e3ddc4ec9f1a924bd25f24df8536c7ea6 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[email protected]>
+Date: Thu, 16 Apr 2009 16:17:07 +1000
+Subject: [PATCH] os: don't malloc memory in LogVMessageVerb.
+
+LogVWrite is limited to a buffer size of 1024, so we don't loose anything here
+by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends)
+during signal handlers with the normal message types.
+
+Signed-off-by: Peter Hutterer <[email protected]>
+Acked-by: Alan Coopersmith <[email protected]>
+(cherry picked from commit 0e0642ee9466d3268476d0084a83a9d93a4aa555)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ os/log.c | 22 ++++++----------------
+ 1 files changed, 6 insertions(+), 16 deletions(-)
+
+diff --git a/os/log.c b/os/log.c
+index 39bbd60..692e78a 100644
+--- a/os/log.c
++++ b/os/log.c
+@@ -312,7 +312,7 @@ _X_EXPORT void
+ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
+ {
+ const char *s = X_UNKNOWN_STRING;
+- char *tmpBuf = NULL;
++ char tmpBuf[1024];
+
+ /* Ignore verbosity for X_ERROR */
+ if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
+@@ -354,21 +354,11 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
+ break;
+ }
+
+- /*
+- * Prefix the format string with the message type. We do it this way
+- * so that LogVWrite() is only called once per message.
+- */
+- if (s) {
+- tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1);
+- /* Silently return if malloc fails here. */
+- if (!tmpBuf)
+- return;
+- sprintf(tmpBuf, "%s ", s);
+- strcat(tmpBuf, format);
+- LogVWrite(verb, tmpBuf, args);
+- free(tmpBuf);
+- } else
+- LogVWrite(verb, format, args);
++ /* if s is not NULL we need a space before format */
++ snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
++ s ? " " : "",
++ format);
++ LogVWrite(verb, tmpBuf, args);
+ }
+ }
+
+--
+1.5.6.5
+
+From b575af88d0e547a03b164f6f3b2d4b268b9ffc34 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[email protected]>
+Date: Wed, 6 May 2009 22:25:28 +1000
+Subject: [PATCH] Xi: fix copy/paste error causing sizeof against wrong struct.
+
+This wrong check may cause BadLength to be returned to the client even if the
+length is correct.
+
+Signed-off-by: Peter Hutterer <[email protected]>
+(cherry picked from commit 8b583ca2b21155359c6255f406c96599b277c762)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ Xi/xiproperty.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
+index 26af3fc..04b2c81 100644
+--- a/Xi/xiproperty.c
++++ b/Xi/xiproperty.c
+@@ -650,7 +650,7 @@ ProcXChangeDeviceProperty (ClientPtr client)
+ return BadValue;
+ }
+ len = stuff->nUnits;
+- if (len > ((0xffffffff - sizeof(xChangePropertyReq)) >> 2))
++ if (len > ((0xffffffff - sizeof(xChangeDevicePropertyReq)) >> 2))
+ return BadLength;
+ sizeInBytes = format>>3;
+ totalSize = len * sizeInBytes;
+--
+1.5.6.5
+
+From 21f58a2b0d0d96492d2d7c7de1bd654ed0114279 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <[email protected]>
+Date: Wed, 6 May 2009 16:55:32 +1000
+Subject: [PATCH] Xi: don't double-swap the XListDeviceProperties reply.
+
+Signed-off-by: Peter Hutterer <[email protected]>
+(cherry picked from commit 50cc8adafca4ba3838d468278d6eb8a4692d2488)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ Xi/xiproperty.c | 7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
+index 04b2c81..b04ee94 100644
+--- a/Xi/xiproperty.c
++++ b/Xi/xiproperty.c
+@@ -602,13 +602,6 @@ ProcXListDeviceProperties (ClientPtr client)
+ rep.length = (numProps * sizeof(Atom)) >> 2;
+ rep.sequenceNumber = client->sequence;
+ rep.nAtoms = numProps;
+- if (client->swapped)
+- {
+- int n;
+- swaps (&rep.sequenceNumber, n);
+- swapl (&rep.length, n);
+- swaps (&rep.nAtoms, n);
+- }
+ temppAtoms = pAtoms;
+ for (prop = dev->properties.properties; prop; prop = prop->next)
+ *temppAtoms++ = prop->propertyName;
+--
+1.5.6.5
+
+From 773e4890b385a229b0919b4a249714d0bb7171a2 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 26 Mar 2009 22:25:08 -0700
+Subject: [PATCH] Don't leak canonical module name and patterns if module is built-in
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Acked-by: Peter Hutterer <[email protected]>
+(cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ hw/xfree86/loader/loadmod.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
+index e98f013..22b540c 100644
+--- a/hw/xfree86/loader/loadmod.c
++++ b/hw/xfree86/loader/loadmod.c
+@@ -867,7 +867,8 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
+ if (!strcmp (m, *cim))
+ {
+ xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
+- return (ModuleDescPtr) 1;
++ ret = (ModuleDescPtr) 1;
++ goto LoadModule_exit;
+ }
+
+ if (!name) {
+--
+1.5.6.5
+
+From 0fbf6f30f771e60714fb3003a9bb1a6b79e50c6e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 26 Mar 2009 22:22:32 -0700
+Subject: [PATCH] Don't leak default font path when appending built-ins
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+(cherry picked from commit 66539cc05d0b017b9feb4a038499907810140623)
+
+Signed-off-by: Keith Packard <[email protected]>
+---
+ hw/xfree86/common/xf86Config.c | 13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 17223a1..9e56ca9 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -601,7 +601,9 @@ configFiles(XF86ConfFilesPtr fileconf)
+ defaultFontPath = Xprintf("%s%s%s",
+ fileconf->file_fontpath,
+ *temp_path ? "," : "", temp_path);
+- must_copy = FALSE;
++ if (defaultFontPath != NULL) {
++ must_copy = FALSE;
++ }
+ }
+ else
+ defaultFontPath = fileconf->file_fontpath;
+@@ -617,7 +619,14 @@ configFiles(XF86ConfFilesPtr fileconf)
+ !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
+ defaultFontPath = Xprintf("%s%sbuilt-ins",
+ temp_path, *temp_path ? "," : "");
+- must_copy = FALSE;
++ if (must_copy == TRUE) {
++ if (defaultFontPath != NULL) {
++ must_copy = FALSE;
++ }
++ } else {
++ /* already made a copy of the font path */
++ xfree(temp_path);
++ }
+ }
+ /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
+ temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
+--
+1.5.6.5
+
--- a/open-src/xserver/xorg/upstream-man-in-1.6.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,493 +0,0 @@
-From 1e6a1b7d6b8b8838666538bf5cfa91ebf9d6cde0 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <[email protected]>
-Date: Sun, 20 Apr 2008 20:36:44 +0200
-Subject: [PATCH] Minor xorg.conf manpage fixups
-
-Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
-replaced, and rewrap some text to get __xservername__ replaced in the
-description of Option "Accel" (cpp doesn't like the preceding quote).
-(cherry picked from commit 40c6be1408a1f0b236fdb28af27ae18aea0d578f)
----
- hw/xfree86/doc/man/xorg.conf.man.pre | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index de93aaf..198a37c 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -54,7 +54,7 @@ is the relative path (with no \(lq..\(rq components) specified by that
- environment variable, and
- .I <hostname>
- is the machine's hostname as reported by
--.BR gethostname (__oslibmansuffix__).
-+.BR gethostname (__libmansuffix__).
- .PP
- When the __xservername__ server is started by the \(lqroot\(rq user, the config file
- search locations are as follows:
-@@ -93,7 +93,7 @@ is the path specified by that environment variable (usually the home
- directory), and
- .I <hostname>
- is the machine's hostname as reported by
--.BR gethostname (__oslibmansuffix__).
-+.BR gethostname (__libmansuffix__).
- .PP
- The
- .I __xconfigfile__
-@@ -1626,8 +1626,8 @@ Others are driver\-independent, and will eventually be described here.
- .\" XXX These should really be in an xaa man page.
- .TP 7
- .BI "Option \*qAccel\*q"
--Enables XAA (X Acceleration Architecture), a mechanism that makes video
--cards' 2D hardware acceleration available to the __xservername__ server.
-+Enables XAA (X Acceleration Architecture), a mechanism that makes video cards'
-+2D hardware acceleration available to the __xservername__ server.
- This option is on by default, but it may be necessary to turn it off if
- there are bugs in the driver.
- There are many options to disable specific accelerated operations, listed
---
-1.5.6.5
-
-From 754300e87afc2dc23d285f486efb50610f51f5a1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Thu, 2 Oct 2008 17:56:31 -0400
-Subject: [PATCH] xorg.conf.man: We don't look in root's ~ anymore, don't say we do.
- (cherry picked from commit 56a24cf894a142b18c7f18e294074c32031f3d14)
-
----
- hw/xfree86/doc/man/xorg.conf.man.pre | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 198a37c..bd426c4 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -67,7 +67,6 @@ search locations are as follows:
- .B $XORGCONFIG
- .IB /etc/X11/ $XORGCONFIG
- .IB __projectroot__/etc/X11/ $XORGCONFIG
--.BI $HOME /__xconfigfile__
- .I /etc/X11/__xconfigfile__\-4
- .I /etc/X11/__xconfigfile__
- .I /etc/__xconfigfile__
---
-1.5.6.5
-
-From aaaf9869e2e72debfbc9565f159951498ce9b82b Mon Sep 17 00:00:00 2001
-From: Julien Cristau <[email protected]>
-Date: Sat, 25 Oct 2008 22:54:15 +0200
-Subject: [PATCH] Bug#5851: Document the "Log" option in xorg.conf(5)
- (cherry picked from commit fd97ff1bdd30c358525068a4c833f681e00719a2)
-
----
- hw/xfree86/doc/man/xorg.conf.man.pre | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index bd426c4..7542aa0 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -708,6 +708,15 @@ If this option is disabled, then the devices will be added (and the
- DevicePresenceNotify event sent), but not enabled, thus leaving policy up
- to the client.
- Enabled by default.
-+.TP 7
-+.BI "Option \*qLog\*q \*q" string \*q
-+This option controls whether the log is flushed and/or synced to disk after
-+each message.
-+Possible values are
-+.B flush
-+or
-+.BR sync .
-+Unset by default.
- .SH "MODULE SECTION"
- The
- .B Module
---
-1.5.6.5
-
-From 53dfdff25b2b5d129dc60aa18ef5f3e81e181f1a Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 1 Dec 2008 16:28:45 -0800
-Subject: [PATCH] Update See Also lists in Xorg & xorg.conf man pages
-
-Remove xorgconfig & xorgcfg
-Update driver lists:
- - Remove vga
- - i810->intel
- - via->openchrome
-(cherry picked from commit 24c562f04b41d219c34f5fa3f963564accf329f2)
----
- hw/xfree86/doc/man/Xorg.man.pre | 6 +++---
- hw/xfree86/doc/man/xorg.conf.man.pre | 7 +++----
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
-index 8b48951..e427e51 100644
---- a/hw/xfree86/doc/man/Xorg.man.pre
-+++ b/hw/xfree86/doc/man/Xorg.man.pre
-@@ -577,7 +577,7 @@ Initial access control list for display
- .IR n .
- .SH "SEE ALSO"
- X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
--__xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), xorgcfg(__appmansuffix__), xvidtune(__appmansuffix__),
-+__xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__),
- apm(__drivermansuffix__),
- ati(__drivermansuffix__),
- chips(__drivermansuffix__),
-@@ -588,12 +588,13 @@ glide(__drivermansuffix__),
- glint(__drivermansuffix__),
- i128(__drivermansuffix__),
- i740(__drivermansuffix__),
--i810(__drivermansuffix__),
- imstt(__drivermansuffix__),
-+intel(__drivermansuffix__),
- mga(__drivermansuffix__),
- neomagic(__drivermansuffix__),
- nsc(__drivermansuffix__),
- nv(__drivermansuffix__),
-+openchrome (__drivermansuffix__),
- r128(__drivermansuffix__),
- rendition(__drivermansuffix__),
- s3virge(__drivermansuffix__),
-@@ -612,7 +613,6 @@ trident(__drivermansuffix__),
- tseng(__drivermansuffix__),
- v4l(__drivermansuffix__),
- vesa(__drivermansuffix__),
--vga(__drivermansuffix__),
- vmware(__drivermansuffix__),
- .br
- Web site
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 7542aa0..a3ab9a0 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -2163,7 +2163,7 @@ General:
- .PP
- Display drivers:
- .BR apm (__drivermansuffix__),
--.\" .BR ati (__drivermansuffix__),
-+.BR ati (__drivermansuffix__),
- .BR chips (__drivermansuffix__),
- .BR cirrus (__drivermansuffix__),
- .BR cyrix (__drivermansuffix__),
-@@ -2172,11 +2172,12 @@ Display drivers:
- .BR glint (__drivermansuffix__),
- .BR i128 (__drivermansuffix__),
- .BR i740 (__drivermansuffix__),
--.BR i810 (__drivermansuffix__),
- .BR imstt (__drivermansuffix__),
-+.BR intel (__drivermansuffix__),
- .BR mga (__drivermansuffix__),
- .BR neomagic (__drivermansuffix__),
- .BR nv (__drivermansuffix__),
-+.BR openchrome (__drivermansuffix__),
- .BR r128 (__drivermansuffix__),
- .BR rendition (__drivermansuffix__),
- .BR savage (__drivermansuffix__),
-@@ -2195,8 +2196,6 @@ Display drivers:
- .BR trident (__drivermansuffix__),
- .BR tseng (__drivermansuffix__),
- .BR vesa (__drivermansuffix__),
--.BR vga (__drivermansuffix__),
--.BR via (__drivermansuffix__),
- .BR vmware (__drivermansuffix__).
- .PP
- Input drivers:
---
-1.5.6.5
-
-From 5b9acd1d5a10e38a6fdaa99bb20efc7bcaa819a7 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 1 Dec 2008 20:02:34 -0800
-Subject: [PATCH] More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.
-
-- Remove remaining references to XFree86-Misc options AllowNonLocalModInDev
- and DisableModInDev.
-- Remove remaining references to grab-breaking keys & associated options.
-- Update description of Ctrl-Alt-Backspace to new -retro/DontZap defaults.
-- Add description of new options -modalias and -showopts.
-- Update list of modules loaded by default.
-- Update input driver references from keyboard to evdev & kbd.
-- Update list of driver man pages to match xf86-*-* drivers with man pages.
-- Add See Also section to exa man page.
-
-and various formatting/typo/etc. fixes.
-
-The Xorg/xorg.conf sections on input device selection could use further
-updates to better match the current state of HAL-enabled configuration.
-
-(Cherry-picked from commit 8c560422b44e012053612754430d2b87dc44ed59 and
- amended to only include changes relevant to Xorg 1.5.x branch)
----
- hw/xfree86/doc/man/Xorg.man.pre | 8 +++---
- hw/xfree86/doc/man/xorg.conf.man.pre | 40 +++++++++++++++++++++++-----------
- hw/xfree86/exa/exa.man.pre | 16 +++++++------
- 3 files changed, 40 insertions(+), 24 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
-index e427e51..504552c 100644
---- a/hw/xfree86/doc/man/Xorg.man.pre
-+++ b/hw/xfree86/doc/man/Xorg.man.pre
-@@ -133,8 +133,8 @@ specifies the Virtual Terminal device number which
- will use. Without this option,
- .B __xservername__
- will pick the first available Virtual Terminal that it can locate. This
--option applies only to platforms such as Linux, BSD, SVR3 and SVR4, that
--have virtual terminal support.
-+option applies only to platforms that have virtual terminal support, such
-+as Linux, BSD, SVR3, and SVR4.
- .TP
- .B \-allowMouseOpenFail
- Allow the server to start up even if the mouse device can't be opened
-@@ -486,7 +486,7 @@ __xconfigfile__(__filemansuffix__) file option is specified, this key sequence
- deactivates any active keyboard and mouse grabs.
- .TP 8
- .B Ctrl+Alt+F1...F12
--For BSD and Linux systems with virtual terminal support, these keystroke
-+For systems with virtual terminal support, these keystroke
- combinations are used to switch to virtual terminals 1 through 12,
- respectively. This can be disabled with the
- .B DontVTSwitch
-@@ -620,7 +620,7 @@ Web site
-
- .SH AUTHORS
- __xservername__ has many contributors world wide. The names of most of them
--can be found in the documentation, CHANGELOG files in the source tree,
-+can be found in the documentation, ChangeLog files in the source tree,
- and in the actual source code.
- .PP
- __xservername__ was originally based on XFree86 4.4rc2.
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index a3ab9a0..5accde6 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -803,7 +803,8 @@ __projectroot__/lib/modules/extensions
- .fi
- .RE
- .PP
--The \(lqbitmap\(rq font module is loaded automatically.
-+The \(lqextmod\(rq, \(lqdbe\(rq, \(lqglx\(rq, and \(lqdri\(rq extension
-+modules are loaded automatically, unless disabled with \*qDisable\*q entries.
- It is recommended
- that at very least the \(lqextmod\(rq extension module be loaded.
- If it isn't, some commonly used server extensions (like the SHAPE
-@@ -863,9 +864,12 @@ or
- command line options, or if it is selected implicitly as the core pointer
- or keyboard device in the absence of such explicit references.
- The most commonly used input drivers are
--.BR keyboard (__drivermansuffix__)
-+.BR evdev (__drivermansuffix__)
-+on Linux systems, and
-+.BR kbd (__drivermansuffix__)
- and
--.BR mouse (__drivermansuffix__).
-+.BR mouse (__drivermansuffix__)
-+on other platforms.
- .PP
- In the absence of an explicitly specified core input device, the first
- .B InputDevice
-@@ -876,7 +880,7 @@ marked as
- is used.
- If there is no match there, the first
- .B InputDevice
--that uses the \(lqmouse\(rq (or \(lqkeyboard\(rq or \(lqkbd\(rq) driver is used.
-+that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used.
- The final fallback is to use built\-in default configurations.
- .PP
- .B InputDevice
-@@ -2159,7 +2163,7 @@ General:
- .BR cvt (__appmansuffix__),
- .BR gtf (__appmansuffix__).
- .PP
--.B Not all modules or interfaces are available on all platforms.
-+.B "Not all modules or interfaces are available on all platforms."
- .PP
- Display drivers:
- .BR apm (__drivermansuffix__),
-@@ -2179,11 +2183,13 @@ Display drivers:
- .BR nv (__drivermansuffix__),
- .BR openchrome (__drivermansuffix__),
- .BR r128 (__drivermansuffix__),
-+.BR radeon (__drivermansuffix__),
- .BR rendition (__drivermansuffix__),
- .BR savage (__drivermansuffix__),
- .BR s3virge (__drivermansuffix__),
- .BR siliconmotion (__drivermansuffix__),
- .BR sis (__drivermansuffix__),
-+.BR sisusb (__drivermansuffix__),
- .BR sunbw2 (__drivermansuffix__),
- .BR suncg14 (__drivermansuffix__),
- .BR suncg3 (__drivermansuffix__),
-@@ -2192,35 +2198,43 @@ Display drivers:
- .BR sunleo (__drivermansuffix__),
- .BR suntcx (__drivermansuffix__),
- .BR tdfx (__drivermansuffix__),
--.BR tga (__drivermansuffix__),
-+.\" .BR tga (__drivermansuffix__),
- .BR trident (__drivermansuffix__),
- .BR tseng (__drivermansuffix__),
- .BR vesa (__drivermansuffix__),
--.BR vmware (__drivermansuffix__).
-+.BR vmware (__drivermansuffix__),
-+.BR voodoo (__drivermansuffix__),
-+.BR wsfb (__drivermansuffix__),
-+.BR xgi (__drivermansuffix__),
-+.BR xgixp (__drivermansuffix__).
- .PP
- Input drivers:
--.\" .BR acecad (__drivermansuffix__),
--.\" .BR calcomp (__drivermansuffix__),
-+.BR acecad (__drivermansuffix__),
-+.BR calcomp (__drivermansuffix__),
- .BR citron (__drivermansuffix__),
- .BR dmc (__drivermansuffix__),
- .BR dynapro (__drivermansuffix__),
- .BR elographics (__drivermansuffix__),
-+.BR evdev (__drivermansuffix__),
- .BR fpit (__drivermansuffix__),
- .BR js_x (__drivermansuffix__),
-+.BR joystick (__drivermansuffix__),
- .BR kbd (__drivermansuffix__),
--.BR keyboard (__drivermansuffix__),
--.\" .BR magictouch (__drivermansuffix__),
-+.BR magictouch (__drivermansuffix__),
- .BR microtouch (__drivermansuffix__),
--.BR mouse (__drivermansuffix__),
-+.BR mousedrv (__drivermansuffix__),
- .BR mutouch (__drivermansuffix__),
- .BR palmax (__drivermansuffix__),
- .BR penmount (__drivermansuffix__),
-+.BR synaptics (__drivermansuffix__),
- .BR tek4957 (__drivermansuffix__),
--.\" .BR ur98 (__drivermansuffix__),
-+.BR ur98 (__drivermansuffix__),
-+.BR vmmouse (__drivermansuffix__),
- .BR void (__drivermansuffix__),
- .BR wacom (__drivermansuffix__).
- .PP
- Other modules and interfaces:
-+.BR exa (__drivermansuffix__),
- .BR fbdevhw (__drivermansuffix__),
- .\" .BR shadowfb (__drivermansuffix__),
- .BR v4l (__drivermansuffix__).
-diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/exa.man.pre
-index 14859bc..cdd39bb 100644
---- a/hw/xfree86/exa/exa.man.pre
-+++ b/hw/xfree86/exa/exa.man.pre
-@@ -6,24 +6,23 @@ exa \- new 2D acceleration architecture for X.Org
- .SH DESCRIPTION
- .B EXA
- provides a simple API for video drivers to implement for 2D acceleration. It
--is a module loaded by drivers, and is not intended to be loaded on its own. See
--your driver's manual page for how to enable
--.B EXA
--.
-+is a module loaded by drivers, and is not intended to be loaded on its own.
-+See your driver's manual page for how to enable
-+.BR EXA .
- .PP
- The
- .B EXA
- architecture is designed to make accelerating the Render extension simple and
- efficient, and results in various performance tradeoffs compared to XAA. Some
--options are available for debugging performance issues or driver rendering
--problems. They are not intended for general use.
-+__xconfigfile__ options are available for debugging performance issues or
-+driver rendering problems. They are not intended for general use.
- .TP
- .BI "Option \*qEXANoComposite\*q \*q" boolean \*q
- Disables acceleration of the Composite operation, which is at the heart of
- the Render extension. Not related to the Composite extension. Default: No.
- .TP
- .BI "Option \*qEXANoUploadToScreen\*q \*q" boolean \*q
--Disables acceleration of uploading pixmap data to the freamebuffer. Default: No.
-+Disables acceleration of uploading pixmap data to the framebuffer. Default: No.
- .TP
- .BI "Option \*qEXANoDownloadFromScreen\*q \*q" boolean \*q
- Disables acceleration of downloading of pixmap data from the framebuffer.
-@@ -42,5 +41,8 @@ Chooses an alternate pixmap migration heuristic, for debugging purposes. The
- default is intended to be the best performing one for general use, though others
- may help with specific use cases. Available options include \*qalways\*q,
- \*qgreedy\*q, and \*qsmart\*q. Default: always.
-+.SH "SEE ALSO"
-+.BR __xservername__ (__appmansuffix__),
-+.BR __xconfigfile__(__filemansuffix__).
- .SH AUTHORS
- Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
---
-1.5.6.5
-
-From 17f9968f91e277d28fa0a124f5d46c2498a28acb Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 19 Feb 2009 13:57:28 -0800
-Subject: [PATCH] Add Extensions section to xorg.conf man page
-
-Extensions section was added in X11R6.8.0 and documented in the release notes:
- http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
-but never made it into the man page.
-
-Also fix a bonus typo.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
-(cherry picked from commit ab61033700b5383a7a15370dd054eaa80e72e811)
----
- hw/xfree86/doc/man/xorg.conf.man.pre | 29 ++++++++++++++++++++++++++++-
- 1 files changed, 28 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 5accde6..7598ab1 100644
---- a/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -115,6 +115,7 @@ The section names are:
- .BR "Files " "File pathnames"
- .BR "ServerFlags " "Server flags"
- .BR "Module " "Dynamic module loading"
-+.BR "Extensions " "Extension enabling"
- .BR "InputDevice " "Input device description"
- .BR "Device " "Graphics device description"
- .BR "VideoAdaptor " "Xv video adaptor description"
-@@ -313,7 +314,7 @@ where
- .I <identifier>
- is an alphanumeric identifier,
- .I [attribute]
--is an attribute wich will be passed to the underlying FPE and
-+is an attribute which will be passed to the underlying FPE and
- .I <priority>
- is a number used to order the fontfile FPEs. Examples:
- .PP
-@@ -809,6 +810,32 @@ It is recommended
- that at very least the \(lqextmod\(rq extension module be loaded.
- If it isn't, some commonly used server extensions (like the SHAPE
- extension) will not be available.
-+.SH "EXTENSIONS SECTION"
-+The
-+.B Extensions
-+section is used to specify which X11 protocol extensions should be enabled
-+or disabled.
-+The
-+.B Extensions
-+section is optional, as are all of the entries that may be specified in
-+it.
-+.PP
-+Entries in this section are listed as Option statements with the name of
-+the extension as the first argument, and a boolean value as the second.
-+The extension name is case\-sensitive, and matches the form shown in the output
-+of \*qXorg -extension ?\*q.
-+.PP
-+.RS 7
-+Example: the MIT-SHM extension can be disabled with the following entry:
-+.PP
-+.RS 4
-+.nf
-+.B "Section \*qExtensions\*q"
-+.B " Option \*qMIT-SHM\*q \*qDisable\*q"
-+.B "EndSection"
-+.fi
-+.RE
-+.RE
- .SH "INPUTDEVICE SECTION"
- The config file may have multiple
- .B InputDevice
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/upstream-man-post-1.6.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-From 66979a040e41c7890435c084f9ff12f7806e9dd2 Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <[email protected]>
-Date: Thu, 12 Feb 2009 16:02:17 +0000
-Subject: [PATCH] Remove long-gone '-co' option from Xserver man page
-
-The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
-
-Signed-off-by: Jon TURNEY <[email protected]>
-(cherry picked from commit b0ad9e1ced9619f37acf77764c395c57b86cf463)
----
- doc/Xserver.man.pre | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
-index 8fe3b76..5861736 100644
---- a/doc/Xserver.man.pre
-+++ b/doc/Xserver.man.pre
-@@ -117,10 +117,6 @@ sets key-click volume (allowable range: 0-100).
- sets the visual class for the root window of color screens.
- The class numbers are as specified in the X protocol.
- Not obeyed by all servers.
--.TP 8
--.B \-co \fIfilename\fP
--sets name of RGB color database. The default is
--.IR __projectroot__/share/X11/rgb .
- .ig
- .TP 8
- .B \-config \fIfilename\fP
---
-1.5.6.5
-
-From 202b7e9644ce79955f24fb610a5da2dac1e51998 Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <[email protected]>
-Date: Thu, 12 Feb 2009 16:03:16 +0000
-Subject: [PATCH] Remove references to rgb.txt from files section of Xserver and Xorg man pages
-
-The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
-
-Signed-off-by: Jon TURNEY <[email protected]>
-(cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3)
----
- doc/Xserver.man.pre | 3 ---
- hw/xfree86/doc/man/Xorg.man.pre | 3 ---
- 2 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
-index 5861736..5d1f7b0 100644
---- a/doc/Xserver.man.pre
-+++ b/doc/Xserver.man.pre
-@@ -553,9 +553,6 @@ Bitmap font directories
- .IR __projectroot__/lib/X11/fonts/TTF , __projectroot__/lib/X11/fonts/Type1
- Outline font directories
- .TP 30
--.I __projectroot__/share/X11/rgb.txt
--Color database
--.TP 30
- .I /tmp/.X11-unix/X\fBn\fP
- Unix domain socket for display number \fBn\fP
- .TP 30
-diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
-index 504552c..b96dc0a 100644
---- a/hw/xfree86/doc/man/Xorg.man.pre
-+++ b/hw/xfree86/doc/man/Xorg.man.pre
-@@ -560,9 +560,6 @@ Libraries.
- .B __projectroot__/lib/X11/fonts/\(**
- Fonts.
- .TP 30
--.B __projectroot__/share/X11/rgb.txt
--Color names to RGB mapping.
--.TP 30
- .B __projectroot__/share/X11/XErrorDB
- Client error message database.
- .TP 30
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/x86-64-ifdef.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-From 9719354ae04a41e9834ac9ba8fd9e895092ba4f1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Tue, 24 Jun 2008 14:37:06 -0400
-Subject: [PATCH] Check for __amd64__, not __x86_64__.
-
-Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe. Intel's C
-compiler claims to be gcc-compatible; if they're not defining the same
-macros as gcc then that's their bug, not ours. Even if we were to do
-this aliasing we should do it once and for all in servermd.h.
----
- fb/fb.h | 2 +-
- hw/xfree86/common/compiler.h | 2 +-
- hw/xfree86/common/xf86AutoConfig.c | 2 +-
- hw/xfree86/loader/loader.c | 2 +-
- hw/xfree86/os-support/bsd/bsdResource.c | 2 +-
- hw/xfree86/os-support/bus/Pci.h | 2 +-
- hw/xfree86/os-support/misc/SlowBcopy.c | 4 ++--
- hw/xfree86/utils/xorgcfg/loadmod.c | 2 +-
- hw/xfree86/x86emu/prim_ops.c | 2 +-
- hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 2 +-
- hw/xfree86/x86emu/x86emu/types.h | 2 +-
- include/servermd.h | 2 +-
- mi/micoord.h | 2 +-
- 13 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/fb/fb.h b/fb/fb.h
-index 8e76beb..2c6c4fb 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -138,7 +138,7 @@ # if defined(__alpha__) || defined(__al
- defined(ia64) || defined(__ia64__) || \
- defined(__sparc64__) || defined(_LP64) || \
- defined(__s390x__) || \
-- defined(amd64) || defined (__amd64__) || defined(__x86_64__) || \
-+ defined(amd64) || defined (__amd64__) \
- defined (__powerpc64__) || \
- (defined(sgi) && (_MIPS_SZLONG == 64))
- typedef unsigned long FbBits;
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 9e7f821..a20baa3 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -498,7 +498,7 @@ extern unsigned int inb(unsigned long po
- extern unsigned int inw(unsigned long port);
- extern unsigned int inl(unsigned long port);
-
--# elif defined(linux) && (defined(__amd64__) || defined(__x86_64__))
-+# elif defined(linux) && defined(__amd64__)
-
- # include <inttypes.h>
-
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7e5fab4..a786eed 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -454,7 +454,7 @@ #endif /* __linux__ */
- if (info != NULL)
- chosen_driver = videoPtrToDriverName(info);
- if (chosen_driver == NULL) {
--#if defined __i386__ || defined __amd64__ || defined __x86_64__ || defined __hurd__
-+#if defined __i386__ || defined __amd64__ || defined __hurd__
- chosen_driver = "vesa";
- #elif defined __sparc__
- chosen_driver = "sunffb";
-diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
-index a00269b..774a4c4 100644
---- a/hw/xfree86/loader/loader.c
-+++ b/hw/xfree86/loader/loader.c
-@@ -63,7 +63,7 @@ #include <fcntl.h>
- #include <string.h>
- #if defined(linux) && \
- (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
-- || defined(__amd64__) || defined(__x86_64__))
-+ || defined(__amd64__))
- #include <malloc.h>
- #endif
- #include <stdarg.h>
-diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c
-index d1ee787..fe166c8 100644
---- a/hw/xfree86/os-support/bsd/bsdResource.c
-+++ b/hw/xfree86/os-support/bsd/bsdResource.c
-@@ -19,7 +19,7 @@ #include "bus/Pci.h"
-
- #ifdef INCLUDE_XF86_NO_DOMAIN
-
--#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__)
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
-
- resPtr
- xf86AccResFromOS(resPtr ret)
-diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
-index 557483b..a1390c0 100644
---- a/hw/xfree86/os-support/bus/Pci.h
-+++ b/hw/xfree86/os-support/bus/Pci.h
-@@ -202,7 +202,7 @@ #if !defined(ARCH_PCI_INIT)
- /*
- * Select architecture specific PCI init function
- */
--#if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64)
- # define ARCH_PCI_INIT ix86PciInit
- #elif defined(__powerpc__) || defined(__powerpc64__)
- # define ARCH_PCI_INIT ppcPciInit
-diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
-index 5cd7168..7c51fcc 100644
---- a/hw/xfree86/os-support/misc/SlowBcopy.c
-+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
-@@ -30,7 +30,7 @@ xf86SetReallySlowBcopy(void)
- really_slow_bcopy = 1;
- }
-
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__)
- static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
- {
- while(len--)
-@@ -45,7 +45,7 @@ #endif
- _X_EXPORT void
- xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
- {
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__)
- if (really_slow_bcopy) {
- xf86_really_slow_bcopy(src, dst, len);
- return;
-diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c
-index 629dfe1..748bd3a 100644
---- a/hw/xfree86/utils/xorgcfg/loadmod.c
-+++ b/hw/xfree86/utils/xorgcfg/loadmod.c
-@@ -181,7 +181,7 @@ LOOKUP xfree86LookupTab[] = {
- SYMFUNC(xf86memcpy)
- #if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || \
- defined(__sparc__) || defined(__sparc) || defined(__ia64__) || \
-- defined (__amd64__) || defined(__x86_64__)
-+ defined (__amd64__)
- /*
- * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle
- * structure copies. This causes a problem both here and in shared
-diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
-index 41968e1..4a6ac5d 100644
---- a/hw/xfree86/x86emu/prim_ops.c
-+++ b/hw/xfree86/x86emu/prim_ops.c
-@@ -103,7 +103,7 @@ #define PRIM_OPS_NO_REDEFINE_ASM
- #include "x86emu/x86emui.h"
-
- #if defined(__GNUC__)
--# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__)
-+# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__)
- # include "x86emu/prim_x86_gcc.h"
- # endif
- #endif
-diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
-index 5a443cd..5530a3a 100644
---- a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
-+++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
-@@ -42,7 +42,7 @@ #define __X86EMU_PRIM_X86_GCC_H
-
- #include "x86emu/types.h"
-
--#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) || defined(__x86_64__))
-+#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__amd64__))
- #error This file is intended to be used by gcc on i386 or x86-64 system
- #endif
-
-diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
-index 2d41b0f..ff28885 100644
---- a/hw/xfree86/x86emu/x86emu/types.h
-+++ b/hw/xfree86/x86emu/x86emu/types.h
-@@ -75,7 +75,7 @@ #if defined (_LP64) || \
- defined(__sparc64__) || \
- defined(__s390x__) || \
- (defined(__hppa__) && defined(__LP64)) || \
-- defined(__amd64__) || defined(amd64) || defined(__x86_64__) || \
-+ defined(__amd64__) || defined(amd64) \
- (defined(__sgi) && (_MIPS_SZLONG == 64))
- #define NUM32 int
- #else
-diff --git a/include/servermd.h b/include/servermd.h
-index 91b705b..f10e6bc 100644
---- a/include/servermd.h
-+++ b/include/servermd.h
-@@ -285,7 +285,7 @@ # define GLYPHPADBYTES 4
-
- #endif /* ia64 */
-
--#if defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)
-+#if defined(__amd64__) || defined(amd64) || defined(__amd64)
- # define IMAGE_BYTE_ORDER LSBFirst
-
- # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-diff --git a/mi/micoord.h b/mi/micoord.h
-index 876e88c..16d0861 100644
---- a/mi/micoord.h
-+++ b/mi/micoord.h
-@@ -48,7 +48,7 @@ #if defined(mips) || defined(sgi) || \
- defined(__alpha) || defined(__alpha__) || \
- defined(__i386__) || defined(__i386) || defined(__ia64__) || \
- defined(__s390x__) || defined(__s390__) || \
-- defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__)
-+ defined(__amd64__) || defined(amd64) || defined(__amd64)
- #define GetHighWord(x) (((int) (x)) >> 16)
- #else
- #define GetHighWord(x) (((int) (x)) / 65536)
---
-1.4.1
-
--- a/open-src/xserver/xorg/x86emu-fix-build.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-From 9ed9d98dec58d1f7468d02c4b951811b8e1ca7c1 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <[email protected]>
-Date: Tue, 24 Jun 2008 22:36:32 +0200
-Subject: [PATCH] x86emu: fix build, fallout from 9719354
----
- hw/xfree86/x86emu/x86emu/types.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
-index ff28885..c0c09c1 100644
---- a/hw/xfree86/x86emu/x86emu/types.h
-+++ b/hw/xfree86/x86emu/x86emu/types.h
-@@ -75,7 +75,7 @@ #if defined (_LP64) || \
- defined(__sparc64__) || \
- defined(__s390x__) || \
- (defined(__hppa__) && defined(__LP64)) || \
-- defined(__amd64__) || defined(amd64) \
-+ defined(__amd64__) || defined(amd64) || \
- (defined(__sgi) && (_MIPS_SZLONG == 64))
- #define NUM32 int
- #else
---
-1.4.1
-
--- a/open-src/xserver/xorg/xephyr-man.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-[Adjusted to apply to 1.5.x tree]
-
-From 6a1b2fed7e465a9c652e8ee250b8eab440945862 Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <[email protected]>
-Date: Sun, 28 Sep 2008 12:18:16 +0200
-Subject: [PATCH] Add a man page for Xephyr, with information from the README file.
-
----
- hw/kdrive/ephyr/Makefile.am | 16 +++++++-
- hw/kdrive/ephyr/Xephyr.man.pre | 84 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 99 insertions(+), 1 deletions(-)
- create mode 100644 hw/kdrive/ephyr/Xephyr.man.pre
-
-diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
-index bf1f475..9380e4d 100644
---- a/hw/kdrive/ephyr/Makefile.am
-+++ b/hw/kdrive/ephyr/Makefile.am
-@@ -83,2 +83,18 @@ Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
- relink:
- rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
-+
-+MAN_SRCS = Xephyr.man.pre
-+
-+appmandir = $(APP_MAN_DIR)
-+appman_DATA = Xephyr.$(APP_MAN_SUFFIX)
-+
-+Xephyr.$(APP_MAN_SUFFIX): Xephyr.man
-+ -rm -f Xephyr.$(APP_MAN_SUFFIX)
-+ $(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX)
-+
-+include $(top_srcdir)/cpprules.in
-+
-+CLEANFILES = $(appman_DATA) Xephyr.man
-+
-+EXTRA_DIST = \
-+ $(MAN_SRCS)
-diff --git a/hw/kdrive/ephyr/Xephyr.man.pre b/hw/kdrive/ephyr/Xephyr.man.pre
-new file mode 100644
-index 0000000..19c9b86
---- /dev/null
-+++ b/hw/kdrive/ephyr/Xephyr.man.pre
-@@ -0,0 +1,84 @@
-+."
-+." Copyright (c) Matthieu Herrb <[email protected]>
-+."
-+." Permission to use, copy, modify, and distribute this software for any
-+." purpose with or without fee is hereby granted, provided that the above
-+." copyright notice and this permission notice appear in all copies.
-+."
-+." THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+." WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+." MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+." ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+." WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+." ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+." OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+."
-+.TH Xephyr __appmansuffix__ __vendorversion__
-+.SH NAME
-+Xephyr - X server outputting to a window on a pre-existing X display
-+.SH SYNOPSIS
-+.B Xephyr
-+.RI [\fB:\fP display ]
-+.RI [ option
-+.IR ... ]
-+.SH DESCRIPTION
-+.B Xephyr
-+is a a kdrive server that outputs to a window on a pre-existing
-+'host' X display.
-+Think
-+.I Xnest
-+but with support for modern extensions like composite, damage and randr.
-+.PP
-+Unlike
-+.I Xnest
-+which is an X proxy, i.e. limited to the capabilities of the host X server,
-+.B Xephyr
-+is a real X server which
-+uses the host X server window as "framebuffer" via fast SHM XImages.
-+.PP
-+It also has support for "visually" debugging what the server is
-+painting.
-+.SH OPTIONS
-+.TP 8
-+.BI -screen " width" x height
-+sets the screen size.
-+.TP 8
-+.BI -parent " id"
-+uses exiting window
-+.I id .
-+.TP 8
-+.B -host-cursor
-+set 'cursor acceleration':
-+The host's cursor is reused. This is only really there to aid
-+debugging by avoiding server paints for the cursor. Performance
-+improvement is negiable.
-+.SH "SIGNALS"
-+Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
-+toggle the debugging mode.
-+In this mode red rectangles are painted to
-+screen areas getting painted before painting the actual content.
-+The
-+delay between this can be altered by setting a XEPHYR_PAUSE env var to
-+a value in micro seconds.
-+.SH CAVEATS
-+.PP
-+.IP \(bu 2
-+Rotated displays are currently updated via full blits. This
-+is slower than a normal oprientated display. Debug mode will
-+therefore not be of much use rotated.
-+.IP \(bu 2
-+The '-host-cursor' cursor is static in its appearence.
-+.IP \(bu 2
-+The build gets a warning about 'nanosleep'. I think the various '-D'
-+build flags are causing this. I havn't figured as yet how to work
-+round it. It doesn't appear to break anything however.
-+.IP \(bu 2
-+Keyboard handling is basic but works.
-+.TP \(bu 2
-+Mouse button 5 probably wont work.
-+.SH "SEE ALSO"
-+X(__miscmansuffix), Xserver(__appmansuffix__)
-+.SH AUTHOR
-+Matthew Allum <[email protected]> 2004
-+
-+
---
-1.5.6.5
-
-
-From dacad9ae0bdaedff9403fbe84a5c5a4b4eef3542 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Fri, 21 Nov 2008 17:16:22 -0800
-Subject: [PATCH] Xephyr man page typo fixes.
-
-Also trailing white space removal to clear git warnings.
----
- hw/kdrive/ephyr/Xephyr.man.pre | 42 ++++++++++++++++++++--------------------
- 1 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/Xephyr.man.pre b/hw/kdrive/ephyr/Xephyr.man.pre
-index 19c9b86..7f0e811 100644
---- a/hw/kdrive/ephyr/Xephyr.man.pre
-+++ b/hw/kdrive/ephyr/Xephyr.man.pre
-@@ -22,17 +22,17 @@ Xephyr - X server outputting to a window on a pre-existing X display
- .RI [ option
- .IR ... ]
- .SH DESCRIPTION
--.B Xephyr
-+.B Xephyr
- is a a kdrive server that outputs to a window on a pre-existing
--'host' X display.
--Think
--.I Xnest
--but with support for modern extensions like composite, damage and randr.
-+'host' X display.
-+Think
-+.I Xnest
-+but with support for modern extensions like composite, damage and randr.
- .PP
--Unlike
--.I Xnest
--which is an X proxy, i.e. limited to the capabilities of the host X server,
--.B Xephyr
-+Unlike
-+.I Xnest
-+which is an X proxy, i.e. limited to the capabilities of the host X server,
-+.B Xephyr
- is a real X server which
- uses the host X server window as "framebuffer" via fast SHM XImages.
- .PP
-@@ -51,12 +51,12 @@ uses exiting window
- set 'cursor acceleration':
- The host's cursor is reused. This is only really there to aid
- debugging by avoiding server paints for the cursor. Performance
--improvement is negiable.
-+improvement is negligible.
- .SH "SIGNALS"
- Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
--toggle the debugging mode.
-+toggle the debugging mode.
- In this mode red rectangles are painted to
--screen areas getting painted before painting the actual content.
-+screen areas getting painted before painting the actual content.
- The
- delay between this can be altered by setting a XEPHYR_PAUSE env var to
- a value in micro seconds.
-@@ -64,21 +64,21 @@ a value in micro seconds.
- .PP
- .IP \(bu 2
- Rotated displays are currently updated via full blits. This
--is slower than a normal oprientated display. Debug mode will
--therefore not be of much use rotated.
-+is slower than a normal orientated display. Debug mode will
-+therefore not be of much use rotated.
- .IP \(bu 2
--The '-host-cursor' cursor is static in its appearence.
-+The '-host-cursor' cursor is static in its appearance.
- .IP \(bu 2
- The build gets a warning about 'nanosleep'. I think the various '-D'
--build flags are causing this. I havn't figured as yet how to work
--round it. It doesn't appear to break anything however.
-+build flags are causing this. I haven't figured as yet how to work
-+round it. It doesn't appear to break anything however.
- .IP \(bu 2
--Keyboard handling is basic but works.
-+Keyboard handling is basic but works.
- .TP \(bu 2
--Mouse button 5 probably wont work.
-+Mouse button 5 probably wont work.
- .SH "SEE ALSO"
--X(__miscmansuffix), Xserver(__appmansuffix__)
-+X(__miscmansuffix__), Xserver(__appmansuffix__)
- .SH AUTHOR
--Matthew Allum <[email protected]> 2004
-+Matthew Allum <[email protected]> 2004
-
-
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/xevie.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-
-diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/extmod/modinit.c hw/xfree86/dixmods/extmod/modinit.c
---- hw/xfree86/dixmods/extmod/modinit.c 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/dixmods/extmod/modinit.c 2008-09-24 20:22:10.609262000 -0700
-@@ -207,6 +207,15 @@ static ExtensionModule extensionModules[
- NULL
- },
- #endif
-+#ifdef XEVIE
-+ {
-+ XevieExtensionInit,
-+ XEVIENAME,
-+ &noXevieExtension,
-+ NULL,
-+ NULL
-+ },
-+#endif
- { /* DON'T delete this entry ! */
- NULL,
- NULL,
-diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/extmod/modinit.h hw/xfree86/dixmods/extmod/modinit.h
---- hw/xfree86/dixmods/extmod/modinit.h 2008-09-23 11:24:58.000000000 -0700
-+++ hw/xfree86/dixmods/extmod/modinit.h 2008-09-24 20:22:10.610205000 -0700
-@@ -149,3 +149,9 @@ extern void PanoramiXExtensionInit(int a
- #if 1
- extern void XkbExtensionInit(INITARGS);
- #endif
-+
-+#ifdef XEVIE
-+extern void XevieExtensionInit (INITARGS);
-+# define _XEVIE_SERVER_
-+# include <X11/extensions/Xeviestr.h>
-+#endif
-diff -urp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2008-09-24 20:21:55.314450000 -0700
-+++ os/utils.c 2008-09-24 20:22:10.611688000 -0700
-@@ -199,9 +199,9 @@ _X_EXPORT Bool noXagExtension = FALSE;
- _X_EXPORT Bool noXCMiscExtension = FALSE;
- #endif
- #ifdef XEVIE
--/* Xevie is disabled by default for now until the
-- * interface is stable */
--_X_EXPORT Bool noXevieExtension = TRUE;
-+/* Xevie is disabled by the community by default for now until the
-+ * interface is stable, but we enable it by default for Solaris */
-+_X_EXPORT Bool noXevieExtension = FALSE;
- #endif
- #ifdef XF86BIGFONT
- _X_EXPORT Bool noXFree86BigfontExtension = FALSE;
--- a/open-src/xserver/xorg/xkb-ddx-defaults.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-[Backported to 1.5.3 tree - removed changes to Xi/chdevhier.c]
-
-From 9c5dd7337fa93fb1650cc017e523b939dcbf482a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Wed, 3 Dec 2008 14:24:25 +1000
-Subject: [PATCH] Let the DDX decide on the XkbRulesDefaults.
-
-Rather than assuming rules in the CoreKeyboardProc, init the default rules in
-InitCoreDevices, then re-use them later.
-
-In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether
-we'll load kbd or evdev.
-
-If we create a new MD, use pc105,us as default and re-use the rules file used
-previously.
-
-Signed-off-by: Peter Hutterer <[email protected]>
----
- Xi/chdevhier.c | 6 +++++-
- dix/devices.c | 1 -
- hw/xfree86/common/xf86Config.c | 6 ++++++
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-# diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
-# index db16349..631857d 100644
-# --- a/Xi/chdevhier.c
-# +++ b/Xi/chdevhier.c
-# @@ -117,7 +117,11 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
-#
-# if (!c->sendCore)
-# ptr->coreEvents = keybd->coreEvents = FALSE;
-# -
-# +#ifdef XKB
-# + /* supplying NULL for rules simply means we re-use
-# + whatever ruleset we used for the previous devices. */
-# + XkbSetRulesDflts(NULL, "pc105", "us", NULL, NULL);
-# +#endif
-# ActivateDevice(ptr);
-# ActivateDevice(keybd);
-#
-diff --git a/dix/devices.c b/dix/devices.c
-index 6b8cecb..9feca90 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -526,7 +526,6 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
- #ifdef XKB
- if (!noXkbExtension) {
- bzero(&names, sizeof(names));
-- XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
- XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modMap,
- CoreKeyboardBell, CoreKeyboardCtl);
- }
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 1210a8f..9bf18b5 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -1008,6 +1008,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
- xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
- xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
-
-+ /* AEI on? Then we're not using kbd, so use the evdev rules set. */
-+#ifdef XKB
-+ XkbSetRulesDflts(((xf86Info.allowEmptyInput) ? "evdev" : "base"),
-+ "pc105", "us", NULL, NULL);
-+#endif
-+
- xf86Info.useDefaultFontPath = TRUE;
- xf86Info.useDefaultFontPathFrom = X_DEFAULT;
- if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) {
---
-1.5.6.5
-
-From 13de7511b17b57a28668e1a60b196ccfe61dbcbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Thu, 4 Dec 2008 10:30:02 +1000
-Subject: [PATCH] xfree86: Only use the evdev ruleset on linux.
-
-As suggested by Julien Cristau
-
-This is an follow-up to
-commit 9c5dd7337fa93fb1650cc017e523b939dcbf482a
-Author: Peter Hutterer <[email protected]>
-Date: Wed Dec 3 14:24:25 2008 +1000
-
- Let the DDX decide on the XkbRulesDefaults.
-
-Signed-off-by: Peter Hutterer <[email protected]>
-Acked-by: Julien Cristau <[email protected]>
-Signed-off-by: Daniel Stone <[email protected]>
----
- hw/xfree86/common/xf86Config.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index a03d977..48d8efd 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -846,6 +846,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
- Bool value;
- MessageType from;
- const char *s;
-+#ifdef XKB
-+ char *rules = "base";
-+#endif
-
- /*
- * Merge the ServerLayout and ServerFlags options. The former have
-@@ -1010,8 +1013,11 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-
- /* AEI on? Then we're not using kbd, so use the evdev rules set. */
- #ifdef XKB
-- XkbSetRulesDflts(((xf86Info.allowEmptyInput) ? "evdev" : "base"),
-- "pc105", "us", NULL, NULL);
-+#if defined(linux)
-+ if (xf86Info.allowEmptyInput)
-+ rules = "evdev";
-+#endif
-+ XkbSetRulesDflts(rules, "pc105", "us", NULL, NULL);
- #endif
-
- xf86Info.useDefaultFontPath = TRUE;
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/xkb-defaults-compat.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/xkb-defaults-compat.patch Fri May 15 09:36:46 2009 -0700
@@ -1,8 +1,9 @@
Provide old #define for code not yet converted to the new ones set in
xkb-defaults.patch (like the xorgcfg & xorgconfig code that isn't in 1.6).
---- include/xkb-config.h.in Sun Jan 11 20:09:47 2009
-+++ include/xkb-config.h.in Mon Jan 12 08:48:16 2009
+diff -urp -x '*~' -x '*.orig' include/xkb-config.h.in include/xkb-config.h.in
+--- include/xkb-config.h.in 2009-01-22 20:32:43.368859000 -0800
++++ include/xkb-config.h.in 2009-01-22 20:32:51.502769000 -0800
@@ -7,6 +7,7 @@
/* Default set of XKB rules. */
@@ -11,10 +12,10 @@
/* Default XKB model. */
#undef XKB_DFLT_MODEL
-
---- include/xorg-server.h.in Wed Nov 5 08:52:17 2008
-+++ include/xorg-server.h.in Mon Jan 12 20:37:24 2009
-@@ -135,6 +135,7 @@
+diff -urp -x '*~' -x '*.orig' include/xorg-server.h.in include/xorg-server.h.in
+--- include/xorg-server.h.in 2009-01-22 20:32:43.369262000 -0800
++++ include/xorg-server.h.in 2009-01-22 20:32:51.503745000 -0800
+@@ -108,6 +108,7 @@
/* XKB default rules */
#undef XKB_DFLT_RULES
--- a/open-src/xserver/xorg/xorgcfg.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,620 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/cards.c hw/xfree86/utils/xorgcfg/cards.c
---- hw/xfree86/utils/xorgcfg/cards.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/cards.c 2008-09-23 16:32:33.107719000 -0700
-@@ -691,5 +691,8 @@ CompareCards(_Xconst void *left, _Xconst
- static int
- BCompareCards(_Xconst void *name, _Xconst void *card)
- {
-+ if (card == NULL)
-+ return 0;
-+
- return (strcasecmp((char*)name, (*(CardsEntry**)card)->name));
- }
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/config.c hw/xfree86/utils/xorgcfg/config.c
---- hw/xfree86/utils/xorgcfg/config.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/config.c 2008-09-23 16:32:33.108368000 -0700
-@@ -107,14 +107,25 @@ StartConfig(void)
- static int first = 1;
- Widget pane, top, bottom, cancel;
- const char *filename;
-+ char *p, *name;
-
- if (!first)
- return;
- first = 0;
-
- /* Read initial configuration */
-- if ((filename = xf86openConfigFile(getuid() == 0 ? CONFPATH : USER_CONFPATH,
-- XF86Config_path, NULL)) == NULL) {
-+ if (getuid() == 0)
-+ filename = xf86openConfigFile(CONFPATH, XF86Config_path, NULL);
-+ else {
-+ /* Relative path must be used for non-root users */
-+ name = XF86Config_path;
-+ while (p = strchr(name, '/'))
-+ name = p + 1;
-+ XF86Config_path = name;
-+ filename = xf86openConfigFile(USER_CONFPATH, XF86Config_path, NULL);
-+ }
-+
-+ if (filename == NULL) {
- int length = XF86Config_path ? strlen(XF86Config_path) : -1;
-
- if (length > 2 &&
-@@ -137,6 +148,14 @@ StartConfig(void)
- exit(1);
- }
-
-+#ifdef sun
-+ /* If .xorg.conf in the path, replace it with xorg.conf */
-+ if (p = strstr(XF86Config_path, ".xorg.conf")) {
-+ strncpy(p, "xorg.conf", strlen("xorg.conf"));
-+ p[strlen("xorg.conf")] = '\0';
-+ }
-+#endif
-+
- shell = XtCreatePopupShell("config", transientShellWidgetClass,
- toplevel, NULL, 0);
- pane = XtCreateManagedWidget("pane", panedWidgetClass,
-@@ -148,7 +167,7 @@ StartConfig(void)
- ident_widget = XtVaCreateManagedWidget("identifier", asciiTextWidgetClass,
- top,
- XtNeditType, XawtextEdit,
-- NULL);
-+ NULL, 0);
- configp = XtCreateManagedWidget("work", formWidgetClass,
- pane, NULL, 0);
- current = XtCreateManagedWidget("wellcome", labelWidgetClass,
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/config.h hw/xfree86/utils/xorgcfg/config.h
---- hw/xfree86/utils/xorgcfg/config.h 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/config.h 2008-09-23 16:32:33.130156000 -0700
-@@ -97,6 +97,29 @@
- #define CONFIG_ACCESSX 3
- extern int config_mode;
-
-+#ifdef sun
-+#define CONFPATH "%A," "%R," \
-+ "/etc/X11/%R," "%P/etc/X11/%R," \
-+ "%E," "%F," \
-+ "/etc/X11/%F," "%P/etc/X11/%F," \
-+ "%D/%X," \
-+ "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
-+ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
-+ "%P/etc/X11/%X," \
-+ "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
-+ "%P/lib/X11/%X," \
-+ "/etc/X11/.%S," \
-+ "/etc/X11/.%X"
-+#define USER_CONFPATH "/etc/X11/%S," "%P/etc/X11/%S," \
-+ "/etc/X11/%G," "%P/etc/X11/%G," \
-+ "/etc/X11/%X," "%P/etc/X11/%X," \
-+ "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
-+ "%P/etc/X11/%X," \
-+ "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
-+ "%P/lib/X11/%X," \
-+ "/etc/X11/.%S," \
-+ "/etc/X11/.%X"
-+#else
- #define CONFPATH "%A," "%R," \
- "/etc/X11/%R," "%P/etc/X11/%R," \
- "%E," "%F," \
-@@ -112,6 +135,7 @@ extern int config_mode;
- "%P/etc/X11/%X," \
- "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
- "%P/lib/X11/%X"
-+#endif
-
- /*
- * Types
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/interface.c hw/xfree86/utils/xorgcfg/interface.c
---- hw/xfree86/utils/xorgcfg/interface.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/interface.c 2008-09-23 16:32:33.132868000 -0700
-@@ -63,11 +63,15 @@
- #ifdef PROJECT_ROOT
- #define DefaultXFree86Dir PROJECT_ROOT
- #else
--#define DefaultXFree86Dir "/usr"
-+#define DefaultXFree86Dir "/usr/X11"
- #endif
-
- #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0))
-
-+#ifdef sun
-+#define DefaultOpenwinDir "/usr/openwin"
-+#endif
-+
- /*
- * Prototypes
- */
-@@ -129,6 +133,9 @@ char *XF86Font_path = NULL;
- char *XF86RGB_path = NULL;
- char *XkbConfig_path = NULL;
- char *XFree86Dir;
-+#ifdef sun
-+char *OpenwinDir;
-+#endif
- static char XF86Config_path_static[1024];
- static char XkbConfig_path_static[1024];
- Bool xf86config_set = False;
-@@ -198,7 +205,7 @@ static XtResource appResources[] = {
- 0, XtRString, "/etc/X11/"__XCONFIGFILE__},
- #endif
- {"menuBitmap", "MenuBitmap", XtRString, sizeof(char*),
-- 0, XtRString, "menu10"},
-+ 0, XtRString, "menu8"},
- };
-
- static void
-@@ -241,10 +248,19 @@ main(int argc, char *argv[])
- int i, startedx;
- char *menuPixmapPath = NULL;
- XrmValue from, to;
-+#ifdef sun
-+ char *oldPath, *newPath;
-+ int pathmodified = 0;
-+#endif
-
- if ((XFree86Dir = getenv("XWINHOME")) == NULL)
- XFree86Dir = DefaultXFree86Dir;
-
-+#ifdef sun
-+ if ((OpenwinDir = getenv("OPENWINHOME")) == NULL)
-+ OpenwinDir = DefaultOpenwinDir;
-+#endif
-+
- chdir(XFree86Dir);
-
- #ifdef USE_MODULES
-@@ -303,6 +319,20 @@ main(int argc, char *argv[])
- "%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
- XkbConfig_path = XkbConfig_path_static;
- }
-+
-+#ifdef sun
-+ if ((oldPath = getenv("XFILESEARCHPATH")) &&
-+ (!strstr(oldPath, "/usr/X11/lib"))) {
-+ newPath = malloc (strlen ("XFILESEARCHPATH=") + strlen(oldPath) +
-+ strlen(":/usr/X11/lib/X11/%T/%N%S") + 1);
-+ strcpy (newPath, "XFILESEARCHPATH=");
-+ strcat (newPath, oldPath);
-+ strcat (newPath, ":/usr/X11/lib/X11/%T/%N%S");
-+ putenv (newPath);
-+ pathmodified = 1;
-+ }
-+#endif
-+
- toplevel = XtAppInitialize(&appcon, "XOrgCfg",
- NULL, 0,
- &argc, argv,
-@@ -502,7 +532,11 @@ main(int argc, char *argv[])
- case 0: {
- char path[PATH_MAX];
-
-+#ifdef sun
-+ XmuSnprintf(path, sizeof(path), "%s/bin/twm", OpenwinDir);
-+#else
- XmuSnprintf(path, sizeof(path), "%s/bin/twm", XFree86Dir);
-+#endif
- execl(path, "twm", (void *)NULL);
- exit(-127);
- } break;
-@@ -538,6 +572,11 @@ main(int argc, char *argv[])
- if (startedx)
- endx();
-
-+#ifdef sun
-+ if (pathmodified)
-+ putenv(oldPath);
-+#endif
-+
- return (0);
- }
-
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/keyboard-cfg.c hw/xfree86/utils/xorgcfg/keyboard-cfg.c
---- hw/xfree86/utils/xorgcfg/keyboard-cfg.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/keyboard-cfg.c 2008-09-23 16:32:33.164601000 -0700
-@@ -70,7 +70,7 @@ static void UpdateRulesPopups(void);
- */
- static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
- static int num_xkb_desc;
--static char *XkbRulesDir = "share/X11/xkb/rules/";
-+static char *XkbRulesDir = "lib/X11/xkb/rules/";
- #ifdef XFREE98_XKB
- static char *XkbRulesFile = "xfree98";
- #else
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/keyboard-cfg.h hw/xfree86/utils/xorgcfg/keyboard-cfg.h
---- hw/xfree86/utils/xorgcfg/keyboard-cfg.h 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/keyboard-cfg.h 2008-09-23 16:32:33.165075000 -0700
-@@ -37,7 +37,7 @@
- /*
- * All file names are from XProjectRoot or XWINHOME environment variable.
- */
--#define XkbConfigDir "share/X11/xkb/"
-+#define XkbConfigDir "lib/X11/xkb/"
- #define XkbConfigFile "X0-config.keyboard"
-
- /*
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/loader.c hw/xfree86/utils/xorgcfg/loader.c
---- hw/xfree86/utils/xorgcfg/loader.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/loader.c 2008-09-23 16:32:33.133513000 -0700
-@@ -277,7 +277,7 @@ LoaderInitializeOptions(void)
- nfont_modules = numFontModules;
- error_level = 0;
- ErrorF("CHECK MODULE %s\n", *ploaderList);
-- if ((ok = xf86cfgCheckModule()) == 0) {
-+ if ((ok = xf86cfgCheckModule(module_types[i])) == 0) {
- CheckMsg(CHECKER_LOAD_FAILED,
- "ERROR Failed to load module.\n");
- error_level += 50;
-@@ -375,7 +375,7 @@ LoaderInitializeOptions(void)
- ErrorF(" SUMMARY error_level set to %d.\n\n", error_level);
- }
- else
-- (void)xf86cfgCheckModule();
-+ (void)xf86cfgCheckModule(module_types[i]);
- }
- signal(SIGTRAP, SIG_DFL);
- signal(SIGBUS, SIG_DFL);
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/loader.h hw/xfree86/utils/xorgcfg/loader.h
---- hw/xfree86/utils/xorgcfg/loader.h 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/loader.h 2008-09-23 16:32:33.133963000 -0700
-@@ -35,6 +35,9 @@
-
- #else
-
-+#ifndef XFree86LOADER
-+#define XFree86LOADER /* not really */
-+#endif
- #define IN_LOADER
-
- #include "xf86.h"
-@@ -51,6 +54,7 @@
- #include "loaderProcs.h"
-
- #include <sym.h>
-+#include <xf86_ansic.h>
-
- void LoaderDefaultFunc(void);
- #endif
-@@ -61,7 +65,6 @@ void LoaderDefaultFunc(void);
- void xf86cfgLoaderInit(void);
- void xf86cfgLoaderInitList(int);
- void xf86cfgLoaderFreeList(void);
--int xf86cfgCheckModule(void);
-
- #ifndef LOADER_PRIVATE
- /* common/xf86Opt.h */
-@@ -127,6 +130,8 @@ typedef enum {
- FontRendererModule
- } ModuleType;
-
-+int xf86cfgCheckModule(ModuleType);
-+
- typedef struct _xf86cfgModuleOptions {
- char *name;
- ModuleType type;
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/loadmod.c hw/xfree86/utils/xorgcfg/loadmod.c
---- hw/xfree86/utils/xorgcfg/loadmod.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/loadmod.c 2008-09-23 16:32:33.152176000 -0700
-@@ -41,6 +41,7 @@
-
- #define LOADER_PRIVATE
- #include "loader.h"
-+#include "xf86PciInfo.h"
-
- #define True 1
- #define False 0
-@@ -320,6 +321,51 @@ LOOKUP xfree86LookupTab[] = {
- {0,0}
- };
-
-+static SymTabRec ATIChipsets[] = {
-+ { PCI_CHIP_MACH64CT, "Mach 64 CT" },
-+ { PCI_CHIP_MACH64CX, "Mach 64 CX" },
-+ { PCI_CHIP_MACH64ET, "Mach 64 ET" },
-+ { PCI_CHIP_MACH64GB, "Mach 64 GB" },
-+ { PCI_CHIP_MACH64GD, "Mach 64 GD" },
-+ { PCI_CHIP_MACH64GI, "Mach 64 GI" },
-+ { PCI_CHIP_MACH64GL, "Mach 64 GL" },
-+ { PCI_CHIP_MACH64GM, "Mach 64 GM" },
-+ { PCI_CHIP_MACH64GN, "Mach 64 GN" },
-+ { PCI_CHIP_MACH64GO, "Mach 64 GO" },
-+ { PCI_CHIP_MACH64GP, "Mach 64 GP" },
-+ { PCI_CHIP_MACH64GQ, "Mach 64 GQ" },
-+ { PCI_CHIP_MACH64GR, "Mach 64 GR" },
-+ { PCI_CHIP_MACH64GS, "Mach 64 GS" },
-+ { PCI_CHIP_MACH64GT, "Mach 64 GT" },
-+ { PCI_CHIP_MACH64GU, "Mach 64 GU" },
-+ { PCI_CHIP_MACH64GV, "Mach 64 GV" },
-+ { PCI_CHIP_MACH64GW, "Mach 64 GW" },
-+ { PCI_CHIP_MACH64GX, "Mach 64 GX" },
-+ { PCI_CHIP_MACH64GY, "Mach 64 GY" },
-+ { PCI_CHIP_MACH64GZ, "Mach 64 GZ" },
-+ { PCI_CHIP_MACH64LB, "Mach 64 LB" },
-+ { PCI_CHIP_MACH64LD, "Mach 64 LD" },
-+ { PCI_CHIP_MACH64LG, "Mach 64 LG" },
-+ { PCI_CHIP_MACH64LI, "Mach 64 LI" },
-+ { PCI_CHIP_MACH64LM, "Mach 64 LM" },
-+ { PCI_CHIP_MACH64LN, "Mach 64 LN" },
-+ { PCI_CHIP_MACH64LP, "Mach 64 LP" },
-+ { PCI_CHIP_MACH64LQ, "Mach 64 LQ" },
-+ { PCI_CHIP_MACH64LR, "Mach 64 LR" },
-+ { PCI_CHIP_MACH64LS, "Mach 64 LS" },
-+ { PCI_CHIP_MACH64VT, "Mach 64 VT" },
-+ { PCI_CHIP_MACH64VU, "Mach 64 VU" },
-+ { PCI_CHIP_MACH64VV, "Mach 64 VV" },
-+ { PCI_CHIP_R200_QI, "R200 QI" },
-+ { PCI_CHIP_R200_QJ, "R200 QJ" },
-+ { PCI_CHIP_R200_QK, "R200 QK" },
-+ { PCI_CHIP_RS300_5836, "R300 5836" },
-+ { PCI_CHIP_RS300_5837, "R300 5837" },
-+ { PCI_CHIP_RV250_Le, "RV250 Le" },
-+ { PCI_CHIP_RV250_Ln, "RV250 Ln" },
-+ {-1, NULL}
-+};
-+
- static DriverPtr driver;
- static ModuleInfoPtr info;
- static SymTabPtr chips;
-@@ -333,6 +379,7 @@ AddModuleOptions(char *name, const Optio
- const OptionInfoRec *tmp;
- SymTabPtr ctmp;
- int count;
-+ SymTabRec *symptr;
-
- /* XXX If the module is already in the list, then it means that
- * it is now being properly loaded by xf86cfg and the "fake" entry
-@@ -362,6 +409,13 @@ AddModuleOptions(char *name, const Optio
- }
- else
- ptr->option = NULL;
-+
-+ /* Exception handling: ati driver does not call xf86MatchPciInstances(),
-+ below is workaround */
-+ if ((vendor == -1 || !chips) && (!strcmp(name, "ati"))) {
-+ vendor = PCI_VENDOR_ATI;
-+ chips = ATIChipsets;
-+ }
- if (vendor != -1 && chips) {
- ptr->vendor = vendor;
- for (count = 0, ctmp = chips; ctmp->name; ctmp++, count++)
-@@ -434,12 +488,16 @@ xf86cfgLoaderInitList(int type)
- /* XXX Xf86cfg isn't able to provide enough wrapper functions
- * to these drivers. Maybe the drivers could also be changed
- * to work better when being loaded "just for testing" */
-+ /* Workaround for ati is in place, and vmware no longer causes problem,
-+ * do not need to do the following to make ati/vmware duplicate */
-+ /*
- if (type == VideoModule) {
- module_type = VideoModule;
- AddModuleOptions("vmware", NULL);
- AddModuleOptions("ati", NULL);
- module_type = NullModule;
- }
-+ */
- }
-
- void
-@@ -449,12 +507,16 @@ xf86cfgLoaderFreeList(void)
- }
-
- int
--xf86cfgCheckModule(void)
-+xf86cfgCheckModule(ModuleType modtype)
- {
- int errmaj, errmin;
- ModuleDescPtr module;
- int nfonts;
- FontModule *fonts, *pfont_module;
-+ char name[64];
-+ int i = 0;
-+ void (*Identify)();
-+ Bool (*Probe)();
-
- driver = NULL;
- chips = NULL;
-@@ -470,14 +532,35 @@ xf86cfgCheckModule(void)
- }
- else if (driver && driver->AvailableOptions) {
- /* at least fbdev does not call xf86MatchPciInstances in Probe */
-+ /* ati driver is known to fail in probing, but we still need to
-+ load it because it loads r128 and radeon symbles */
-+ if (!strcmp(*ploaderList, "ati"))
-+ AddModuleOptions(*ploaderList, NULL);
- if (driver->Identify)
-- (*driver->Identify)(-1);
-+ (*driver->Identify)(-1);
- if (driver->Probe)
-- (*driver->Probe)(driver, PROBE_DETECT);
-+ (*driver->Probe)(driver, PROBE_DETECT);
- AddModuleOptions(*ploaderList, (*driver->AvailableOptions)(-1, -1));
- }
- else if (info && info->AvailableOptions)
- AddModuleOptions(*ploaderList, (*info->AvailableOptions)(NULL));
-+ /* Exception handling: some video drivers (radeon, r128) do not call
-+ xf86AddDriver(), therefore driver is NULL. Below is workaround */
-+ else if (!driver && (modtype == VideoModule)) {
-+ for (i = 0; i < strlen(ploaderList[0]); i++)
-+ name[i] = (char) toupper(ploaderList[0][i]);
-+ name[i] = '\0';
-+ driver = (DriverPtr) LoaderSymbol(name);
-+ strncpy(&name[i], "Identify", strlen("Identify") + 1);
-+ Identify = (void (*) ()) LoaderSymbol(name);
-+ if (Identify)
-+ (*Identify)(-1);
-+ strncpy(&name[i], "Probe", strlen("Probe") + 1);
-+ Probe = (Bool (*) ()) LoaderSymbol(name);
-+ if (Probe)
-+ (*Probe)(driver, PROBE_DETECT);
-+ AddModuleOptions(*ploaderList, NULL);
-+ }
-
- if (!noverify) {
- XF86ModuleData *initdata = NULL;
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/mouse-cfg.c hw/xfree86/utils/xorgcfg/mouse-cfg.c
---- hw/xfree86/utils/xorgcfg/mouse-cfg.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/mouse-cfg.c 2008-09-23 16:32:33.175273000 -0700
-@@ -272,7 +272,10 @@ MouseApplyCallback(Widget w, XtPointer u
- XF86MiscMouseSettings mouse;
-
- XF86MiscGetMouseSettings(XtDisplay(w), &mouse);
-+
-+#ifndef sun
- XtFree(mouse.device);
-+#endif
-
- if (mouse.baudrate == 0 || mouse.baudrate < 0 || mouse.baudrate > 9600 ||
- mouse.baudrate % 1200)
-@@ -288,7 +291,9 @@ MouseApplyCallback(Widget w, XtPointer u
- mouse.emulate3buttons = emulate;
- mouse.flags |= MF_REOPEN;
-
-+#ifndef sun
- mouse.device = device;
-+#endif
-
- XFlush(XtDisplay(w));
- XF86MiscSetMouseSettings(XtDisplay(w), &mouse);
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/screen-cfg.c hw/xfree86/utils/xorgcfg/screen-cfg.c
---- hw/xfree86/utils/xorgcfg/screen-cfg.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/screen-cfg.c 2008-09-23 16:32:33.175877000 -0700
-@@ -73,6 +73,7 @@ static char *standard_modes[] = {
- "512x384",
- "1400x1050",
- "2048x1536",
-+ "1920x1200",
- "1920x1440",
- };
-
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/startx.c hw/xfree86/utils/xorgcfg/startx.c
---- hw/xfree86/utils/xorgcfg/startx.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/startx.c 2008-09-23 16:32:33.182971000 -0700
-@@ -46,11 +46,32 @@ Bool
- startx(void)
- {
- int timeout = 8;
-+#ifdef sun
-+ const char *filename;
-+#endif
-
- if (getenv("DISPLAY") != NULL)
- /* already running Xserver */
- return (False);
-
-+#ifdef sun
-+ /* If there exits any config file, including .xorg.conf, use it. */
-+ if ((filename = xf86openConfigFile(getuid() == 0 ? CONFPATH : USER_CONFPATH,
-+ XF86Config_path, NULL)) == NULL) {
-+ int length = XF86Config_path ? strlen(XF86Config_path) : -1;
-+
-+ if (length > 2 &&
-+ XF86Config_path[length - 2] == '-' &&
-+ XF86Config_path[length - 1] == '4') {
-+ XF86Config_path[length - 2] = '\0';
-+ filename = xf86openConfigFile(getuid() == 0 ?
-+ CONFPATH : USER_CONFPATH,
-+ XF86Config_path, NULL);
-+ }
-+ }
-+ XF86Config_path = (char *)filename;
-+#endif
-+
- if (XF86Config_path == NULL) {
- char *home, filename[PATH_MAX];
- char commandline[PATH_MAX * 4];
-@@ -100,13 +121,25 @@ startx(void)
- switch (xpid = fork()) {
- case 0: {
- char path[PATH_MAX];
-+ char *filename, *p;
- /* Don't change to X! see above */
- if (XFree86_path)
- XmuSnprintf(path, sizeof(path), "%s/"__XSERVERNAME__, XFree86_path);
- else
- XmuSnprintf(path, sizeof(path), "%s/bin/"__XSERVERNAME__, XFree86Dir);
-- execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail",
-- "-xf86config", XF86Config_path, (void *)NULL);
-+ if (getuid() == 0)
-+ execl(path, "X", ":8", /*"+xinerama",*/ "+accessx",
-+ "-allowMouseOpenFail",
-+ "-xf86config", XF86Config_path, (void *)NULL);
-+ else {
-+ /* Use relative path for non-root users */
-+ filename = XF86Config_path;
-+ while (p = strchr(filename, '/'))
-+ filename = p + 1;
-+ execl(path, "X", ":8", /*"+xinerama",*/ "+accessx",
-+ "-allowMouseOpenFail",
-+ "-xf86config", filename, (void *)NULL);
-+ }
- exit(-127);
- } break;
- case -1:
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgcfg/text-mode.c hw/xfree86/utils/xorgcfg/text-mode.c
---- hw/xfree86/utils/xorgcfg/text-mode.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgcfg/text-mode.c 2008-09-23 16:32:33.186900000 -0700
-@@ -49,12 +49,10 @@
- #define IS_KBDDRIV(X) ((strcmp((X),"kbd") == 0))
-
- #ifndef PROJECT_ROOT
--#define PROJECT_ROOT "/usr"
-+#define PROJECT_ROOT "/usr/X11"
- #endif
-
--#ifndef XKB_RULES_DIR
--#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
--#endif
-+#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
-
- #define CONTROL_A 1
- #define CONTROL_D 4
-@@ -293,9 +291,21 @@ static int
- WriteXF86Config(void)
- {
- char *xf86config;
-+#ifdef sun
-+ char *p;
-+#endif
-
- ClearScreen();
- refresh();
-+
-+#ifdef sun
-+ /* If .xorg.conf in the path, replace it with xorg.conf */
-+ if (p = strstr(XF86Config_path, ".xorg.conf")) {
-+ strncpy(p, "xorg.conf", strlen("xorg.conf"));
-+ p[strlen("xorg.conf")] = '\0';
-+ }
-+#endif
-+
- xf86config = DialogInput("Write "__XCONFIGFILE__, "Write configuration to file:",
- 10, 60, XF86Config_path ? XF86Config_path :
- "/etc/X11/"__XCONFIGFILE__, " Ok ", " Cancel ", 0);
--- a/open-src/xserver/xorg/xorgconfig.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,290 +0,0 @@
-diff -urp -x '*~' -x '*.orig' hw/xfree86/utils/xorgconfig/xorgconfig.c hw/xfree86/utils/xorgconfig/xorgconfig.c
---- hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-09-23 11:24:59.000000000 -0700
-+++ hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-09-23 16:32:21.769251000 -0700
-@@ -1,3 +1,30 @@
-+/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*
- * This is a configuration program that will create a base XF86Config
- * file based on menu choices. Its main feature is that clueless users
-@@ -112,6 +139,15 @@
-
- #include "cards.h"
-
-+#ifdef SUNSOFT /* setuid support for running under RBAC */
-+#include <fcntl.h>
-+#include <netdb.h>
-+#include <pwd.h>
-+#include <time.h>
-+static int euid_changed = 0;
-+static uid_t saved_id = -1;
-+static void configdir_check(void);
-+#endif
-
- /*
- * Define the following to 310 to remove references to XFree86 features that
-@@ -249,7 +285,11 @@ static char *intro_text =
- "This program will create a basic " CONFIGNAME " file, based on menu selections\n"
- "you make. It will ask for a pathname when it is ready to write the file.\n"
- "\n"
-+#ifdef SUNSOFT
-+"The " CONFIGNAME " file usually resides in /etc/X11. If\n"
-+#else
- "The " CONFIGNAME " file usually resides in /etc/X11 or " TREEROOTCFG ". If\n"
-+#endif
- "no " CONFIGNAME " file is present there, " __XSERVERNAME__" will probe the system to\n"
- "autoconfigure itself. You can run " __XSERVERNAME__ " -configure to generate a " CONFIGNAME "\n"
- "file based on the results of autoconfiguration, or let this program\n"
-@@ -1702,6 +1742,7 @@ skipclockprobing:
- config_virtual = 0;
- for (;;) {
- char modes[128];
-+ int modes_space_left;
-
- emptylines();
-
-@@ -1735,24 +1776,29 @@ skipclockprobing:
- printf("\n");
-
- modes[0] = '\0';
-+ modes_space_left = sizeof(modes) - 1;
- for (i = 0; i < strlen(s); i++) {
-- if ( NU_MODESTRINGS > 9 ) {
-- if ((s[i] < '1' || s[i] > '9') &&
-- (s[i] < 'a' || s[i] > 'a' + NU_MODESTRINGS - 10)) {
-- printf("Invalid mode skipped.\n");
-+ int choice = -1;
-+
-+ if ((s[i] >= '1') && (s[i] <= '9')) {
-+ choice = s[i] - '1';
-+ } else if ((s[i] >= 'a') &&
-+ (s[i] <= ('a' + NU_MODESTRINGS - 10))) {
-+ choice = s[i] - 'a' + 9;
-+ }
-+
-+ if ( (choice < 0) || (choice > NU_MODESTRINGS) ) {
-+ printf("Invalid mode %c skipped.\n", s[i]);
- continue;
-- }
-- }
-- else {
-- if (s[i] < '1' || s[i] > '0' + NU_MODESTRINGS) {
-- printf("Invalid mode skipped.\n");
-- continue;
-- }
- }
-- if (i > 0)
-+ if ((i > 0) && (modes_space_left > 1)) {
- strcat(modes, " ");
-- strcat(modes, modestring[s[i] <= '9' ? s[i] - '1' :
-- s[i] - 'a' + 9]);
-+ modes_space_left--;
-+ }
-+ if (modes_space_left > strlen(modestring[choice])) {
-+ modes_space_left -= strlen(modestring[choice]);
-+ strcat(modes, modestring[choice]);
-+ }
- }
- switch (c) {
- case 0 :
-@@ -1883,10 +1929,21 @@ static char *XF86Config_firstchunk_text
- "# Load \"type1\"\n"
- #endif
- " Load \"freetype\"\n"
-+#ifndef SUNSOFT
- "# Load \"xtt\"\n"
-+#endif
- "\n"
-+#ifdef SUNSOFT
-+"# This loads the SolarisIA module\n"
-+" Load \"IA\"\n"
-+"# This loads the GLX module\n"
-+" Load \"glx\"\n"
-+"# This loads the Solaris Trusted Extensions module if it is installed\n"
-+" Load \"xtsol\"\n"
-+#else
- "# This loads the GLX module\n"
- "# Load \"glx\"\n"
-+#endif
- "# This loads the DRI module\n"
- "# Load \"dri\"\n"
- "\n"
-@@ -2463,20 +2520,71 @@ write_fontpath_section(FILE *f)
- static int
- write_XF86Config(char *filename)
- {
-- FILE *f;
-+ FILE *f = NULL;
-+ int fd;
-+
-
- /*
- * Write the file.
- */
-
-- f = fopen(filename, "w");
-- if (f == NULL) {
-+#ifdef SUNSOFT
-+ int need_uid_reset = 0;
-+ if (euid_changed && (strcmp(filename, "/etc/X11/"XCONFIGFILE) == 0)) {
-+ if (seteuid(saved_id) == 0) {
-+ need_uid_reset = 1;
-+ }
-+ }
-+ configdir_check();
-+#endif
-+
-+#if defined(O_NOFOLLOW) && defined(O_NOLINKS)
-+# define EXTRA_OPEN_FLAGS O_NOFOLLOW | O_NOLINKS
-+#endif
-+ fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC | EXTRA_OPEN_FLAGS, 0644);
-+
-+#ifdef SUNSOFT
-+ if (need_uid_reset) {
-+ if (seteuid(getuid()) != 0) {
-+ perror("xorgconfig: could not reset euid");
-+ exit(-1);
-+ }
-+ }
-+#endif
-+ if (fd >= 0) {
-+ f = fdopen(fd, "w");
-+ }
-+
-+ if ((fd < 0) || (f == NULL)) {
- printf("Failed to open filename for writing.\n");
- if (getuid() != 0)
- printf("Maybe you need to be root to write to the specified directory?\n");
- return(1);
- }
-
-+#ifdef SUNSOFT
-+ {
-+ char hostname[MAXHOSTNAMELEN] = "";
-+ struct passwd *pwd = getpwuid(getuid());
-+ char *username, *timestamp;
-+ time_t now;
-+
-+ if (pwd == NULL) {
-+ username = Malloc(32);
-+ snprintf(username, 32, "uid %l", (long) getuid());
-+ } else {
-+ username = pwd->pw_name;
-+ }
-+
-+ gethostname(hostname, sizeof(hostname));
-+
-+ time(&now);
-+ timestamp = ctime(&now);
-+
-+ fprintf(f, "# Generated by %s on %s at %s\n",
-+ username, hostname, timestamp);
-+ }
-+#endif
- fprintf(f, "%s", XF86Config_firstchunk_text);
- write_fontpath_section(f);
- fprintf(f, "%s", XF86Config_fontpathchunk_text);
-@@ -2702,7 +2810,11 @@ ask_XF86Config_location(void) {
- "I am going to write the " CONFIGNAME " file now. Make sure you don't accidently\n"
- "overwrite a previously configured one.\n\n");
-
-+#ifdef SUNSOFT
-+ if ((geteuid() == 0) || euid_changed) {
-+#else
- if (getuid() == 0) {
-+#endif
- #ifdef PREFER_XF86CONFIG_IN_ETC
- filename = Strdup("/etc/X11/" XCONFIGFILE);
- filename = append_version(filename);
-@@ -2713,6 +2825,7 @@ ask_XF86Config_location(void) {
- return filename;
- #endif
-
-+#ifndef SUNSOFT
- if (filename)
- free(filename);
- filename = Strdup(TREEROOTCFG "/" XCONFIGFILE);
-@@ -2723,6 +2836,7 @@ ask_XF86Config_location(void) {
- printf("\n");
- if (answerisyes(s))
- return filename;
-+#endif
-
- #ifndef PREFER_XF86CONFIG_IN_ETC
- if (filename)
-@@ -2824,12 +2938,18 @@ static void
- configdir_check(void)
- {
- /* /etc/X11 may not exist on some systems */
-+#ifdef SUNSOFT
-+ if (geteuid() == 0) {
-+#else
- if (getuid() == 0) {
-+#endif
- struct stat buf;
- if (stat("/etc/X11", &buf) == -1 && errno == ENOENT)
- mkdir("/etc/X11", 0777);
-+#ifndef SUNSOFT
- if (stat(TREEROOTCFG, &buf) == -1 && errno == ENOENT)
- mkdir(TREEROOTCFG, 0777);
-+#endif
- }
- }
-
-@@ -2840,6 +2960,19 @@ configdir_check(void)
-
- int
- main(int argc, char *argv[]) {
-+
-+#ifdef SUNSOFT
-+ /* Try to run more securely when being run seteuid via RBAC */
-+ if (issetugid() || (geteuid() != getuid())) {
-+ saved_id = geteuid();
-+ if (seteuid(getuid()) == 0) {
-+ euid_changed = 1;
-+ } else {
-+ perror("xorgconfig: could not reset euid");
-+ exit(-1);
-+ }
-+ }
-+#endif
-
- createtmpdir();
-
-@@ -2854,9 +2987,11 @@ main(int argc, char *argv[]) {
-
- emptylines();
-
-+#ifndef SUNSOFT /* Moved into write_XF86Config */
- configdir_check();
-
- emptylines();
-+#endif
-
- mouse_configuration();
-
--- a/open-src/xserver/xorg/xprint.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1132 +0,0 @@
---- include/dpi.h 1969-12-31 16:00:00.000000000 -0800
-+++ include/dpi.h.new 2008-09-24 09:56:39.448121000 -0700
-@@ -0,0 +1,95 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/* $XConsortium: dpi.h /main/9 1995/09/22 10:23:04 dpw $ */
-+/***********************************************************
-+
-+Copyright (c) 1987 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.
-+
-+
-+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-+
-+ All Rights Reserved
-+
-+Permission to use, copy, modify, and distribute this software and its
-+documentation for any purpose and without fee is hereby granted,
-+provided that the above copyright notice appear in all copies and that
-+both that copyright notice and this permission notice appear in
-+supporting documentation, and that the name of Digital not be
-+used in advertising or publicity pertaining to distribution of the
-+software without specific, written prior permission.
-+
-+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+SOFTWARE.
-+
-+******************************************************************/
-+#ifndef DPI_H
-+#define DPI_H
-+
-+extern Bool XpClientDPIAdd(XpContextPtr, int, int);
-+
-+extern Bool XpClientDPIGetData(XpContextPtr, int *, float *);
-+
-+extern Bool XpClientDPIFindData(int, int *, float *);
-+
-+extern XpClientDPIPtr XpClientDPIGetRec(XpContextPtr);
-+
-+extern XpClientDPIPtr XpClientDPIFindRec(int);
-+
-+extern Bool XpClientDPISet(XpContextPtr, int);
-+
-+extern FontPtr XpClientDPIGrabFont(XpClientDPIPtr, FontPtr);
-+
-+#endif
---- hw/xprint/Makefile.am 2008-11-05 08:52:17.000000000 -0800
-+++ hw/xprint/Makefile.am.new 2008-12-17 15:41:36.283630000 -0800
-@@ -5,7 +5,7 @@ bin_PROGRAMS = Xprt
- Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
- -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
- -DXPRINTDIR=\"$(libdir)/X11/xserver\" \
-- -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX \
-+ -DXPRASTERDDX -DXPPCLDDX -DXPPSDDX \
- -DXFree86Server
-
- Xprt_LDFLAGS = -L$(top_srcdir)
-diff -urp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c
---- dix/dispatch.c 2008-10-17 15:51:32.379041000 -0700
-+++ dix/dispatch.c 2008-10-17 15:51:50.036961000 -0700
-@@ -1,3 +1,33 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+
- /************************************************************
-
- Copyright 1987, 1989, 1998 The Open Group
-@@ -3391,6 +3421,21 @@ InitProcVectors(void)
-
- }
-
-+/*
-+ * BUG: 4402782: This code is called by Xext/xprint (XpExtensionInit) to
-+ * change the X_OpenFont to ProcXpOpenFont and SProcOpenFont. This allows
-+ * apps using scaling to load two fonts.
-+ */
-+_X_HIDDEN void
-+ChangeProcVector(int vector, int (* proc)(), int (* sproc)())
-+{
-+ if (vector >= 0 && vector < 256 && proc && sproc)
-+ {
-+ ProcVector[vector] = proc;
-+ SwappedProcVector[vector] = sproc;
-+ }
-+} /* BUG 4402782: */
-+
- /**********************
- * CloseDownClient
- *
-diff -urp -x '*~' -x '*.orig' dix/dixfonts.c dix/dixfonts.c
---- dix/dixfonts.c 2008-10-10 11:12:48.000000000 -0700
-+++ dix/dixfonts.c 2008-10-17 15:51:50.038909000 -0700
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /************************************************************************
- Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-@@ -97,6 +126,9 @@ static int size_slept_fpes = 0;
- static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
- static FontPatternCachePtr patternCache;
-
-+static void (*XpSetFont)(register ClientPtr client,
-+ FontPtr pFont); /* BUG 4402782: clientDPI */
-+
- _X_EXPORT int
- FontToXError(err)
- int err;
-@@ -223,6 +255,20 @@ FreeFPE (FontPathElementPtr fpe)
- }
- }
-
-+/*
-+ * BUG: 4402782: This function is called by Xext/xprint.c (ProcXpOpenFont) to set
-+ * the callback for opening a font with a scale factor. This can be done this way
-+ * (IE static local variable) because it is turned on and off in the same server
-+ * call, so no other job could inadvertently get the wrong value. We do not need
-+ * to have this information dependent on the clientID
-+ */
-+_X_HIDDEN void
-+SetXpFontFunc(void (*func)())
-+{
-+ XpSetFont = func;
-+} /* BUG: 4402782 */
-+
-+
- static Bool
- doOpenFont(ClientPtr client, OFclosurePtr c)
- {
-@@ -358,6 +404,15 @@ doOpenFont(ClientPtr client, OFclosurePt
- if (patternCache && pfont != c->non_cachable_font)
- CacheFontPattern(patternCache, c->origFontName, c->origFontNameLen,
- pfont);
-+ /*
-+ * BUG: 4402782: Store the font pointer in the data struct. This is OK since
-+ * it is only set in xprint.c (ProcXpOpenFont) and turned off immediately
-+ * after as a single processing line. This means that no other print jobs
-+ * could use the wrong value.
-+ */
-+ if (XpSetFont)
-+ (* XpSetFont)(client, pfont);
-+
- bail:
- if (err != Successful && c->client != serverClient) {
- SendErrorToClient(c->client, X_OpenFont, 0,
-diff -urp -x '*~' -x '*.orig' Xext/xprint.c Xext/xprint.c
---- Xext/xprint.c 2008-10-10 11:12:48.000000000 -0700
-+++ Xext/xprint.c 2008-10-17 15:51:50.089810000 -0700
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
- (c) Copyright 1996 Hewlett-Packard Company
- (c) Copyright 1996 International Business Machines Corp.
- (c) Copyright 1996 Sun Microsystems, Inc.
-@@ -69,6 +98,7 @@ copyright holders.
- #include <dix-config.h>
- #endif
-
-+#include <stdio.h>
- #include <X11/X.h>
- #include <X11/Xos.h>
- #define NEED_EVENTS
-@@ -86,6 +116,10 @@ copyright holders.
- #include "../hw/xprint/DiPrint.h"
- #include "../hw/xprint/attributes.h"
- #include "modinit.h"
-+#include "resource.h"
-+#include "dixfont.h"
-+#include "swapreq.h"
-+#include "dpi.h"
-
- static void XpResetProc(ExtensionEntry *);
-
-@@ -117,6 +151,8 @@ static int ProcXpQueryScreens(ClientPtr)
- static int ProcXpGetPageDimensions(ClientPtr);
- static int ProcXpSetImageResolution(ClientPtr);
- static int ProcXpGetImageResolution(ClientPtr);
-+static int ProcXpClientDpi(ClientPtr); /* BUG: 4402782 */
-+static int ProcXpOpenFont(ClientPtr); /* BUG: 4402782 */
-
- static void SwapXpNotifyEvent(xPrintPrintEvent *, xPrintPrintEvent *);
- static void SwapXpAttributeEvent(xPrintAttributeEvent *, xPrintAttributeEvent *);
-@@ -144,6 +180,7 @@ static int SProcXpRehashPrinterList(Clie
- static int SProcXpGetPageDimensions(ClientPtr);
- static int SProcXpSetImageResolution(ClientPtr);
- static int SProcXpGetImageResolution(ClientPtr);
-+static int SProcXpClientDpi(ClientPtr);
-
- static void SendXpNotify(XpContextPtr, int, int);
- static void SendAttributeNotify(XpContextPtr, int);
-@@ -167,6 +204,9 @@ typedef struct _xpScreen {
- struct _driver *drivers;
- } XpScreenRec, *XpScreenPtr;
-
-+static XpClientDPIPtr client_dpi_head; /* BUG: 4402782 */
-+static int client_server_font; /* BUG: 4402782 */
-+
- /*
- * Each context has a list of XpClients indicating which clients have
- * associated this context with their connection.
-@@ -259,6 +299,285 @@ static RESTYPE RTclient, RTcontext, RTpa
- */
- static CARD32 allEvents = XPPrintMask | XPAttributeMask;
-
-+/*******************************************************************************
-+ *
-+ * BUG: 4402782: ClientDPI Add, Remove, Search
-+ *
-+ ******************************************************************************/
-+
-+/*
-+ * Create an entry for the clientDPI to be stored. This entry will hold lookup
-+ * information (context and clientAsMask), and the font and scaling information.
-+ */
-+_X_HIDDEN Bool
-+XpClientDPIAdd( /* Bug: 4402782 */
-+XpContextPtr context,
-+int clientAsMask,
-+int client_dpi)
-+{
-+ XpClientDPIPtr new;
-+ XpClientDPIPtr temp = client_dpi_head;
-+ int found = 0;
-+
-+ /*
-+ * Check if the client already has an entry in the list
-+ */
-+ while(temp != NULL)
-+ {
-+ if(temp->context == context)
-+ found = 1;
-+ temp = temp->pNext;
-+ }
-+
-+ /*
-+ * If not, then create a new entry
-+ */
-+ if (!found)
-+ {
-+ new = (XpClientDPIPtr)malloc(sizeof(XpClientDPIRec));
-+
-+ if(new == NULL)
-+ return FALSE;
-+
-+ new->pNext = client_dpi_head;
-+ new->pPrev = NULL;
-+ new->head = NULL;
-+ new->context = context;
-+ new->client_dpi = client_dpi;
-+ new->clientAsMask = clientAsMask;
-+ new->scale_factor = 1;
-+ new->client_x = -1;
-+ new->server_x = -1;
-+
-+ /*
-+ * Put the new entry at the head of the list
-+ */
-+ client_dpi_head = new;
-+ }
-+
-+ return TRUE;
-+} /* Bug: 4402782 */
-+
-+/*
-+ * This function is currently not called. This is not a good state, but we cannot
-+ * call the function at the end of the document since the client is still connected
-+ * and believe that fonts that were opened are still open for it. (They are, but this
-+ * list contains the links to go between the fonts). Need to check if there is a way
-+ * to remove the client when the client terminates its connection with Xprt?
-+ */
-+static Bool
-+XpClientDPIRemove(XpContextPtr context) /* Bug: 4402782 */
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ /*
-+ * Search the list for the correct context
-+ */
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->context != context)
-+ temp = temp->pNext;
-+ else
-+ {
-+ XpClientFontsPtr temp2;
-+
-+ /*
-+ * Once it is found, then remove it from this list
-+ */
-+ found = TRUE;
-+ if(temp->pPrev != NULL)
-+ temp->pPrev->pNext = temp->pNext;
-+ else
-+ client_dpi_head = temp->pNext;
-+
-+ if(temp->pNext != NULL)
-+ temp->pNext->pPrev = temp->pPrev;
-+
-+ temp2 = temp->head;
-+
-+ /*
-+ * Free the fonts??
-+ */
-+ while(temp2 != NULL)
-+ {
-+ XpClientFontsPtr item_free = temp2;
-+ temp2 = temp2->pNext;
-+
-+ /*
-+ * Do we need to actually free the font here, or will the
-+ * client dying take care of that?
-+ */
-+ free(item_free);
-+ }
-+
-+
-+ free(temp);
-+ }
-+ }
-+
-+ return found;
-+} /* Bug: 4402782 */
-+
-+/*
-+ * Return the DPI and scale factor the the caller
-+ */
-+_X_HIDDEN Bool
-+XpClientDPIGetData( /* Bug: 4402782 */
-+XpContextPtr context,
-+int *pDPI,
-+float *pSF)
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->context != context)
-+ temp = temp->pNext;
-+ else
-+ {
-+ found = TRUE;
-+ *pDPI = temp->client_dpi;
-+ *pSF = temp->scale_factor;
-+ }
-+ }
-+
-+ return found;
-+} /* Bug: 4402782 */
-+
-+/*
-+ * Return the DPI and scale factor the caller
-+ */
-+_X_HIDDEN Bool
-+XpClientDPIFindData( /* Bug: 4402782 */
-+int clientAsMask,
-+int *pDPI,
-+float *pSF)
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->clientAsMask != clientAsMask)
-+ temp = temp->pNext;
-+ else
-+ {
-+ found = TRUE;
-+ *pDPI = temp->client_dpi;
-+ *pSF = temp->scale_factor;
-+ }
-+ }
-+ return found;
-+} /* Bug: 4402782 */
-+
-+/*
-+ * Return the DPI and scale factor the the caller
-+ */
-+_X_HIDDEN XpClientDPIPtr
-+XpClientDPIGetRec(XpContextPtr context) /* Bug: 4402782 */
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->context != context)
-+ temp = temp->pNext;
-+ else
-+ found = TRUE;
-+ }
-+
-+ if(!found)
-+ temp = NULL;
-+
-+ return temp;
-+} /* Bug: 4402782 */
-+
-+_X_HIDDEN XpClientDPIPtr
-+XpClientDPIFindRec(int clientAsMask) /* Bug: 4402782 */
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->clientAsMask != clientAsMask)
-+ temp = temp->pNext;
-+ else
-+ found = TRUE;
-+ }
-+
-+ if(!found)
-+ temp = NULL;
-+
-+ return temp;
-+} /* Bug: 4402782 */
-+
-+_X_HIDDEN Bool
-+XpClientDPISet( /* Bug: 4402782 */
-+XpContextPtr context,
-+int serverDPI)
-+{
-+ XpClientDPIPtr temp = client_dpi_head;
-+ Bool found = FALSE;
-+
-+ while(!found && temp != NULL)
-+ {
-+ if(temp->context != context)
-+ temp = temp->pNext;
-+ else
-+ {
-+ found = TRUE;
-+ temp->scale_factor = (float)serverDPI/(float)temp->client_dpi;
-+ }
-+ }
-+
-+ return found;
-+} /* Bug: 4402782 */
-+
-+_X_HIDDEN FontPtr
-+XpClientDPIGrabFont( /* Bug: 4402782 */
-+XpClientDPIPtr pClientDPI,
-+FontPtr pFont)
-+{
-+ FontPtr tempFont = pFont;
-+ Bool found = FALSE;
-+ XpClientFontsPtr temp = pClientDPI->head;
-+
-+ while(temp != NULL && !found)
-+ if(temp->client_font == pFont)
-+ {
-+ tempFont = temp->server_font;
-+ found = TRUE;
-+ }
-+ else
-+ temp = temp->pNext;
-+
-+ return tempFont;
-+} /* Bug: 4402782 */
-+
-+_X_HIDDEN void
-+XpClientDPIGetPos( /* Bug: 4402782 */
-+XpClientDPIPtr pClientDPI,
-+int *pCx,
-+int *pSx)
-+{
-+ *pCx = pClientDPI->client_x;
-+ *pSx = pClientDPI->server_x;
-+}
-+
-+_X_HIDDEN void
-+XpClientDPISetPos( /* Bug 4402782 */
-+XpClientDPIPtr pClientDPI,
-+int Cx,
-+int Sx)
-+{
-+ pClientDPI->client_x = Cx;
-+ pClientDPI->server_x = Sx;
-+}
-+
-
- /*******************************************************************************
- *
-@@ -310,6 +629,11 @@ XpExtensionInit(INITARGS)
- screenInfo.screens[i]->CloseScreen = XpCloseScreen;
- }
- }
-+ /*
-+ * BUG: 4402782: Client DPI. Set the font open function to new Xprt functions
-+ * that will do font renaming/ double opening if necessary.
-+ */
-+ ChangeProcVector(X_OpenFont, ProcXpOpenFont, SProcOpenFont);
- }
-
- static void
-@@ -442,6 +766,8 @@ ProcXpDispatch(ClientPtr client)
- return ProcXpSetImageResolution(client);
- case X_PrintGetImageResolution:
- return ProcXpGetImageResolution(client);
-+ case X_PrintClientDpi:
-+ return ProcXpClientDpi(client);
- default:
- return BadRequest;
- }
-@@ -507,8 +833,10 @@ ProcXpSwappedDispatch(ClientPtr client)
- return SProcXpSetImageResolution(client);
- case X_PrintGetImageResolution:
- return SProcXpGetImageResolution(client);
-- default:
-- return BadRequest;
-+ case X_PrintClientDpi:
-+ return SProcXpClientDpi(client);
-+ default:
-+ return BadRequest;
- }
- }
-
-@@ -689,7 +1017,9 @@ ProcXpGetPageDimensions(ClientPtr client
- xRectangle rect;
- xPrintGetPageDimensionsReply rep;
- XpContextPtr pContext;
-+ XpClientDPIPtr pClientDPI;
- int result;
-+ float scl_fact = 1;
-
- REQUEST_SIZE_MATCH(xPrintGetPageDimensionsReq);
-
-@@ -707,6 +1037,13 @@ ProcXpGetPageDimensions(ClientPtr client
- (pContext->funcs.GetReproducibleArea == 0))
- return BadImplementation;
-
-+ /*
-+ * BUG: 4402782: Client DPI: Get the scale factor for this client
-+ */
-+ pClientDPI = XpClientDPIGetRec(pContext);
-+ if(pClientDPI)
-+ scl_fact = pClientDPI->scale_factor;
-+
- result = pContext->funcs.GetMediumDimensions(pContext, &width, &height);
- if(result != Success)
- return result;
-@@ -718,12 +1055,12 @@ ProcXpGetPageDimensions(ClientPtr client
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.length = 0;
-- rep.width = width;
-- rep.height = height;
-+ rep.width = (CARD16)(width / scl_fact); /* BUG: 4402782 */
-+ rep.height = (CARD16)(height / scl_fact); /* BUG: 4402782 */
- rep.rx = rect.x;
- rep.ry = rect.y;
-- rep.rwidth = rect.width;
-- rep.rheight = rect.height;
-+ rep.rwidth = (CARD16)(rect.width / scl_fact); /* BUG: 4402782 */
-+ rep.rheight = (CARD16)(rect.height / scl_fact); /* BUG: 4402782 */
-
- if(client->swapped)
- {
-@@ -832,6 +1169,218 @@ ProcXpGetImageResolution(ClientPtr clien
- return client->noClientException;
- }
-
-+/* BUG: 4402782: Accept the client DPI request */
-+static int
-+ProcXpClientDpi(ClientPtr client)
-+{
-+ REQUEST(xPrintClientDpiReq);
-+ xPrintClientDpiReply rep;
-+ XpContextPtr pContext;
-+ Bool status;
-+
-+ REQUEST_SIZE_MATCH(xPrintClientDpiReq);
-+
-+ if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
-+ {
-+ client->errorValue = stuff->printContext;
-+ return XpErrorBase+XPBadContext;
-+ }
-+
-+ /*
-+ * Create a new client entry with the specified DPI
-+ */
-+ status = XpClientDPIAdd(pContext, client->clientAsMask, stuff->clientDPI);
-+
-+ /*
-+ * Send a response back to the client application
-+ */
-+ rep.type = X_Reply;
-+ rep.sequenceNumber = client->sequence;
-+ rep.length = 0;
-+ rep.status = status;
-+
-+ WriteToClient(client, sz_xPrintClientDpiReply, (char *)&rep);
-+ return client->noClientException;
-+} /* BUG: 4402782 */
-+
-+static void
-+ProcXpSetFont( /* BUG: 4402782: Store the client or server font */
-+ register ClientPtr client,
-+ FontPtr pFont)
-+{
-+ XpClientDPIPtr clientDPI;
-+
-+ clientDPI = XpClientDPIFindRec(client->clientAsMask);
-+
-+ /*
-+ * This static local variable is set below and is a straight processing line.
-+ * No other processes could break in and misuse this.
-+ */
-+ if(client_server_font == 1)
-+ clientDPI->head->client_font = pFont;
-+ else
-+ clientDPI->head->server_font = pFont;
-+} /* BUG: 4402782 */
-+
-+static void
-+ProcXpMakeFontName( /* BUG: 4402782 */
-+ char *font_name,
-+ int *font_len,
-+ char *base_name,
-+ int base_len,
-+ int client_dpi)
-+{
-+ int x, num = 0;
-+
-+ /*
-+ * Create a new font name (xlfd) using the clients DPI values.
-+ */
-+ for(x=0;x<base_len;x++)
-+ if(base_name[x] == '-') {
-+ if(++num == 7)
-+ {
-+ strncpy(font_name, base_name, x+1);
-+ strcat(font_name, "0-");
-+ *font_len = x + 3;
-+ }
-+ else if( num == 8)
-+ {
-+ char size[10];
-+ int pixels;
-+
-+ sscanf(&base_name[x+1], "%d", &pixels);
-+ sprintf(size, "%d", pixels);
-+ strcat(font_name, size);
-+ strcat(font_name, "-");
-+ *font_len += strlen(size) + 1;
-+ }
-+ else if( num == 9 || num == 10)
-+ {
-+ char size[10];
-+
-+ sprintf(size, "%d", client_dpi);
-+ strcat(font_name, size);
-+ strcat(font_name, "-");
-+ *font_len += strlen(size) + 1;
-+ }
-+ else if( num == 11)
-+ {
-+ strncat(font_name, &base_name[x+1], base_len - x);
-+ *font_len += (base_len - x - 1);
-+ }
-+ else
-+ {
-+ }
-+ }
-+} /* BUG: 4402782 */
-+
-+
-+static int
-+ProcXpOpenFont(ClientPtr client) /* BUG: 4402782 */
-+{
-+ int err = Success;
-+ int client_dpi;
-+ float scl_fact = 1;
-+ int open_two = 0;
-+ int new_fid;
-+ XpClientDPIPtr clientDPI;
-+
-+ /*
-+ * Basically this function replaces ProcOpenFont for Xp. It serves the same
-+ * purpose, but if the client has specified a scale factor other than 1.0,
-+ * this function will create two xlfd font names and open both fonts.
-+ */
-+ REQUEST(xOpenFontReq);
-+
-+ REQUEST_FIXED_SIZE(xOpenFontReq, stuff->nbytes);
-+ client->errorValue = stuff->fid;
-+ LEGAL_NEW_RESOURCE(stuff->fid, client);
-+
-+ /*
-+ * Create the second file id just in case it is necessary
-+ */
-+ new_fid = 2 * client->clientAsMask | RESOURCE_ID_MASK - stuff->fid;
-+
-+ /*
-+ * Get the data on whether we need to load two fonts
-+ */
-+ clientDPI = XpClientDPIFindRec(client->clientAsMask);
-+
-+ if(clientDPI != NULL)
-+ {
-+ client_dpi = clientDPI->client_dpi;
-+ scl_fact = clientDPI->scale_factor;
-+
-+ /*
-+ * If the scale factor is not 1, then find a free, valid new_fid.
-+ */
-+ if(scl_fact != 1)
-+ {
-+ while(!LegalNewID(new_fid, client) &&
-+ new_fid > stuff->fid)
-+ new_fid--;
-+
-+ if(new_fid > stuff->fid)
-+ open_two = 1;
-+ }
-+ }
-+
-+ /*
-+ * Check if we need to open the second font
-+ */
-+ if (open_two)
-+ {
-+ XpClientFontsPtr new;
-+ char *font_name;
-+ int font_len = 0;
-+
-+ font_name = (char *)malloc(sizeof(char)*stuff->nbytes+4);
-+ memset(font_name, 0, stuff->nbytes+4);
-+
-+ new = (XpClientFontsPtr)malloc(sizeof(XpClientFontsRec));
-+
-+ if(font_name && new)
-+ {
-+ new->pNext = clientDPI->head;
-+ clientDPI->head = new;
-+
-+ ProcXpMakeFontName(font_name, &font_len, &stuff[1], stuff->nbytes, client_dpi);
-+
-+ /*
-+ * This is the part that gets interesting. We set the callback to store
-+ * the font data in the clientDPI entry. First open the client font.
-+ */
-+ SetXpFontFunc(ProcXpSetFont);
-+ client_server_font = 1;
-+ err = OpenFont(client, stuff->fid, (Mask) 0, font_len, font_name);
-+
-+ /*
-+ * Next open the server font (the big one), then cancel the callback
-+ */
-+ client_server_font = 2;
-+ err = OpenFont(client, new_fid, (Mask) 0, stuff->nbytes, (char *)&stuff[1]);
-+ SetXpFontFunc(NULL);
-+
-+ /*
-+ * Add the new fids to the DPI structure
-+ */
-+ new->client_fid = stuff->fid;
-+ new->server_fid = new_fid;
-+ }
-+ }
-+ /*
-+ * Just open the one font. No need to open two.
-+ */
-+ else
-+ err = OpenFont(client, stuff->fid, (Mask) 0, stuff->nbytes, (char *)&stuff[1]);
-+
-+
-+ if (err == Success)
-+ return(client->noClientException);
-+ else
-+ return err;
-+} /* BUG: 4402782 */
-+
- /*******************************************************************************
- *
- * RehashPrinterList : Cause the server's list of printers to be rebuilt.
-@@ -1360,6 +1909,7 @@ ProcXpStartJob(ClientPtr client)
- REQUEST(xPrintStartJobReq);
- XpContextPtr pContext;
- int result = Success;
-+ int ires; /* BUG: 4402782 */
-
- REQUEST_SIZE_MATCH(xPrintStartJobReq);
-
-@@ -1389,6 +1939,13 @@ ProcXpStartJob(ClientPtr client)
-
- SendXpNotify(pContext, XPStartJobNotify, FALSE);
-
-+ /*
-+ * BUG: 4402782: Get the target printer DPI. Use this information to set the
-+ * scale factor in the client entry
-+ */
-+ ires = XpGetResolution(pContext);
-+ XpClientDPISet(pContext, ires);
-+
- if (client->noClientException != Success)
- return client->noClientException;
- else
-@@ -2583,6 +3140,19 @@ SProcXpGetImageResolution(ClientPtr clie
- return ProcXpGetImageResolution(client);
- }
-
-+static int
-+SProcXpClientDpi(ClientPtr client) /* BUG: 4402782 */
-+{
-+ long n;
-+ int i;
-+
-+ REQUEST(xPrintClientDpiReq);
-+ swaps(&stuff->length, i);
-+ swapl(&stuff->printContext, n);
-+ return ProcXpClientDpi(client);
-+} /* BUG: 4402782 */
-+
-+
- static void
- SwapXpNotifyEvent(xPrintPrintEvent *src, xPrintPrintEvent *dst)
- {
---- dix/Makefile.am 2008-12-16 14:38:49.000000000 -0800
-+++ dix/Makefile.am.new 2009-01-16 15:05:39.474170000 -0800
-@@ -66,6 +66,17 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
- $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
- || cp Xserver-dtrace.h.in $@
-
-+if XPRINT
-+
-+# Generate dtrace object code for probes in libdix
-+dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libXpdix_la_OBJECTS)
-+ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libXpdix_la_OBJECTS:%.lo=.libs/%.o)
-+
-+noinst_PROGRAMS = dix.O
-+
-+dix.O: dtrace-dix.o $(am_libXpdix_la_OBJECTS)
-+ ld -r -o $@ $(am_libXpdix_la_OBJECTS:%.lo=.libs/%.o)
-+else
- # Generate dtrace object code for probes in libdix
- dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
- $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
-@@ -74,6 +85,8 @@ noinst_PROGRAMS = dix.O
-
- dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
- ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
-+
-+endif
- endif
-
- dix.c:
---- dix/main.c 2008-11-05 08:52:17.000000000 -0800
-+++ dix/main.c.new 2009-01-22 14:28:24.682130000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /***********************************************************
-
- Copyright 1987, 1998 The Open Group
-@@ -103,9 +132,11 @@ Equipment Corporation.
- #include "extnsionst.h"
- #include "privates.h"
- #include "registry.h"
-+#if 0
- #ifdef XPRINT
- #include "DiPrint.h"
- #endif
-+#endif
- #ifdef PANORAMIX
- #include "panoramiXsrv.h"
- #else
-@@ -252,9 +283,11 @@ main(int argc, char *argv[], char *envp[
-
- InitGlobals();
- InitRegions();
-+#if 0
- #ifdef XPRINT
- PrinterInitGlobals();
- #endif
-+#endif
-
- #ifdef XQUARTZ
- /* Quartz support on Mac OS X requires that the Cocoa event loop be in
-@@ -356,9 +389,11 @@ main(int argc, char *argv[], char *envp[
- InitCallbackManager();
- InitVisualWrap();
- InitOutput(&screenInfo, argc, argv);
-+#if 0
- #ifdef XPRINT
- PrinterInitOutput(&screenInfo, argc, argv);
- #endif
-+#endif
-
- if (screenInfo.numScreens < 1)
- FatalError("no screens found");
---- dix/xpstubs.c 2008-11-05 08:52:17.000000000 -0800
-+++ dix/xpstubs.c.new 2009-01-22 14:47:23.197162000 -0800
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
- Copyright 1996, 1998 The Open Group
-
- Permission to use, copy, modify, distribute, and sell this software and its
-@@ -34,9 +63,9 @@ from The Open Group.
- #ifdef XPRINT
- #include "DiPrint.h"
- #else
-+#if 0
- extern Bool XpClientIsBitmapClient(ClientPtr client);
- extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe);
--#endif
-
- Bool
- XpClientIsBitmapClient(
-@@ -52,6 +81,9 @@ XpClientIsPrintClient(
- {
- return FALSE;
- }
-+#endif
-+#endif
-+
- #ifdef XPRINT
- int
- PrinterOptions(
-@@ -61,18 +93,8 @@ PrinterOptions(
- {
- return i;
- }
--void
--PrinterInitOutput(
-- ScreenInfo *pScreenInfo,
-- int argc,
-- char **argv)
--{
--}
- void PrinterUseMsg(void)
- {
- }
--void PrinterInitGlobals(void)
--{
--}
- #endif /* XPRINT */
-
--- a/open-src/xserver/xorg/xprint01.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,957 +0,0 @@
---- hw/xprint/pcl/PclArc.c 2009-01-09 14:17:56.330059000 -0800
-+++ hw/xprint/pcl/PclArc.c.new 2009-01-09 14:17:56.344134000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -77,6 +106,11 @@ PclDoArc(
- XpContextPtr pCon;
- PclContextPrivPtr pConPriv;
- xRectangle repro;
-+/*
-+** Bug 4402208: CRT 00325: Circles are Squares. Remove old fix. Do Scaling
-+*/
-+ float scl_fact = 1;
-+ XpClientDPIPtr pClientDPI;
-
- if( PclUpdateDrawableGC( pGC, pDrawable, &outFile ) == FALSE )
- return;
-@@ -87,7 +121,10 @@ PclDoArc(
- pConPriv = (PclContextPrivPtr)
- dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
- XpGetReproductionArea( pCon, &repro );
--
-+ pClientDPI = (XpClientDPIPtr) XpClientDPIGetRec(pCon);
-+ if(pClientDPI)
-+ scl_fact = pClientDPI->scale_factor;
-+
- /*
- * Generate the PCL code to draw the collection of arcs, by
- * defining it as a macro which uses the HP-GL/2 arc drawing
-@@ -133,8 +170,8 @@ PclDoArc(
- sprintf( t, "SC%.2f,%.2f,%d,%d;",
- (repro.x - Arc.width / 2 - xoffset - Arc.x) * ratio,
- (repro.x - Arc.width / 2 - xoffset - Arc.x +
-- repro.width) * ratio,
-- repro.y - Arc.height / 2 - yoffset - Arc.y + repro.height,
-+ repro.width / scl_fact) * ratio,
-+ repro.y - Arc.height / 2 - yoffset - Arc.y + (int)(repro.height/scl_fact),
- repro.y - Arc.height / 2 - yoffset - Arc.y);
- SAVE_PCL( outFile, pConPriv, t );
-
-@@ -173,10 +210,9 @@ PclDoArc(
- /*
- * Restore the coordinate system
- */
-- sprintf( t, "\033%%0BSC%d,%d,%d,%d;\033%%0A", repro.x,
-- repro.x + repro.width, repro.y + repro.height,
-- repro.y );
-- SEND_PCL( outFile, t );
-+ sprintf( t, "\033%%0BSC%d,%d,%d,%d;\033%%0A", repro.x,
-+ repro.x + repro.width/scl_fact, repro.y + repro.height/scl_fact,
-+ repro.y );
-
- /*
- * Clean up the temporary regions
---- hw/xprint/pcl/PclArea.c 2009-01-09 14:17:56.366749000 -0800
-+++ hw/xprint/pcl/PclArea.c.new 2009-01-09 14:17:56.380165000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -145,6 +174,8 @@ PclPutImage(DrawablePtr pDrawable,
- *
- * Given a 1-bit-deep pixmap, send the appropriate part of it to the
- * output file as a PCL raster graphics command.
-+ * Added scl_fact to pixmapFragment calls. This allows correct positioning to
-+ * occur when Mozilla is running.
- */
- static void
- PclMonoPixmapFragment(FILE *outFile,
-@@ -154,7 +185,8 @@ PclMonoPixmapFragment(FILE *outFile,
- short x2,
- short y2,
- short dstx,
-- short dsty)
-+ short dsty,
-+ float scl_fact)
- {
- char *bits, t[80], *row;
- int h, w, i;
-@@ -183,8 +215,8 @@ PclMonoPixmapFragment(FILE *outFile,
- * it's going to go down the wire without any compression. That
- * will have to be good enough for the sample implementation.
- */
-- sprintf( t, "\033*t300R\033*r%dT\033*r%dS\033*r1A\033*b0M",
-- h, x2 - x1 );
-+ sprintf( t, "\033*t%dR\033*r%dT\033*r%dS\033*r1A\033*b0M",
-+ (int)(300.0 / scl_fact), h, x2 - x1 );
- SEND_PCL( outFile, t );
-
- sprintf( t, "\033*b%dW", w );
-@@ -210,7 +242,8 @@ PclColorPixmapFragment(FILE *outFile,
- short x2,
- short y2,
- short dstx,
-- short dsty)
-+ short dsty,
-+ float scl_fact)
- {
- char *bits, t[80], *row;
- int h, w, i;
-@@ -238,15 +271,25 @@ PclColorPixmapFragment(FILE *outFile,
- * it's going to go down the wire without any compression. That
- * will have to be good enough for the sample implementation.
- */
-- sprintf( t, "\033*t300R\033*r%dt%ds1A\033*b0M",
-- h, x2 - x1 );
-+ sprintf( t, "\033*t%dR\033*r%dt%ds1A\033*b0M", (int)(300.0 / scl_fact),
-+ h, x2);
- SEND_PCL( outFile, t );
-
- sprintf( t, "\033*b%dW", w );
- for( row = bits, i = 0; i < h; i++, row += w )
- {
-- SEND_PCL( outFile, t );
-- SEND_PCL_COUNT( outFile, row, w );
-+ extern int replace_white;
-+ int x;
-+
-+ SEND_PCL( outFile, t );
-+/*
-+** 4402298: white pixels are transparent: UGLY FIX
-+*/
-+
-+ for(x=0;x<w;x++)
-+ if(row[x] == 0)
-+ row[x] = replace_white;
-+ SEND_PCL_COUNT( outFile, row, w );
- }
-
- SEND_PCL( outFile, "\033*rC" );
-@@ -276,12 +319,27 @@ PclCopyArea(DrawablePtr pSrc,
- FILE *dstFile;
- GC dstGC;
- unsigned long valid;
-+ XpContextPtr pCon;
- RegionPtr drawRegion, region, whole, ret;
- BoxRec box;
- BoxPtr prect;
- int nrect;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-+ int changecolor = 1;
-+
- void (*doFragment)(FILE *, PixmapPtr, short, short, short, short,
-- short, short );
-+ short, short, float );
-+
-+ pCon = PclGetContextFromWindow( (WindowPtr)pDst );
-+ pClientDPI = (XpClientDPIPtr) XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ scl_fact = pClientDPI->scale_factor;
-+ else
-+/* Bug 4462837: Xprt does not display images with CopyArea */
-+ changecolor = 0;
-+
-
- /*
- * Since we don't store any information on a per-window basis, we
-@@ -307,6 +365,12 @@ PclCopyArea(DrawablePtr pSrc,
- * drawing, instead of just handing it off to fb. Start
- * by determining the region that will be drawn.
- */
-+/*
-+** CRT 00308: Bug 4402782: Scale xprt output
-+*/
-+ {
-+
-+
- box.x1 = srcx;
- box.y1 = srcy;
- box.x2 = srcx + width;
-@@ -332,15 +396,47 @@ PclCopyArea(DrawablePtr pSrc,
- nrect = REGION_NUM_RECTS( region );
- prect = REGION_RECTS( region );
-
-- while( nrect )
-- {
-- (*doFragment)( dstFile, (PixmapPtr)pSrc, prect->x1 - dstx,
-- prect->y1 - dsty, prect->x2 - dstx,
-- prect->y2 - dsty, prect->x1, prect->y1 );
-
-- nrect--;
-- prect++;
-- }
-+ /*
-+ * If the scale factor is being used, then check to see if the bitmap is all
-+ * black. If it is, then we do not want to show it. Just ignore the bitmap.
-+ * This fix is for all of the clipping problems in Mozilla and mi/dix.
-+ */
-+ if(scl_fact != 1)
-+ {
-+ int nr = nrect;
-+ BoxPtr pr = prect;
-+ PixmapPtr pPix = (PixmapPtr)pSrc;
-+ char *ch = pPix->devPrivate.ptr;
-+ int wid = (int)((pr->x2-pr->x1)/4)*4+((pr->x2-pr->x1)%4 != 0)*4;
-+
-+ while(nr && changecolor)
-+ {
-+ int x, y;
-+
-+ for(x = 0;x< pr->x2 - pr->x1 && changecolor;x++)
-+ for(y=0;y<pr->y2 - pr->y1 && changecolor;y++)
-+ if(ch[x + y * wid] != 1)
-+ changecolor = 0;
-+ nr--;
-+ pr++;
-+ }
-+ }
-+ else
-+ changecolor = 0;
-+
-+ if(!changecolor)
-+ while( nrect )
-+ {
-+ (*doFragment)( dstFile, (PixmapPtr)pSrc, prect->x1 - dstx,
-+ prect->y1 - dsty, prect->x2 - dstx,
-+ prect->y2 - dsty, prect->x1, prect->y1, scl_fact );
-+
-+ nrect--;
-+ prect++;
-+ }
-+ }
-+
-
- /*
- * Update the destination's GC to the source's GC.
---- hw/xprint/pcl/PclColor.c 2009-01-09 14:17:56.415136000 -0800
-+++ hw/xprint/pcl/PclColor.c.new 2009-01-09 14:17:56.428389000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -74,6 +103,10 @@ static void trilinear(unsigned char *p,
- unsigned char *d,
- int dim,
- unsigned char def);
-+/*
-+** Bug: 4402298: white pixels are transparenet: ULGY FIX
-+*/
-+int replace_white = 0;
-
-
- /*
-@@ -196,7 +229,7 @@ PclDestroyColormap(ColormapPtr pColor)
- while( con )
- {
- cPriv = dixLookupPrivate(&con->context->devPrivates,
-- PclContextPrivateKey);
-+ PclContextPrivateKey);
- pPal = cPriv->palettes;
- while( pPal )
- {
-@@ -246,6 +279,27 @@ PclListInstalledColormaps(ScreenPtr pScr
- return 0;
- }
-
-+/*
-+ * The same code is in a few places, do it here and make sure it is consistent.
-+ */
-+void
-+PclGetColors(ColormapPtr cmap, int i, unsigned short *r, unsigned short *g,
-+ unsigned short *b)
-+{
-+ if( cmap->red[i].fShared )
-+ {
-+ *r = cmap->red[i].co.shco.red->color;
-+ *g = cmap->red[i].co.shco.green->color;
-+ *b = cmap->red[i].co.shco.blue->color;
-+ }
-+ else
-+ {
-+ *r = cmap->red[i].co.local.red;
-+ *g = cmap->red[i].co.local.green;
-+ *b = cmap->red[i].co.local.blue;
-+ }
-+}
-+
- void
- PclStoreColors(ColormapPtr pColor,
- int ndef,
-@@ -279,7 +333,7 @@ PclStoreColors(ColormapPtr pColor,
- * appropriate palette.
- */
- cPriv = dixLookupPrivate(&con->context->devPrivates,
-- PclContextPrivateKey);
-+ PclContextPrivateKey);
- pMap = PclFindPaletteMap( cPriv, pColor, NULL );
-
- /*
-@@ -295,19 +349,7 @@ PclStoreColors(ColormapPtr pColor,
- for( i = 0; i < ndef; i++ )
- {
- pID = pdefs[i].pixel;
-- if ( pColor->red[i].fShared )
-- {
-- r = pColor->red[pID].co.shco.red->color;
-- g = pColor->red[pID].co.shco.green->color;
-- b = pColor->red[pID].co.shco.blue->color;
-- }
-- else
-- {
-- r = pColor->red[pID].co.local.red;
-- g = pColor->red[pID].co.local.green;
-- b = pColor->red[pID].co.local.blue;
-- }
--
-+ PclGetColors(pColor, i, &r, &g, &b);
- if( pdefs[i].flags & DoRed )
- r = pdefs[i].red;
- if( pdefs[i].flags & DoGreen )
-@@ -438,8 +480,8 @@ PclUpdateColormap(DrawablePtr pDrawable,
- * Add the colormap to the screen-level colormap<->context mapping.
- */
- sPriv = (PclScreenPrivPtr)
-- dixLookupPrivate(&cmap->pScreen->devPrivates,
-- PclScreenPrivateKey);
-+ dixLookupPrivate(&cmap->pScreen->devPrivates,
-+ PclScreenPrivateKey);
- pCmap = sPriv->colormaps;
- while( pCmap && ( pCmap->colormapId != cmap->mid ) )
- pCmap = pCmap->next;
-@@ -498,19 +540,28 @@ PclUpdateColormap(DrawablePtr pDrawable,
-
- for(i = 0; i < cmap->pVisual->ColormapEntries; i++ )
- {
-- if( cmap->red[i].fShared )
-- {
-- r = cmap->red[i].co.shco.red->color;
-- g = cmap->red[i].co.shco.green->color;
-- b = cmap->red[i].co.shco.blue->color;
-- }
-- else
-- {
-- r = cmap->red[i].co.local.red;
-- g = cmap->red[i].co.local.green;
-- b = cmap->red[i].co.local.blue;
-- }
-+ /*
-+ * Bug: 4402298: White pixels are transparent.
-+ * THIS FIX IS AN UGLY HACK!!! Should try to turn
-+ * transparency off for bitmaps, here we are changing
-+ * the last color in the colormap to be off white.
-+ * Additionally, replace_white is set to this color
-+ * but is not used until the bitmap is sent. This
-+ * could happen after another app has called and set
-+ * its GC values and changed replace_white to another
-+ * value. replace_white should be in the client data,
-+ * but no access is present in the PclArea.c code.
-+ */
-+ if(i == cmap->pVisual->ColormapEntries - 1)
-+ {
-+ replace_white = i;
-+ PclGetColors(cmap, 0, &r, &g, &b);
-+ }
-+ else
-+ PclGetColors(cmap, i, &r, &g, &b);
- PclLookUp(cmap, cPriv, &r, &g, &b);
-+ if(i == cmap->pVisual->ColormapEntries - 1)
-+ r--;
- sprintf( t, "\033*v%ua%ub%uc%dI", r, g, b, i );
- SEND_PCL( outFile, t );
- }
---- hw/xprint/pcl/PclGC.c 2009-01-09 14:17:56.454870000 -0800
-+++ hw/xprint/pcl/PclGC.c.new 2009-01-09 14:17:56.468472000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -145,7 +174,7 @@ PclGetDrawablePrivateStuff(
- else
- {
- cPriv = (PclContextPrivPtr)
-- dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
-+ dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
- *gc = cPriv->lastGC;
- *valid = cPriv->validGC;
- *file = cPriv->pPageFile;
-@@ -173,7 +202,7 @@ PclSetDrawablePrivateGC(
- case DRAWABLE_PIXMAP:
- pix = (PixmapPtr)pDrawable;
- pixPriv = (PclPixmapPrivPtr)
-- dixLookupPrivate(&pix->devPrivates, PclPixmapPrivateKey);
-+ dixLookupPrivate(&pix->devPrivates, PclPixmapPrivateKey);
-
- pixPriv->lastGC = gc;
- pixPriv->validGC = 1;
-@@ -182,7 +211,7 @@ PclSetDrawablePrivateGC(
- case DRAWABLE_WINDOW:
- pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
- pPriv = (PclContextPrivPtr)
-- dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
-+ dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
-
- pPriv->validGC = 1;
- pPriv->lastGC = gc;
-@@ -318,7 +347,7 @@ PclUpdateDrawableGC(
- XpContextPtr pCon;
- PclContextPrivPtr cPriv;
- PclGCPrivPtr gcPriv = (PclGCPrivPtr)
-- dixLookupPrivate(&pGC->devPrivates, PclGCPrivateKey);
-+ dixLookupPrivate(&pGC->devPrivates, PclGCPrivateKey);
-
- if( !PclGetDrawablePrivateStuff( pDrawable, &dGC, &valid, outFile ) )
- return FALSE;
-@@ -804,6 +833,12 @@ PclComputeCompositeClip(
- {
- if (pDrawable->type == DRAWABLE_WINDOW)
- {
-+
-+/*
-+* CRT 00308: Bug 4402782: Scale xprt output
-+*/
-+ XpContextPtr pCon;
-+ int client_dpi, scl_fact = 1;
- WindowPtr pWin = (WindowPtr) pDrawable;
- RegionPtr pregWin;
- Bool freeTmpClip, freeCompClip;
-@@ -819,6 +854,19 @@ PclComputeCompositeClip(
- freeTmpClip = FALSE;
- }
- freeCompClip = pGC->freeCompClip;
-+ /*
-+ * Check to see if the application is scaling. If it is, then do not
-+ * perform clipping on the images. (This is a hack, but the clipping
-+ * is very broken. By checking the image for all black pixels, we can
-+ * remove the artifacts that CT_NONE will cause, but not get the
-+ * disappearing images that CT_REGION creates).
-+ */
-+ pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
-+ XpClientDPIGetData(pCon, &client_dpi, &scl_fact);
-+
-+ if(scl_fact != 1.0)
-+ pGC->clientClipType = CT_NONE;
-+
-
- /*
- * if there is no client clip, we can get by with just keeping the
---- hw/xprint/pcl/PclPrint.c 2008-11-05 08:52:17.000000000 -0800
-+++ hw/xprint/pcl/PclPrint.c.new 2009-01-11 12:25:12.534336000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -120,6 +149,8 @@ PclStartJob(
- pal = &( pConPriv->specialTrueColorPalette );
- pal->paletteId = 3;
- pal->downloaded = 0;
-+/* CRT 00308: Bug 4402782: Scale xprt output */
-+ XpClientDPISet(pCon, 300);
-
- return Success;
- }
-@@ -257,6 +288,14 @@ PclStartPage(
- char t[80];
- XpOid orient, plex, tray, medium;
- int dir, plexNum, num;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ scl_fact = pClientDPI->scale_factor;
-+
-
- /*
- * Put a pointer to the context in the window private structure
-@@ -437,7 +476,8 @@ PclStartPage(
- SEND_PCL( pConPriv->pPageFile, t );
-
- sprintf( t, "\033%%0BSC%d,%d,%d,%d;\033%%0A", repro.x, repro.x +
-- repro.width, repro.y + repro.height, repro.y );
-+ (int)(repro.width / scl_fact),
-+ repro.y + (int)(repro.height / scl_fact), repro.y );
- SEND_PCL( pConPriv->pPageFile, t );
-
- return Success;
---- hw/xprint/pcl/PclText.c 2008-11-05 08:52:17.000000000 -0800
-+++ hw/xprint/pcl/PclText.c.new 2009-01-13 13:03:58.238696000 -0800
-@@ -1,3 +1,32 @@
-+/*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
- /*******************************************************************
- **
- ** *********************************************************
-@@ -59,6 +88,10 @@ copyright holders.
- #include <X11/Xatom.h>
-
- #include "PclSFonts.h"
-+/*
-+** 00308: Bug 4402782: Scale xprt output
-+*/
-+#include "dpi.h"
-
- static PclFontHead8Ptr makeFontHeader8 (FontPtr, PclSoftFontInfoPtr);
- static PclFontHead16Ptr makeFontHeader16(FontPtr, PclSoftFontInfoPtr);
-@@ -112,12 +145,51 @@ BoxPtr pbox;
- BoxRec box;
- RegionPtr drawRegion, region;
- char font_type;
-+XpClientDPIPtr pClientDPI;
-+float scl_fact = 1;
-+FontPtr useFont;
-+int client_x, server_x;
-+
-+ useFont = pGC->font;
-
- if( PclUpdateDrawableGC( pGC, pDrawable, &outFile ) == FALSE )
- return x;
-+ pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
-+ pConPriv = (PclContextPrivPtr)
-+ dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
-
-- GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-- Linear8Bit, &n, charinfo);
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ {
-+ scl_fact = pClientDPI->scale_factor;
-+
-+ if(scl_fact != 1.0)
-+ {
-+ /*
-+ * Get the positions based on the client DPI sized fonts, and the
-+ * server DPI sized fonts. Note that server fonts have been scaled
-+ * back so that the x position is in the same scale. This is done
-+ * to fix the issue that 100 DPI fonts do not have the same spacing
-+ * at 300 DPI as 300 DPI fonts do. (IE multiply 100 DPI font size
-+ * by 3 does not give 300 DPI font sizes exactly). The X pos sent
-+ * into this function is based on client DPI fonts. The characters
-+ * used to print are server DPI fonts. The starting position may
-+ * need to change if fonts on this line printed earlier did not
-+ * match exactly.
-+ */
-+ XpClientDPIGetPos(pClientDPI, &client_x, &server_x);
-+ if(x == client_x && client_x != server_x)
-+ x = server_x;
-+ else
-+ client_x = x;
-+
-+ useFont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-+ }
-+
-+ GetGlyphs(useFont, (unsigned long)count, (unsigned char *)string,
-+ Linear8Bit, &n, charinfo);
- if ( n == 0 )
- return x;
-
-@@ -125,12 +197,12 @@ char font_type;
- pConPriv = (PclContextPrivPtr)
- dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
- pSoftFontInfo = pConPriv->pSoftFontInfo;
-- font_type = isInternal(pGC->font);
-+ font_type = isInternal(useFont);
- if ( font_type == DOWNLOAD_FONT ) {
- /*
- * Create Soft Font Header Information
- */
-- pfh8 = makeFontHeader8(pGC->font, pSoftFontInfo);
-+ pfh8 = makeFontHeader8(useFont, pSoftFontInfo);
- if (!pfh8)
- return x;
-
-@@ -152,8 +224,8 @@ char font_type;
- */
- MACRO_START( outFile, pConPriv );
- sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-- x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
-- ETX);
-+ x + pDrawable->x, y + pDrawable->y, ETX);
-+ /* Bug: Lines too low */
- SAVE_PCL( outFile, pConPriv, t );
- SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
-
-@@ -186,7 +258,7 @@ char font_type;
- } else {
- int fid = 0;
-
-- pin = makeInternalFont(pGC->font, pSoftFontInfo);
-+ pin = makeInternalFont(useFont, pSoftFontInfo);
- if (!pin)
- return x;
-
-@@ -197,8 +269,8 @@ char font_type;
- */
- MACRO_START( outFile, pConPriv );
- sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-- x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
-- ETX);
-+ x + pDrawable->x, y + pDrawable->y, ETX);
-+ /* Bug: Lines too low */
- SAVE_PCL( outFile, pConPriv, t );
- selectSize(outFile, pConPriv, pin);
- SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
-@@ -220,15 +292,38 @@ char font_type;
- SAVE_PCL( outFile, pConPriv, t );
- MACRO_END( outFile );
- }
-+
-+ /*
-+ * Calculate the size of the client DPI fonts. We already know w is the size
-+ * of the server sized fonts. So server_x gets w/scl_fact added to the start
-+ * position. client_x gets its value incremented by the size of the client
-+ * fonts. (client_x may need to be set above to x instead of only in the else??)
-+ */
-+ if(useFont != pGC->font)
-+ {
-+ CharInfoPtr charinfoC[255];
-+ int w2;
-+
-+ server_x = x+w / scl_fact;
-+ GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-+ Linear8Bit, &n, charinfoC);
-+ w2 = 0;
-+ for (i=0; i<n; i++) w2 += charinfoC[i]->metrics.characterWidth;
-+ client_x += w2;
-+
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, client_x, server_x);
-+ }
-+
-
- /*
- * Convert the collection of rectangles into a proper region, then
- * intersect it with the clip region.
- */
- box.x1 = x + pDrawable->x;
-- box.y1 = y - max_ascent + pDrawable->y + pGC->font->info.fontAscent;
-+ box.y1 = y - max_ascent + pDrawable->y; /* Bug: Lines Too Low */
- box.x2 = x + w + pDrawable->x;
-- box.y2 = y + max_descent + pDrawable->y + pGC->font->info.fontAscent;
-+ box.y2 = y + max_descent + pDrawable->y; /* Bug: Lines Too Low */
-
- drawRegion = miRegionCreate( &box, 0 );
- region = miRegionCreate( NULL, 0 );
-@@ -283,32 +378,59 @@ BoxPtr pbox;
- BoxRec box;
- RegionPtr drawRegion, region;
- char font_type;
-+XpClientDPIPtr pClientDPI;
-+float scl_fact = 1;
-+FontPtr useFont;
-+int client_x, server_x;
-+
-+/*
-+** Bug 4402782: Scale xprt output
-+*/
-+ useFont = pGC->font;
-
- if( PclUpdateDrawableGC( pGC, pDrawable, &outFile ) == FALSE )
- return x;
-
-- GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-- (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
-- &n, charinfo);
--
- pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
- pConPriv = (PclContextPrivPtr)
- dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ {
-+ scl_fact = pClientDPI->scale_factor;
-+
-+ if(scl_fact != 1.0)
-+ {
-+ XpClientDPIGetPos(pClientDPI, &client_x, &server_x);
-+ if(x == client_x && client_x != server_x)
-+ x = server_x;
-+ else
-+ client_x = x;
-+
-+ useFont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-+ }
-+
-+ GetGlyphs(useFont, (unsigned long)count, (unsigned char *)string,
-+ (FONTLASTROW(useFont) == 0) ? Linear16Bit : TwoD16Bit,
-+ &n, charinfo);
-+
- pSoftFontInfo = pConPriv->pSoftFontInfo;
-+ font_type = isInternal(useFont);
-
-- font_type = isInternal(pGC->font);
- if ( font_type == DOWNLOAD_FONT ) {
- /*
- * Create Soft Font Header Information
- */
-- pfh16 = makeFontHeader16(pGC->font, pSoftFontInfo);
-- if (!pfh16)
-- return x;
--
-+ pfh16 = makeFontHeader16(useFont, pSoftFontInfo);
-+ if (!pfh16)
-+ return x;
- /*
- * exec Soft Font Downloading
- */
-- pfi = (FontInfoRec *)&pGC->font->info;
-+ pfi = (FontInfoRec *)&useFont->info;
- p = (char *)string;
- for (i=0, p=(char *)string, chinfo=charinfo; i<n; i++, p+=2, chinfo++) {
- row = *p & 0xff;
-@@ -335,8 +457,9 @@ char font_type;
- */
- MACRO_START( outFile, pConPriv );
- sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-- x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
-- ETX);
-+ x + pDrawable->x, y + pDrawable->y, ETX);
-+ /* Bug: Lines Too Low */
-+
- SAVE_PCL( outFile, pConPriv, t );
- SAVE_PCL_COUNT( outFile, pConPriv, "FI0;SS;LB", 9 );
-
-@@ -381,7 +504,7 @@ char font_type;
- PclInternalFontPtr pin;
- int fid = 0;
-
-- pin = makeInternalFont(pGC->font, pSoftFontInfo);
-+ pin = makeInternalFont(useFont, pSoftFontInfo);
- if (!pin)
- return x;
-
-@@ -393,8 +516,8 @@ char font_type;
- */
- MACRO_START( outFile, pConPriv );
- sprintf(t, "\033%%0B;PU%d,%dPD;TD1;DT%c,1;",
-- x + pDrawable->x, y + pDrawable->y + pGC->font->info.fontAscent,
-- ETX);
-+ x + pDrawable->x, y + pDrawable->y, ETX);
-+ /* Bug: Lines Too Low */
- SAVE_PCL( outFile, pConPriv, t );
- sprintf(t, "TD0;\033%%1A");
- SAVE_PCL( outFile, pConPriv, t );
-@@ -405,7 +528,7 @@ char font_type;
- max_descent = charinfo[0]->metrics.descent;
- for (i=0, p=(char *)string, chinfo=charinfo; i<n; i++, p+=2, chinfo++) {
- char tobuf[3];
-- code_conv(pSoftFontInfo, pGC->font, (char *)p, tobuf);
-+ code_conv(pSoftFontInfo, useFont, (char *)p, tobuf);
- fprintf(outFile, "%c%c", tobuf[0], tobuf[1]);
-
- w += (*chinfo)->metrics.characterWidth;
-@@ -417,15 +540,31 @@ char font_type;
- return x;
- #endif /* DO_TWO_BYTE_PCL */
- }
-+
-+ if(useFont != pGC->font)
-+ {
-+ CharInfoPtr charinfoC[255];
-+ int w2;
-+
-+ server_x = x+w / scl_fact;
-+ GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-+ Linear8Bit, &n, charinfoC);
-+ w2 = 0;
-+ for (i=0; i<n; i++) w2 += charinfoC[i]->metrics.characterWidth;
-+ client_x += w2;
-+
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, client_x, server_x);
-+ }
-
- /*
- * Convert the collection of rectangles into a proper region, then
- * intersect it with the clip region.
- */
- box.x1 = x + pDrawable->x;
-- box.y1 = y - max_ascent + pDrawable->y + pGC->font->info.fontAscent;
-+ box.y1 = y - max_ascent + pDrawable->y; /* Bug: Lines Too Low */
- box.x2 = x + w + pDrawable->x;
-- box.y2 = y + max_descent + pDrawable->y + pGC->font->info.fontAscent;
-+ box.y2 = y + max_descent + pDrawable->y; /* Bug: Lines Too Low */
-
- drawRegion = miRegionCreate( &box, 0 );
- region = miRegionCreate( NULL, 0 );
--- a/open-src/xserver/xorg/xprint02.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1247 +0,0 @@
---- hw/xprint/ps/PsArea.c 2006-09-17 23:04:18.000000000 -0700
-+++ hw/xprint/ps/PsArea.c.new 2008-09-24 10:53:55.994077000 -0700
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -228,6 +257,8 @@ PsPutScaledImageIM(DrawablePtr pDrawable
- {
- int i, j;
- int r, c;
-+ int swap;
-+ char *pt;
- PsOutPtr psOut;
- ColormapPtr cMap;
- int pageRes, sw, sh;
-@@ -245,6 +276,9 @@ PsPutScaledImageIM(DrawablePtr pDrawable
- sh = (float)h * (float)pageRes / (float)imageRes + 0.5;
- }
- PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
-+/*
-+** bug4356265:PS driver of Xprt doesn't support transparent bitmap font printing*/
-+ pt = (char *)(&i); i = 1; if( pt[0]=='\001' ) swap = 1; else swap = 0;
-
- #ifdef BM_CACHE
- cache_id = PsBmIsImageCached(w, h, pImage);
-@@ -258,36 +292,97 @@ PsPutScaledImageIM(DrawablePtr pDrawable
-
- PsOut_BeginImageCache(psOut, cache_id);
- #endif
-- if( depth!=1 )
-+ if( depth==24 )
- {
- PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
--
-- for( r=0 ; r<h ; r++ )
-+ if( format==XYPixmap )
- {
-- for( c=0 ; c<w ; c++ )
-- {
-- unsigned long pv = PsGetImagePixel(pImage, depth, w, h, leftPad, format, c, r);
-- PsOutColor clr = PsGetPixelColor(cMap, pv);
-- /* XXX: This needs to be fixed for endian swapping and to support
-- * depths deeper than 8bit per R-,G-,B-gun... */
-- unsigned long val = PSOUTCOLOR_TO_RGB24BIT(clr);
-- char *ipt = (char *)&val;
--/* XXX: Is this the right way to detect the platform endianess ? */
--#if IMAGE_BYTE_ORDER == LSBFirst
-+ int rowsiz = PixmapBytePad(w, depth);
-+ char *planes[3];
-+ planes[0] = pImage;
-+ planes[1] = &pImage[rowsiz*h];
-+ planes[2] = &pImage[rowsiz*h*2];
-+ for( r=0 ; r<h ; r++ )
- {
-- long l;
-- swapl(&val, l);
-+ char *pt[3];
-+ for( i=0 ; i<3 ; i++ ) pt[i] = &planes[i][rowsiz*r];
-+ for( c=0 ; c<w ; c++ )
-+ {
-+ for( i=0 ; i<3 ; i++ )
-+ { PsOut_OutImageBytes(psOut, 1, &pt[i][c]); pt[i]++; }
-+ }
- }
--#elif IMAGE_BYTE_ORDER == MSBFirst
--#else
--#error Unsupported byte order
--#endif
-- PsOut_OutImageBytes(psOut, 3, &ipt[1]);
-+ }
-+ else if( format==ZPixmap )
-+ {
-+ int rowsiz = PixmapBytePad(w, depth);
-+ for( r=0 ; r<h ; r++ )
-+ {
-+ char *pt = &pImage[rowsiz*r];
-+ for( c=0 ; c<w ; c++,pt+=4 )
-+ {
-+ if( swap )
-+ {
-+ char tmp[4];
-+ tmp[0] = pt[3]; tmp[1] = pt[2]; tmp[2] = pt[1]; tmp[3] = pt[0]; PsOut_OutImageBytes(psOut, 3, &tmp[1]);
-+ }
-+ else
-+ PsOut_OutImageBytes(psOut, 3, &pt[1]);
-+ }
-+ }
-+ }
-+ else goto error;
-+ PsOut_EndImage(psOut);
-+ }
-+ else if( depth==8 )
-+ {
-+ int rowsiz = PixmapBytePad(w, depth);
-+ PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
-+ for( r=0 ; r<h ; r++ )
-+ {
-+ char *pt = &pImage[rowsiz*r];
-+ for( c=0 ; c<w ; c++,pt++ )
-+ {
-+ int val = PsGetPixelColor(cMap, (int)(*pt)&0xFF);
-+ char *ipt = (char *)&val;
-+ if( swap )
-+ {
-+ char tmp[4];
-+ tmp[0] = ipt[3]; tmp[1] = ipt[2]; tmp[2] = ipt[1]; tmp[3] = ipt[0];
-+ PsOut_OutImageBytes(psOut, 3, &tmp[1]);
-+ }
-+ else
-+ PsOut_OutImageBytes(psOut, 3, &ipt[1]);
- }
- }
--
- PsOut_EndImage(psOut);
- }
-+ else if( depth==1 )
-+ {
-+ {
-+ int rowsiz = BitmapBytePad(w);
-+ int psrsiz = (w+7)/8;
-+ PsOut_BeginImageIM(psOut, PsGetPixelColor(cMap, pGC->bgPixel),
-+ PsGetPixelColor(cMap, pGC->fgPixel),
-+ x, y, w, h, sw, sh, 1);
-+ for( r=0 ; r<h ; r++ )
-+ {
-+ char *pt = &pImage[rowsiz*r];
-+ for( i=0 ; i<psrsiz ; i++ )
-+ {
-+ int iv_, iv = (int)pt[i]&0xFF;
-+ char c;
-+ if( swap )
-+ { for( j=0,iv_=0 ; j<8 ; j++ ) iv_ |= (((iv>>j)&1)<<(7-j)); }
-+ else
-+ iv_ = iv;
-+ c = iv_;
-+ PsOut_OutImageBytes(psOut, 1, &c);
-+ }
-+ }
-+ PsOut_EndImage(psOut);
-+ }
-+ }
- else
- {
- int rowsiz = BitmapBytePad(w);
-@@ -323,6 +418,8 @@ PsPutScaledImageIM(DrawablePtr pDrawable
- PsGetPixelColor(cMap, pGC->fgPixel));
- #endif
- }
-+error:
-+ return;
- }
- void
- PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
-@@ -355,11 +452,54 @@ PsCopyArea(DrawablePtr pSrc, DrawablePtr
- {
- PsOutPtr psOut;
- ColormapPtr cMap;
-+/*
-+** Bug 4402782: Scale xprt output
-+*
-+* For applications using the scaling factor, the images that are full black,
-+* will not be shown. This is to prevent the spacers that are used from being
-+* displayed. (This should have been taken care of with CT_REGION, but Mozilla
-+* does not appear to have that done/set correctly.)
-+*/
-+ char *ch = src->devPrivate.ptr;
-+ int wid = (int)(width/4)*4+(width%4!=0)*4;
-+ int changecolor = 1;
-+ int done = 0;
-+ XpContextPtr pcon;
-+
- if( PsUpdateDrawableGC(pGC, pDst, &psOut, &cMap)==FALSE ) return NULL;
-- PsOut_Offset(psOut, pDst->x, pDst->y);
-- PsOut_BeginFrame(psOut, dstx-srcx, dsty-srcy, dstx, dsty, width, height);
-- PsReplayPixmap(src, pDst);
-- PsOut_EndFrame(psOut);
-+ if (requestingClient && (pcon = XpGetPrintContext(requestingClient)))
-+ {
-+ XpClientDPIPtr pClientDPI = XpClientDPIGetRec(pcon);
-+ if(pClientDPI)
-+ {
-+ int scl_fact = pClientDPI->scale_factor;
-+
-+ if(scl_fact != 1.0)
-+ while(changecolor && !done)
-+ {
-+ int x, y;
-+ for(y=0;y<height && changecolor;y++)
-+ for(x=0;x<width && changecolor;x++)
-+ if(ch[x+y*wid] != 0)
-+ changecolor = 0;
-+ done = 1;
-+ }
-+ }
-+ else
-+/*
-+** Bug 4462837: Xprt does not display images with CopyArea
-+*/
-+ changecolor = 0;
-+ }
-+ if(!changecolor)
-+ {
-+ PsOut_Offset(psOut, pDst->x, pDst->y);
-+ PsOut_BeginFrame(psOut,dstx-srcx, dsty-srcy, dstx, dsty, width, height);
-+ PsReplayPixmap(src, pDst);
-+ PsOut_EndFrame(psOut);
-+ }
-+
-+
- }
- else PsCopyDisplayList(src, dst, dstx-srcx, dsty-srcy, dstx, dsty,
- width, height);
---- hw/xprint/ps/PsFonts.c 2006-09-17 23:04:18.000000000 -0700
-+++ hw/xprint/ps/PsFonts.c.new 2008-09-24 10:53:56.019378000 -0700
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -155,7 +184,8 @@ PsGetPSFontName(FontPtr pFont)
- FontPropPtr props = pFont->info.props;
- /* "_ADOBE_POSTSCRIPT_FONTNAME" maps directly to a PMF OBJ_NAME attribute
- * name - changing the name will break printer-builtin fonts. */
-- Atom name = MakeAtom("_ADOBE_POSTSCRIPT_FONTNAME", 26, True);
-+ /* bug4312893:Xprt:PS driver can't handle pmf font proprtly */
-+ Atom name = MakeAtom("PRINTER_RESIDENT_FONT", 21, True);
- Atom value = (Atom)0;
-
- for( i=0 ; i<nprops ; i++ )
---- hw/xprint/ps/psout.c 2006-09-17 23:04:18.000000000 -0700
-+++ hw/xprint/ps/psout.c.new 2008-09-24 11:19:44.573129000 -0700
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -89,6 +118,18 @@ in this Software without prior written a
- #endif /* XP_USE_FREETYPE */
- /* For VENDOR_STRING and VENDOR_RELEASE */
- #include "site.h"
-+/*
-+** CRT 00308: Bug 4402782: Scale xprt outpu
-+*/
-+#include <X11/X.h>
-+#include <X11/Xproto.h>
-+#include "misc.h"
-+#include "windowstr.h"
-+#include "scrnintstr.h"
-+#include "pixmapstr.h"
-+#include "extnsionst.h"
-+#include "dixstruct.h"
-+#include <X11/Xatom.h>
-
- /*
- * Standard definitions
-@@ -584,6 +625,13 @@ S_SetPageDevice(PsOutPtr self, int orien
- * PUBLIC FUNCTIONS *
- *******************************************************************/
-
-+void
-+PsOut_SetClientDPI(PsOutPtr self, XpClientDPIPtr client_dpi)
-+{
-+ self->ClientDpi = client_dpi;
-+}
-+
-+
- FILE *
- PsOut_ChangeFile(PsOutPtr self, FILE *fp)
- {
-@@ -695,6 +743,7 @@ PsOut_EndFile(PsOutPtr self, int closeFi
- if( self->Patterns ) xfree(self->Patterns);
- if( self->Clip.rects ) xfree(self->Clip.rects);
- if( closeFile ) fclose(self->Fp);
-+ self->pagenum = 0;
- xfree(self);
- }
-
-@@ -779,6 +828,10 @@ PsOut_Clip(PsOutPtr self, int clpTyp, Ps
- int changed = 0;
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InTile ) return;
- if( self->InFrame ) xo = yo = 0;
-@@ -869,10 +922,10 @@ PsOut_Clip(PsOutPtr self, int clpTyp, Ps
- {
- for( i=0 ; i<self->Clip.nOutterClips ; i++ )
- {
-- S_OutNum(self, (float)(self->Clip.outterClips[i].x));
-- S_OutNum(self, (float)(self->Clip.outterClips[i].y));
-- S_OutNum(self, (float)self->Clip.outterClips[i].w);
-- S_OutNum(self, (float)self->Clip.outterClips[i].h);
-+ S_OutNum(self, (float)(self->Clip.outterClips[i].x)* scl_fact);
-+ S_OutNum(self, (float)(self->Clip.outterClips[i].y)* scl_fact);
-+ S_OutNum(self, (float)self->Clip.outterClips[i].w * scl_fact);
-+ S_OutNum(self, (float)self->Clip.outterClips[i].h * scl_fact);
- S_OutTok(self, "R", 1);
- }
- S_OutTok(self, "cl n", 1);
-@@ -881,10 +934,10 @@ PsOut_Clip(PsOutPtr self, int clpTyp, Ps
- {
- for( i=0 ; i<self->Clip.nRects ; i++ )
- {
-- S_OutNum(self, (float)(self->Clip.rects[i].x+xo));
-- S_OutNum(self, (float)(self->Clip.rects[i].y+yo));
-- S_OutNum(self, (float)self->Clip.rects[i].w);
-- S_OutNum(self, (float)self->Clip.rects[i].h);
-+ S_OutNum(self, (float)(self->Clip.rects[i].x * scl_fact + xo));
-+ S_OutNum(self, (float)(self->Clip.rects[i].y * scl_fact + yo));
-+ S_OutNum(self, (float)self->Clip.rects[i].w * scl_fact);
-+ S_OutNum(self, (float)self->Clip.rects[i].h * scl_fact);
- S_OutTok(self, "R", 1);
- }
- S_OutTok(self, "cl n", 1);
-@@ -899,31 +952,35 @@ PsOut_Clip(PsOutPtr self, int clpTyp, Ps
- case PSOUT_POINTS:
- for( k=0 ; k<elm->nPoints ; k++ )
- {
-- S_OutNum(self, (float)elm->c.points[k].x+xo);
-- S_OutNum(self, (float)elm->c.points[k].y+yo);
-+ S_OutNum(self, ((float)elm->c.points[k].x * scl_fact + xo));
-+ S_OutNum(self, ((float)elm->c.points[k].y * scl_fact + yo));
- if( k==0 ) S_OutTok(self, "m", 0);
- else S_OutTok(self, "l", 0);
- }
- S_OutTok(self, "cp", 1);
- break;
- case PSOUT_RECT:
-- S_OutNum(self, (float)elm->c.rect.x+xo);
-- S_OutNum(self, (float)elm->c.rect.y+yo);
-- S_OutNum(self, (float)elm->c.rect.w);
-- S_OutNum(self, (float)elm->c.rect.h);
-+ S_OutNum(self, ((float)elm->c.rect.x * scl_fact + xo));
-+ S_OutNum(self, ((float)elm->c.rect.y * scl_fact + yo));
-+ S_OutNum(self, (float)elm->c.rect.w * scl_fact);
-+ S_OutNum(self, (float)elm->c.rect.h * scl_fact);
- S_OutTok(self, "R", 1);
- break;
- case PSOUT_ARC:
- if( elm->c.arc.style==PsPieSlice )
- {
-- S_OutNum(self, (float)elm->c.arc.x+xo+(float)elm->c.arc.w/2.);
-- S_OutNum(self, (float)elm->c.arc.y+yo+(float)elm->c.arc.h/2.);
-+ S_OutNum(self, ((float)elm->c.arc.x+(float)elm->c.arc.w/2.) *
-+ scl_fact + xo);
-+ S_OutNum(self, ((float)elm->c.arc.y+(float)elm->c.arc.h/2.) *
-+ scl_fact + yo);
- S_OutTok(self, "m", 0);
- }
-- S_OutNum(self, (float)elm->c.arc.x+xo+(float)elm->c.arc.w/2.);
-- S_OutNum(self, (float)elm->c.arc.y+yo+(float)elm->c.arc.h/2.);
-- S_OutNum(self, (float)elm->c.arc.w);
-- S_OutNum(self, (float)elm->c.arc.h);
-+ S_OutNum(self, ((float)elm->c.arc.x+(float)elm->c.arc.w/2.) *
-+ scl_fact + xo);
-+ S_OutNum(self, ((float)elm->c.arc.y+(float)elm->c.arc.h/2.) *
-+ scl_fact + yo);
-+ S_OutNum(self, (float)elm->c.arc.w * scl_fact);
-+ S_OutNum(self, (float)elm->c.arc.h * scl_fact);
- S_OutNum(self, (float)elm->c.arc.a1/64.);
- S_OutNum(self, (float)elm->c.arc.a1/64.+(float)elm->c.arc.a2/64.);
- if( elm->c.arc.a2<0 ) S_OutTok(self, "An cp", 1);
-@@ -1052,13 +1109,18 @@ PsOut_Polygon(PsOutPtr self, int nPts, P
- int i;
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-+
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
- if( nPts<=2 ) return;
- for( i=0 ; i<nPts ; i++ )
- {
-- S_OutNum(self, (float)(pts[i].x+xo));
-- S_OutNum(self, (float)(pts[i].y+yo));
-+ S_OutNum(self, (float)(pts[i].x * scl_fact +xo) );
-+ S_OutNum(self, (float)(pts[i].y * scl_fact +yo) );
- if( i==0 ) S_OutTok(self, "m", 0);
- else S_OutTok(self, "l", 0);
- }
-@@ -1071,13 +1133,18 @@ PsOut_FillRect(PsOutPtr self, int x, int
- {
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-+
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
-- x += xo; y += yo;
-+ x = x * scl_fact + xo; y = y * scl_fact + yo;
- S_OutNum(self, (float)x);
- S_OutNum(self, (float)y);
-- S_OutNum(self, (float)w);
-- S_OutNum(self, (float)h);
-+ S_OutNum(self, (float)w * scl_fact);
-+ S_OutNum(self, (float)h * scl_fact);
- S_OutTok(self, "R fl", 1);
- }
-
-@@ -1087,19 +1154,23 @@ PsOut_FillArc(PsOutPtr self, int x, int
- {
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
- x += xo; y += yo;
- if( style==PsPieSlice )
- {
-- S_OutNum(self, (float)x+(float)w/2.);
-- S_OutNum(self, (float)y+(float)h/2.);
-+ S_OutNum(self, ((float)x+(float)w/2.) * scl_fact + xo);
-+ S_OutNum(self, ((float)y+(float)h/2.) * scl_fact + yo);
- S_OutTok(self, "m", 0);
- }
-- S_OutNum(self, (float)x+(float)w/2.);
-- S_OutNum(self, (float)y+(float)h/2.);
-- S_OutNum(self, (float)w);
-- S_OutNum(self, (float)h);
-+ S_OutNum(self, ((float)x+(float)w/2.) * scl_fact + xo);
-+ S_OutNum(self, ((float)y+(float)h/2.) * scl_fact + yo);
-+ S_OutNum(self, ((float)w) * scl_fact);
-+ S_OutNum(self, ((float)h) * scl_fact);
- S_OutNum(self, ang1);
- S_OutNum(self, ang1+ang2);
- if( ang2<0 ) S_OutTok(self, "An cp fl", 1);
-@@ -1112,13 +1183,18 @@ PsOut_Lines(PsOutPtr self, int nPts, PsP
- int i;
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-+
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
- if( nPts<1 ) return;
- for( i=0 ; i<nPts ; i++ )
- {
-- S_OutNum(self, (float)(pts[i].x+xo));
-- S_OutNum(self, (float)(pts[i].y+yo));
-+ S_OutNum(self, (float)(pts[i].x * scl_fact + xo) );
-+ S_OutNum(self, (float)(pts[i].y * scl_fact + yo) );
- if( i==0 ) S_OutTok(self, "m", 0);
- else S_OutTok(self, "l", 0);
- }
-@@ -1137,13 +1213,17 @@ PsOut_Points(PsOutPtr self, int nPts, Ps
- int i;
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
- if( nPts<1 ) return;
- for( i=0 ; i<nPts ; i++ )
- {
-- S_OutNum(self, (float)(pts[i].x+xo));
-- S_OutNum(self, (float)(pts[i].y+yo));
-+ S_OutNum(self, (float)(pts[i].x * scl_fact + xo) );
-+ S_OutNum(self, (float)(pts[i].y * scl_fact + yo) );
- S_OutTok(self, "P", 1);
- }
- }
-@@ -1153,13 +1233,17 @@ PsOut_DrawRect(PsOutPtr self, int x, int
- {
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
-- x += xo; y += yo;
-+ x = x * scl_fact + xo; y = y * scl_fact + yo;
- S_OutNum(self, (float)x);
- S_OutNum(self, (float)y);
-- S_OutNum(self, (float)w);
-- S_OutNum(self, (float)h);
-+ S_OutNum(self, (float)w * scl_fact);
-+ S_OutNum(self, (float)h * scl_fact);
- S_OutTok(self, "R", 0);
- if( self->LineBClr != PSOUTCOLOR_NOCOLOR )
- {
-@@ -1176,13 +1260,17 @@ PsOut_DrawArc(PsOutPtr self, int x, int
- {
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
-- x += xo; y += yo;
-- S_OutNum(self, (float)x+(float)w/2.);
-- S_OutNum(self, (float)y+(float)h/2.);
-- S_OutNum(self, (float)w);
-- S_OutNum(self, (float)h);
-+ x = x * scl_fact + xo; y = y * scl_fact + yo;
-+ S_OutNum(self, ((float)x+(float)w/2.) );
-+ S_OutNum(self, ((float)y+(float)h/2.) );
-+ S_OutNum(self, (float)w * scl_fact);
-+ S_OutNum(self, (float)h * scl_fact);
- S_OutNum(self, ang1);
- S_OutNum(self, ang1+ang2);
- if( ang2<0 ) S_OutTok(self, "An", 0);
-@@ -1269,7 +1357,7 @@ PsOut_ImageCache(PsOutPtr self, int x, i
- int ib = PSOUTCOLOR_TO_BLUEBITS(bclr);
-
- if( ir==ig && ig==ib )
-- S_OutNum(self, PSOUTCOLOR_BITS_TO_PSFLOAT(ir));
-+ S_OutNum(self, (float)ir/255.);
- else
- S_OutNum(self, (float)0);
- self->RevImage = 1;
-@@ -1281,7 +1369,7 @@ PsOut_ImageCache(PsOutPtr self, int x, i
- int ib = PSOUTCOLOR_TO_BLUEBITS(fclr);
-
- if( ir==ig && ig==ib )
-- S_OutNum(self, PSOUTCOLOR_BITS_TO_PSFLOAT(ir));
-+ S_OutNum(self, (float)ir/255.);
- else
- S_OutNum(self, (float)0);
- }
-@@ -1313,14 +1401,20 @@ PsOut_BeginImage(PsOutPtr self, PsOutCol
- PsOutColor savClr = self->CurColor;
- int xo = self->XOff;
- int yo = self->YOff;
-+ int x1, y1;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-
- if( self->InFrame || self->InTile ) xo = yo = 0;
-+ x1 = x * scl_fact + xo; y1 = y * scl_fact + yo;
- x += xo; y += yo;
- if( self->InTile )
- {
- if( self->InTile>=PsStip && format!=1 ) { self->ImgSkip = 1; return; }
- self->ImgBClr = bclr; self->ImgFClr = fclr;
-- self->ImgX = x; self->ImgY = y;
-+ self->ImgX = x1; self->ImgY = y1;
- self->ImgW = w; self->ImgH = h;
- self->SclW = sw; self->SclH = sh;
- S_OutTok(self, "<", 0);
-@@ -1349,8 +1443,8 @@ PsOut_BeginImage(PsOutPtr self, PsOutCol
- PsOut_Color(self, fclr);
- }
- }
-- S_OutNum(self, (float)x);
-- S_OutNum(self, (float)y);
-+ S_OutNum(self, (float)x1);
-+ S_OutNum(self, (float)y1);
- S_OutNum(self, (float)w);
- S_OutNum(self, (float)h);
- S_OutNum(self, (float)sw);
-@@ -1530,15 +1624,20 @@ PsOut_BeginFrame(PsOutPtr self, int xoff
- {
- int xo = self->XOff;
- int yo = self->YOff;
-+ float scl_fact = 1;
-+
-+ if(self->ClientDpi)
-+ scl_fact = self->ClientDpi->scale_factor;
-+
-
- if( self->InFrame ) xo = yo = 0;
- S_OutTok(self, "gs", 0);
-- S_OutNum(self, (float)(x+xo));
-- S_OutNum(self, (float)(y+yo));
-- S_OutNum(self, (float)w);
-- S_OutNum(self, (float)h);
-+ S_OutNum(self, (float)(x * scl_fact + xo));
-+ S_OutNum(self, (float)(y * scl_fact + yo));
-+ S_OutNum(self, (float)w * scl_fact);
-+ S_OutNum(self, (float)h * scl_fact);
- S_OutTok(self, "R cl n", 0);
-- xoff += xo; yoff += yo;
-+ xoff = xoff * scl_fact + xo; yoff = yoff * scl_fact + yo;
- if( xoff || yoff )
- {
- S_OutNum(self, (float)xoff);
---- hw/xprint/ps/PsText.c 2009-01-09 13:37:05.607251000 -0800
-+++ hw/xprint/ps/PsText.c.new 2009-01-09 13:37:05.621873000 -0800
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -83,6 +112,47 @@ in this Software without prior written a
- #include <X11/fonts/fntfil.h>
- #include <X11/fonts/fntfilst.h>
- #include <limits.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
-+static int readFontName(char *fileName, char *file_name, char *dlfnam)
-+{
-+ FILE *file;
-+ struct stat statb;
-+ int count, i, status;
-+ char buf[256];
-+ char *front, *end, *fn;
-+
-+ file = fopen(fileName, "r");
-+ if(file)
-+ {
-+ if (fstat (fileno(file), &statb) == -1)
-+ return 0;
-+ while(fgets(buf, 255, file))
-+ {
-+ if((fn = strstr(buf, " -")))
-+ {
-+ strcpy(file_name, buf);
-+ file_name[fn - buf - 4] = '\0';
-+ fn++;
-+ if((front = strstr(fn, "normal-")))
-+ {
-+ fn[front - fn] = '\0';
-+ if(strstr(dlfnam, fn))
-+ {
-+ fclose(file);
-+ return 1;
-+ }
-+ }
-+ }
-+ }
-+ }
-+ file_name[0] = '\0';
-+ fclose(file);
-+ return 0;
-+}
-+
-
- int
- PsPolyText8(
-@@ -93,6 +163,8 @@ PsPolyText8(
- int count,
- char *string)
- {
-+ FontPtr useFont;
-+
- if( pDrawable->type==DRAWABLE_PIXMAP )
- {
- DisplayElmPtr elm;
-@@ -185,26 +257,123 @@ PsPolyText8(
-
- return x;
- }
--
-- /* Render glyphs as bitmaps */
-+/* Xprt should support the download Type1 font in PS mode */
-+/* 00308: Bug 4402782: Scale xprt output */
-+ char *fnam, ffname[512], *dlfnam;
-+ FontDirectoryPtr dir;
-+ char file_name[MAXFONTNAMELEN];
-+ XpContextPtr pCon;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-+ int client_x, server_x;
-+
-+ useFont = pGC->font;
-+
-+ pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
- {
-- unsigned long n, i;
-- int w;
-- CharInfoPtr charinfo[255];
-+ scl_fact = pClientDPI->scale_factor;
-
-- GetGlyphs(pGC->font, (unsigned long)count,
-- (unsigned char *)string, Linear8Bit, &n, charinfo);
-- w = 0;
-- for (i=0; i < n; i++)
-- w += charinfo[i]->metrics.characterWidth;
-+ if(scl_fact != 1.0)
-+ {
-+ XpClientDPIGetPos(pClientDPI, &client_x, &server_x);
-+ if(x == client_x && client_x != server_x)
-+ x = server_x;
-+ else
-+ {
-+ client_x = x;
-+ x *= scl_fact;
-+ }
-+ y *= scl_fact;
-
-- if (n != 0)
-- PsPolyGlyphBlt(pDrawable, pGC, x, y, n,
-- charinfo, FONTGLYPHS(pGC->font));
-- x += w;
--
-- return x;
-- }
-+ useFont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-+ }
-+ dir = useFont->fpe->private;
-+ sprintf(ffname, "%s%s", dir->directory,
-+ "fonts.dir");
-+ fnam = PsGetPSFontName(useFont);
-+ if(!fnam){
-+ if(!(dlfnam = PsGetFontName(useFont)))
-+ return x;
-+
-+ /* If Type1 font, try to download to printer first */
-+ if(strstr(ffname, "Type1") && readFontName(ffname, file_name, dlfnam))
-+ {
-+ {
-+ int iso;
-+ int siz;
-+ float mtx[4];
-+ PsOutPtr psOut;
-+ ColormapPtr cMap;
-+
-+ if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE )
-+ return x;
-+ sprintf(ffname, "%s%s%s", dir->directory, file_name, ".pfa");
-+ PsOut_DownloadType1(psOut,"PsPolyText8", file_name, ffname);
-+ PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
-+ PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel));
-+ siz = PsGetFontSize(useFont, mtx);
-+ iso = PsIsISOLatin1Encoding(useFont);
-+ if( !siz ) PsOut_TextAttrsMtx(psOut, file_name, mtx, 1);
-+ else PsOut_TextAttrs(psOut, file_name, siz, 1);
-+ PsOut_Text(psOut, x, y, string, count, -1);
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, -1, -1);
-+ return x;
-+ }
-+ }
-+ {
-+ /* changes for supporting multibytes locales */
-+ unsigned long n, i;
-+ int w;
-+ CharInfoPtr charinfoC[255], charinfoS[255];
-+
-+ GetGlyphs(useFont, (unsigned long)count,
-+ (unsigned char *)string, Linear8Bit,&n, charinfoS);
-+ w = 0;
-+ for (i=0; i < n; i++) w += charinfoS[i]->metrics.characterWidth;
-+ if (n != 0)
-+ PsPolyGlyphBlt(pDrawable, pGC, x, y, n,
-+ charinfoS, FONTGLYPHS(useFont));
-+ x += w;
-+ server_x = x;
-+
-+ if(useFont != pGC->font)
-+ {
-+ GetGlyphs(pGC->font, (unsigned long)count,
-+ (unsigned char *)string, Linear8Bit,&n, charinfoC);
-+ w = 0;
-+ for (i=0; i < n; i++) w += charinfoC[i]->metrics.characterWidth;
-+ client_x += w;
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, client_x, server_x);
-+ }
-+ }
-+ }else{
-+ int iso;
-+ int siz;
-+ float mtx[4];
-+ PsOutPtr psOut;
-+ ColormapPtr cMap;
-+
-+ if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) return x;
-+ PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
-+ PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel));
-+ siz = PsGetFontSize(useFont, mtx);
-+ iso = PsIsISOLatin1Encoding(useFont);
-+ if( !siz ) PsOut_TextAttrsMtx(psOut, fnam, mtx, iso);
-+ else PsOut_TextAttrs(psOut, fnam, siz, iso);
-+ PsOut_Text(psOut, x, y, string, count, -1);
-+/* CRT 00360: Xprt dies with B39 */
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, -1, -1);
-+ }
-+
-+ /* Render glyphs as bitmaps */
- }
- return x;
- }
-@@ -218,6 +387,12 @@ PsPolyText16(
- int count,
- unsigned short *string)
- {
-+
-+/*
-+** Bug 4402782: Scale xprt output
-+*/
-+ FontPtr useFont;
-+
- if( pDrawable->type==DRAWABLE_PIXMAP )
- {
- DisplayElmPtr elm;
-@@ -347,25 +522,67 @@ PsPolyText16(
-
- return x;
- }
--
-- /* Render glyphs as bitmaps */
-+
-+/*
-+** Bug 4402782: Scale xprt output
-+** 4457081: CRT 00360: Xprt dies with B39
-+*/
-+ unsigned long n, i;
-+ int w;
-+ CharInfoPtr charinfoC[255], charinfoS[255]; /* encoding only has 1 byte for
-+count */
-+ XpContextPtr pCon;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-+ int client_x, server_x;
-+
-+ useFont = pGC->font;
-+
-+ pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
- {
-- unsigned long n, i;
-- int w;
-- CharInfoPtr charinfo[255]; /* encoding only has 1 byte for count */
--
-- GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-- (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
-- &n, charinfo);
-- w = 0;
-- for (i=0; i < n; i++)
-- w += charinfo[i]->metrics.characterWidth;
-- if (n != 0)
-- PsPolyGlyphBlt(pDrawable, pGC, x, y, n, charinfo, FONTGLYPHS(pGC->font));
-- x += w;
--
-- return x;
-- }
-+ scl_fact = pClientDPI->scale_factor;
-+
-+ if(scl_fact != 1.0)
-+ {
-+ XpClientDPIGetPos(pClientDPI, &client_x, &server_x);
-+ if(x == client_x && client_x != server_x)
-+ x = server_x;
-+ else
-+ {
-+ client_x = x;
-+ x *= scl_fact;
-+ }
-+ y *= scl_fact;
-+ useFont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-+ }
-+ GetGlyphs(useFont, (unsigned long)count, (unsigned char *)string,
-+ (FONTLASTROW(useFont) == 0) ? Linear16Bit : TwoD16Bit,
-+ &n, charinfoS);
-+ w = 0;
-+ for (i=0; i < n; i++) w += charinfoS[i]->metrics.characterWidth;
-+ if (n != 0)
-+ PsPolyGlyphBlt(pDrawable, pGC, x, y, n, charinfoS, FONTGLYPHS(useFont));
-+ x += w;
-+ server_x = x;
-+
-+ if(useFont != pGC->font)
-+ {
-+ GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-+ (FONTLASTROW(useFont) == 0) ? Linear16Bit : TwoD16Bit,
-+ &n, charinfoC);
-+ w = 0;
-+ for (i=0; i < n; i++) w += charinfoC[i]->metrics.characterWidth;
-+ client_x += w;
-+ if(pClientDPI)
-+ XpClientDPISetPos(pClientDPI, client_x, server_x);
-+ }
-+
-+ /* Render glyphs as bitmaps */
- }
- return x;
- }
-@@ -379,6 +596,12 @@ PsImageText8(
- int count,
- char *string)
- {
-+
-+/*
-+** CRT 00308: Bug 4402782: Scale xprt output
-+*/
-+ FontPtr useFont;
-+
- if( pDrawable->type==DRAWABLE_PIXMAP )
- {
- DisplayElmPtr elm;
-@@ -409,14 +632,33 @@ PsImageText8(
- char *fnam;
- PsOutPtr psOut;
- ColormapPtr cMap;
-+ XpContextPtr pCon;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-+
-+ useFont = pGC->font;
-+
-+ pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ {
-+ scl_fact = pClientDPI->scale_factor;
-+
-+ x *= scl_fact;
-+ y *= scl_fact;
-+ if(scl_fact != 1.0)
-+ useFont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-
- if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) return;
- PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
- PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel));
-- fnam = PsGetPSFontName(pGC->font);
-+ fnam = PsGetPSFontName(useFont);
- if( !fnam ) fnam = "Times-Roman";
-- siz = PsGetFontSize(pGC->font, mtx);
-- iso = PsIsISOLatin1Encoding(pGC->font);
-+ siz = PsGetFontSize(useFont, mtx);
-+ iso = PsIsISOLatin1Encoding(useFont);
- if( !siz ) PsOut_TextAttrsMtx(psOut, fnam, mtx, iso);
- else PsOut_TextAttrs(psOut, fnam, siz, iso);
- PsOut_Text(psOut, x, y, string, count, PsGetPixelColor(cMap, pGC->bgPixel));
-@@ -506,8 +748,24 @@ PsPolyGlyphBlt(
- int nbyPadGlyph; /* server padded line of glyph */
- int w, tmpx;
- XID gcvals[3];
-+ XpContextPtr pCon;
-+ XpClientDPIPtr pClientDPI;
-+ float scl_fact = 1;
-
- pfont = pGC->font;
-+
-+ pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
-+
-+ pClientDPI = XpClientDPIGetRec(pCon);
-+
-+ if(pClientDPI)
-+ {
-+ scl_fact = pClientDPI->scale_factor;
-+
-+ if(scl_fact != 1.0)
-+ pfont = XpClientDPIGrabFont(pClientDPI, pGC->font);
-+ }
-+
- width = FONTMAXBOUNDS(pfont,rightSideBearing) -
- FONTMINBOUNDS(pfont,leftSideBearing);
- height = FONTMAXBOUNDS(pfont,ascent) +
-@@ -567,12 +825,26 @@ PsPolyGlyphBlt(
- *pb++ = *pglyph++;
- pb = pbits;
- }
-+/*
-+** CRT 00308: Bug 4402782: Scale xprt output
-+** BUG: 4402350: Bitmap cache needs to send color along with uid
-+*/
-+
-+ gcvals[0] = GXcopy;
-+ gcvals[1] = pGC->fgPixel;
-+ gcvals[2] = pGC->bgPixel;
-+ DoChangeGC(pGCtmp, GCFunction|GCForeground|GCBackground, gcvals, 0);
-+
-
- PsPutImageMask((DrawablePtr)pDrawable, pGCtmp,
- 1, x + pci->metrics.leftSideBearing,
- y - pci->metrics.ascent, gWidth, gHeight,
- 0, XYBitmap, (char *)pb);
-- }
-+ gcvals[0] = GXcopy;
-+ gcvals[1] = 1;
-+ gcvals[2] = 0;
-+ DoChangeGC(pGCtmp, GCFunction|GCForeground|GCBackground, gcvals, 0);
-+ }
-
- x += pci->metrics.characterWidth;
- }
---- hw/xprint/ps/PsInit.c 2009-01-09 13:37:05.552435000 -0800
-+++ hw/xprint/ps/PsInit.c.new 2009-01-09 13:37:05.570436000 -0800
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -102,9 +131,15 @@ DevPrivateKey PsContextPrivateKey = &PsC
- DevPrivateKey PsPixmapPrivateKey = &PsPixmapPrivateKey;
- DevPrivateKey PsWindowPrivateKey = &PsWindowPrivateKey;
-
-+/*
-+** since Xorg 1.5.3, GlxWrapInitVisuals(procPtr)
-+** had been removed from mi/miinitext.c
-+*/
-+#if 0
- #ifdef GLXEXT
- extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
- #endif /* GLXEXT */
-+#endif
-
- Bool
- InitializePsDriver(ndx, pScreen, argc, argv)
-@@ -446,7 +481,7 @@ InitializePsDriver(ndx, pScreen, argc, a
- /* Defaul visual is 12bit PseudoColor */
- defaultVisual = visuals[defaultVisualIndex].vid;
- rootDepth = visuals[defaultVisualIndex].nplanes;
--
-+#if 0
- #ifdef GLXEXT
- {
- miInitVisualsProcPtr proc = NULL;
-@@ -457,6 +492,7 @@ InitializePsDriver(ndx, pScreen, argc, a
- &rootDepth, &defaultVisual, 0, 0, 0);
- }
- #endif /* GLXEXT */
-+#endif
-
- miScreenInit(pScreen, (pointer)0,
- pScreen->width, pScreen->height,
---- hw/xprint/ps/psout.h 2009-01-10 14:41:21.939445000 -0800
-+++ hw/xprint/ps/psout.h.new 2009-01-10 14:41:21.962349000 -0800
-@@ -1,4 +1,33 @@
- /*
-+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-+ * Use is subject to license terms.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+/*
-
- Copyright 1996, 1998 The Open Group
-
-@@ -81,6 +110,7 @@ in this Software without prior written a
- #define _psout_
-
- #include <stdio.h>
-+#include <X11/extensions/Printstr.h>
-
- typedef enum PsCapEnum_ { PsCButt=0, PsCRound, PsCSquare } PsCapEnum;
- typedef enum PsJoinEnum_ { PsJMiter=0, PsJRound, PsJBevel } PsJoinEnum;
-@@ -253,7 +283,7 @@ typedef struct PsOutRec_
- Bool isRaw;
-
- int pagenum;
--
-+ XpClientDPIPtr ClientDpi;
- int start_image;
- } PsOutRec;
-
--- a/open-src/xserver/xorg/xpstubs.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/xpstubs.patch Fri May 15 09:36:46 2009 -0700
@@ -1,7 +1,7 @@
diff -urp -x '*~' -x '*.orig' dix/Makefile.am dix/Makefile.am
---- dix/Makefile.am 2008-09-23 11:24:56.000000000 -0700
-+++ dix/Makefile.am 2008-09-24 20:26:33.498245000 -0700
-@@ -68,12 +68,12 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
+--- dix/Makefile.am 2008-11-25 22:19:08.000000000 -0800
++++ dix/Makefile.am 2009-01-22 20:36:23.765565000 -0800
+@@ -54,12 +54,12 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
# Generate dtrace object code for probes in libdix
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
--- a/open-src/xserver/xorg/xsync-idletime-counter.patch Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-From ca56d764d2be28c64fe15c9e37d534ef00117ad2 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-Date: Wed, 10 Dec 2008 16:13:20 -0500
-Subject: [PATCH] xsync: Fix wakeup storm in idletime counter.
-
-Wakeup scheduling only considered the threshold values, and not whether
-the trigger was edge or level.
-
-See also:
-https://bugzilla.redhat.com/show_bug.cgi?id=474586
-http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
-(cherry picked from commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5)
----
- Xext/sync.c | 51 +++++++++++++++++++++++++++++++++++++++++----------
- 1 files changed, 41 insertions(+), 10 deletions(-)
-
-diff --git a/Xext/sync.c b/Xext/sync.c
-index 63f6fa2..1b37366 100644
---- a/Xext/sync.c
-+++ b/Xext/sync.c
-@@ -2533,7 +2533,7 @@ SyncInitServerTime(void)
- * IDLETIME implementation
- */
-
--static pointer IdleTimeCounter;
-+static SyncCounter *IdleTimeCounter;
- static XSyncValue *pIdleTimeValueLess;
- static XSyncValue *pIdleTimeValueGreater;
-
-@@ -2545,38 +2545,69 @@ IdleTimeQueryValue (pointer pCounter, CARD64 *pValue_return)
- }
-
- static void
--IdleTimeBlockHandler (pointer env,
-- struct timeval **wt,
-- pointer LastSelectMask)
-+IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
- {
-- XSyncValue idle;
-+ XSyncValue idle, old_idle;
-+ SyncTriggerList *list = IdleTimeCounter->pTriglist;
-+ SyncTrigger *trig;
-
- if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
- return;
-
-+ old_idle = IdleTimeCounter->value;
- IdleTimeQueryValue (NULL, &idle);
-+ IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
-
- if (pIdleTimeValueLess &&
- XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
- {
-- AdjustWaitForDelay (wt, 0);
-+ /*
-+ * We've been idle for less than the threshold value, and someone
-+ * wants to know about that, but now we need to know whether they
-+ * want level or edge trigger. Check the trigger list against the
-+ * current idle time, and if any succeed, bomb out of select()
-+ * immediately so we can reschedule.
-+ */
-+
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ AdjustWaitForDelay(wt, 0);
-+ break;
-+ }
-+ }
- }
- else if (pIdleTimeValueGreater)
- {
-- unsigned long timeout = 0;
-+ /*
-+ * There's a threshold in the positive direction. If we've been
-+ * idle less than it, schedule a wakeup for sometime in the future.
-+ * If we've been idle more than it, and someone wants to know about
-+ * that level-triggered, schedule an immediate wakeup.
-+ */
-+ unsigned long timeout = -1;
-
-- if (XSyncValueLessThan (idle, *pIdleTimeValueGreater))
-- {
-+ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
- XSyncValue value;
- Bool overflow;
-
- XSyncValueSubtract (&value, *pIdleTimeValueGreater,
- idle, &overflow);
-- timeout = XSyncValueLow32 (value);
-+ timeout = min(timeout, XSyncValueLow32 (value));
-+ } else {
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ timeout = min(timeout, 0);
-+ break;
-+ }
-+ }
- }
-
- AdjustWaitForDelay (wt, timeout);
- }
-+
-+ IdleTimeCounter->value = old_idle; /* pop */
- }
-
- static void
---
-1.5.6.5
-
--- a/open-src/xserver/xorg/xtsol.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xorg/xtsol.patch Fri May 15 09:36:46 2009 -0700
@@ -26,10 +26,75 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
+diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
+--- Makefile.am 2009-05-08 17:43:31.905647000 -0700
++++ Makefile.am 2009-05-08 17:43:40.080197000 -0700
+@@ -17,6 +17,10 @@ if RECORD
+ RECORD_DIR=record
+ endif
+
++if BUILD_TSOL_MODULE
++TSOL_DIR=tsol
++endif
++
+ SUBDIRS = \
+ doc \
+ include \
+@@ -37,6 +41,7 @@ SUBDIRS = \
+ $(COMPOSITE_DIR) \
+ $(GLX_DIR) \
+ IA \
++ $(TSOL_DIR) \
+ exa \
+ config \
+ hw
+diff -urp -x '*~' -x '*.orig' Xext/security.c Xext/security.c
+--- Xext/security.c 2009-05-08 17:43:31.396504000 -0700
++++ Xext/security.c 2009-05-08 17:43:40.081858000 -0700
+@@ -1148,3 +1148,27 @@ SecurityExtensionInit(INITARGS)
+ /* Label objects that were created before we could register ourself */
+ SecurityLabelInitial();
+ }
++
++/* API needed for Xtsol module to get/set client trustLevel */
++_X_EXPORT unsigned int
++getClientTrustLevel(ClientPtr client)
++{
++ SecurityStateRec *state;
++
++ state = dixLookupPrivate(&client->devPrivates, stateKey);
++
++ return state->trustLevel;
++}
++
++_X_EXPORT unsigned int
++setClientTrustLevel(ClientPtr client, unsigned int newLevel)
++{
++ SecurityStateRec *state;
++ unsigned int oldLevel;
++
++ state = dixLookupPrivate(&client->devPrivates, stateKey);
++ oldLevel = state->trustLevel;
++ state->trustLevel = newLevel;
++
++ return oldLevel;
++}
+diff -urp -x '*~' -x '*.orig' Xext/securitysrv.h Xext/securitysrv.h
+--- Xext/securitysrv.h 2008-01-04 14:42:34.000000000 -0800
++++ Xext/securitysrv.h 2009-05-08 17:43:40.083180000 -0700
+@@ -80,4 +80,8 @@ typedef struct {
+ /* Give this value or higher to the -audit option to get security messages */
+ #define SECURITY_AUDIT_LEVEL 4
+
++/* API needed for Xtsol module to get/set client trustLevel */
++extern unsigned int getClientTrustLevel(ClientPtr client);
++extern unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
++
+ #endif /* _SECURITY_SRV_H */
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2009-02-03 09:47:56.420266000 -0800
-+++ configure.ac 2009-02-03 09:48:35.183214000 -0800
-@@ -216,6 +216,14 @@ dnl Find the math libary
+--- configure.ac 2009-05-08 17:43:31.908445000 -0700
++++ configure.ac 2009-05-08 17:43:40.087326000 -0700
+@@ -207,6 +207,14 @@ dnl Find the math libary
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
@@ -44,49 +109,38 @@
AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
dnl AGPGART headers
-@@ -1286,8 +1294,8 @@ AC_MSG_RESULT([$XVFB])
+@@ -1255,8 +1263,8 @@ AC_MSG_RESULT([$XVFB])
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then
-- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB"
-- XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
-+ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $TSOL_LIB"
-+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $TSOL_SYS_LIBS"
+- XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB"
+- XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
++ XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB $TSOL_LIB"
++ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS $TSOL_SYS_LIBS"
AC_SUBST([XVFB_LIBS])
AC_SUBST([XVFB_SYS_LIBS])
fi
-@@ -1304,8 +1312,8 @@ AC_MSG_RESULT([$XNEST])
+@@ -1273,8 +1281,8 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
-- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
-- XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
-+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB $TSOL_LIB"
-+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $TSOL_SYS_LIBS"
+- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
+- XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
++ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB $TSOL_LIB"
++ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS $TSOL_SYS_LIBS"
AC_SUBST([XNEST_LIBS])
AC_SUBST([XNEST_SYS_LIBS])
fi
-@@ -1658,8 +1666,8 @@ AC_MSG_RESULT([$XPRINT])
- if test "x$XPRINT" = xyes; then
- PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES xau])
- XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS -DXPRINT"
-- XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB"
-- XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
-+ XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB $TSOL_LIB"
-+ XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS $TSOL_SYS_LIBS"
-
- xpconfigdir=$libdir/X11/xserver
- AC_SUBST([xpconfigdir])
-@@ -2014,7 +2022,7 @@ if test "$KDRIVE" = yes; then
+@@ -1776,7 +1784,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
-- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $OS_LIB"
-+ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $IA_LIB $TSOL_LIB $OS_LIB"
+- KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB $OS_LIB"
++ KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB $TSOL_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
case $host_os in
*linux*)
-@@ -2299,3 +2307,6 @@ xorg-server.pc
+@@ -1936,3 +1944,6 @@ xorg-server.pc
# Add Sun IA extension
AC_OUTPUT([IA/Makefile])
@@ -94,8 +148,8 @@
+# Add Sun Trusted Extensions extension
+AC_OUTPUT([tsol/Makefile])
diff -urp -x '*~' -x '*.orig' dix/dispatch.c dix/dispatch.c
---- dix/dispatch.c 2008-11-05 08:52:17.000000000 -0800
-+++ dix/dispatch.c 2009-02-03 09:48:35.185378000 -0800
+--- dix/dispatch.c 2009-05-08 17:43:31.282930000 -0700
++++ dix/dispatch.c 2009-05-08 17:43:40.089486000 -0700
@@ -74,8 +74,8 @@ Equipment Corporation.
******************************************************************/
@@ -107,7 +161,7 @@
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
-@@ -177,6 +177,10 @@ extern int connBlockScreenStart;
+@@ -173,6 +173,10 @@ extern int connBlockScreenStart;
static void KillAllClients(void);
@@ -118,7 +172,7 @@
static int nextFreeClientID; /* always MIN free client ID */
static int nClients; /* number of authorized clients */
-@@ -789,7 +793,12 @@ ProcCirculateWindow(ClientPtr client)
+@@ -767,7 +771,12 @@ ProcCirculateWindow(ClientPtr client)
return(client->noClientException);
}
@@ -132,7 +186,7 @@
GetGeometry(ClientPtr client, xGetGeometryReply *rep)
{
DrawablePtr pDraw;
-@@ -1927,7 +1936,12 @@ ProcPutImage(ClientPtr client)
+@@ -1901,7 +1910,12 @@ ProcPutImage(ClientPtr client)
return (client->noClientException);
}
@@ -147,8 +201,8 @@
int x, int y, int width, int height,
Mask planemask, xGetImageReply **im_return)
diff -urp -x '*~' -x '*.orig' dix/events.c dix/events.c
---- dix/events.c 2008-11-05 08:52:17.000000000 -0800
-+++ dix/events.c 2009-02-03 09:48:35.187905000 -0800
+--- dix/events.c 2009-04-14 10:14:56.000000000 -0700
++++ dix/events.c 2009-05-08 17:43:40.092405000 -0700
@@ -76,7 +76,7 @@ Equipment Corporation.
/*****************************************************************
@@ -158,9 +212,9 @@
All rights reserved.
-@@ -299,7 +299,12 @@ static void DoEnterLeaveEvents(
- int mode
- );
+@@ -328,7 +328,12 @@ IsKeyboardDevice(DeviceIntPtr dev)
+ return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev);
+ }
-static WindowPtr XYToWindow(
+#ifdef TSOL
@@ -169,26 +223,26 @@
+static
+#endif
+WindowPtr XYToWindow(
+ DeviceIntPtr pDev,
int x,
int y
- );
-@@ -2142,7 +2147,12 @@ PointInBorderSize(WindowPtr pWin, int x,
+@@ -2477,7 +2482,12 @@ PointInBorderSize(WindowPtr pWin, int x,
*
* @returns the window at the given coordinates.
*/
--static WindowPtr
+-static WindowPtr
+#ifdef TSOL
+_X_EXPORT
+#else
+static
+#endif
-+WindowPtr
- XYToWindow(int x, int y)
++WindowPtr
+ XYToWindow(DeviceIntPtr pDev, int x, int y)
{
WindowPtr pWin;
diff -urp -x '*~' -x '*.orig' dix/window.c dix/window.c
---- dix/window.c 2008-11-05 08:52:17.000000000 -0800
-+++ dix/window.c 2009-02-03 09:48:35.190851000 -0800
+--- dix/window.c 2009-04-14 10:14:56.000000000 -0700
++++ dix/window.c 2009-05-08 17:43:40.094539000 -0700
@@ -98,6 +98,33 @@ Equipment Corporation.
******************************************************************/
@@ -223,9 +277,9 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-@@ -172,6 +199,11 @@ static Bool TileScreenSaver(int i, int k
- _X_EXPORT int numSaveUndersViewable = 0;
- _X_EXPORT int deltaSaveUndersViewable = 0;
+@@ -180,6 +207,11 @@ static Bool TileScreenSaver(int i, int k
+
+ #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
+#ifdef TSOL
+#include "extnsionst.h"
@@ -235,7 +289,7 @@
#ifdef DEBUG
/******
* PrintWindowTree
-@@ -1915,7 +1952,12 @@ IsSiblingAboveMe(
+@@ -1881,7 +1913,12 @@ IsSiblingAboveMe(
return(Below);
}
@@ -249,7 +303,7 @@
WindowExtents(
WindowPtr pWin,
BoxPtr pBox)
-@@ -1952,7 +1994,12 @@ MakeBoundingRegion (
+@@ -1917,7 +1954,12 @@ MakeBoundingRegion (
return pRgn;
}
@@ -263,7 +317,7 @@
ShapeOverlap (
WindowPtr pWin,
BoxPtr pWinBox,
-@@ -2161,7 +2208,12 @@ WhereDoIGoInTheStack(
+@@ -2121,7 +2163,12 @@ WhereDoIGoInTheStack(
}
}
@@ -278,8 +332,8 @@
WindowPtr pWin,
WindowPtr pSib,
diff -urp -x '*~' -x '*.orig' hw/dmx/Makefile.am hw/dmx/Makefile.am
---- hw/dmx/Makefile.am 2009-02-03 09:47:56.420979000 -0800
-+++ hw/dmx/Makefile.am 2009-02-03 09:48:35.191483000 -0800
+--- hw/dmx/Makefile.am 2009-05-08 17:43:31.909047000 -0700
++++ hw/dmx/Makefile.am 2009-05-08 17:43:40.095075000 -0700
@@ -87,6 +87,7 @@ XDMX_LIBS = \
input/libdmxinput.a \
config/libdmxconfig.a \
@@ -289,9 +343,9 @@
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2009-02-03 09:47:56.422154000 -0800
-+++ hw/xfree86/common/xf86Config.c 2009-02-03 09:48:35.192765000 -0800
-@@ -127,6 +127,7 @@ static ModuleDefault ModuleDefaults[] =
+--- hw/xfree86/common/xf86Config.c 2009-05-08 17:43:31.911031000 -0700
++++ hw/xfree86/common/xf86Config.c 2009-05-08 17:43:40.153291000 -0700
+@@ -122,6 +122,7 @@ static ModuleDefault ModuleDefaults[] =
{.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
#endif
{.name = "ia", .toLoad = TRUE, .load_opt=NULL},
@@ -300,9 +354,9 @@
};
diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
---- hw/xfree86/dixmods/Makefile.am 2009-02-03 09:47:56.422734000 -0800
-+++ hw/xfree86/dixmods/Makefile.am 2009-02-03 09:48:35.250342000 -0800
-@@ -119,3 +119,11 @@ extsmodule_LTLIBRARIES += libia.la
+--- hw/xfree86/dixmods/Makefile.am 2009-05-08 17:43:31.912778000 -0700
++++ hw/xfree86/dixmods/Makefile.am 2009-05-08 17:43:40.161877000 -0700
+@@ -73,3 +73,11 @@ extsmodule_LTLIBRARIES += libia.la
libia_la_LDFLAGS = -avoid-version
libia_la_LIBADD = $(top_builddir)/IA/libIA.la
libia_la_SOURCES = iamodule.c
@@ -315,11 +369,11 @@
+libxtsol_la_SOURCES = tsolmodule.c
+endif
diff -urp -x '*~' -x '*.orig' include/dix.h include/dix.h
---- include/dix.h 2008-11-05 08:52:17.000000000 -0800
-+++ include/dix.h 2009-02-03 09:48:35.468585000 -0800
-@@ -173,6 +173,14 @@ extern void MarkClientException(
+--- include/dix.h 2009-05-08 17:43:31.316827000 -0700
++++ include/dix.h 2009-05-08 17:43:40.162550000 -0700
+@@ -171,6 +171,14 @@ extern void MarkClientException(
+
extern void ddxBeforeReset (void);
- #endif
+#ifdef TSOL
+extern int DoGetImage(ClientPtr client, int format, Drawable drawable,
@@ -333,20 +387,20 @@
extern void CopyISOLatin1Lowered(
diff -urp -x '*~' -x '*.orig' include/dixevents.h include/dixevents.h
---- include/dixevents.h 2008-11-05 08:52:17.000000000 -0800
-+++ include/dixevents.h 2009-02-03 09:48:35.470450000 -0800
-@@ -84,4 +84,8 @@ extern int ProcRecolorCursor(ClientPtr /
- extern void PostSyntheticMotion(int x, int y, int screen, unsigned long time);
+--- include/dixevents.h 2009-04-14 10:14:57.000000000 -0700
++++ include/dixevents.h 2009-05-08 17:43:40.163000000 -0700
+@@ -88,4 +88,8 @@ extern void PostSyntheticMotion(DeviceIn
+ unsigned long time);
#endif
+#ifdef TSOL
-+extern WindowPtr XYToWindow(int x, int y);
++extern WindowPtr XYToWindow(DeviceIntPtr pDev, int x, int y);
+#endif
+
#endif /* DIXEVENTS_H */
diff -urp -x '*~' -x '*.orig' include/extnsionst.h include/extnsionst.h
---- include/extnsionst.h 2008-10-02 14:01:26.000000000 -0700
-+++ include/extnsionst.h 2009-02-03 09:48:35.268955000 -0800
+--- include/extnsionst.h 2009-04-14 10:14:57.000000000 -0700
++++ include/extnsionst.h 2009-05-08 17:43:40.164856000 -0700
@@ -45,6 +45,34 @@ SOFTWARE.
******************************************************************/
@@ -416,9 +470,9 @@
#endif /* EXTENSIONSTRUCT_H */
diff -urp -x '*~' -x '*.orig' include/window.h include/window.h
---- include/window.h 2008-11-05 08:52:17.000000000 -0800
-+++ include/window.h 2009-02-03 09:48:35.510644000 -0800
-@@ -256,4 +256,9 @@ extern void DisableMapUnmapEvents(
+--- include/window.h 2009-04-14 10:14:57.000000000 -0700
++++ include/window.h 2009-05-08 17:43:40.165637000 -0700
+@@ -269,4 +269,9 @@ extern void DisableMapUnmapEvents(
extern void EnableMapUnmapEvents(
WindowPtr /* pWin */ );
@@ -428,43 +482,10 @@
+#endif
+
#endif /* WINDOW_H */
-diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2009-02-03 09:47:56.423083000 -0800
-+++ Makefile.am 2009-02-03 09:48:35.311648000 -0800
-@@ -34,6 +34,10 @@ if RECORD
- RECORD_DIR=record
- endif
-
-+if BUILD_TSOL_MODULE
-+TSOL_DIR=tsol
-+endif
-+
- SUBDIRS = \
- doc \
- include \
-@@ -59,6 +63,7 @@ SUBDIRS = \
- $(COMPOSITE_DIR) \
- $(GLX_DIR) \
- IA \
-+ $(TSOL_DIR) \
- exa \
- config \
- hw
diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
---- mi/miinitext.c 2009-02-03 09:47:56.423822000 -0800
-+++ mi/miinitext.c 2009-02-03 09:48:35.324055000 -0800
-@@ -86,6 +86,10 @@ SOFTWARE.
-
- #define SolarisIAExtension
-
-+#ifdef TSOL /* Maintaining binary compatibility with Xtsol module */
-+#include "extnsionst.h"
-+#endif
-+
- #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
- #undef GLXEXT
- #endif
-@@ -227,6 +231,9 @@ extern Bool noXvExtension;
+--- mi/miinitext.c 2009-05-08 17:43:31.913906000 -0700
++++ mi/miinitext.c 2009-05-08 17:43:40.166609000 -0700
+@@ -155,6 +155,9 @@ extern Bool noGEExtension;
#ifdef SolarisIAExtension
Bool noIAExtension;
#endif
@@ -474,7 +495,7 @@
#ifndef XFree86LOADER
#define INITARGS void
-@@ -272,6 +279,10 @@ typedef void (*InitExtension)(INITARGS);
+@@ -193,6 +196,10 @@ typedef void (*InitExtension)(INITARGS);
#ifdef SolarisIAExtension
#include <X11/extensions/interactive.h>
#endif
@@ -484,8 +505,8 @@
+#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
- #ifdef EVI
-@@ -398,6 +409,9 @@ extern void CompositeExtensionInit(INITA
+ #ifdef MITSHM
+@@ -282,6 +289,9 @@ extern void GEExtensionInit(INITARGS);
#ifdef SolarisIAExtension
extern void IAExtensionInit(void);
#endif
@@ -495,17 +516,17 @@
/* The following is only a small first step towards run-time
* configurable extensions.
-@@ -458,6 +472,9 @@ static ExtensionToggle ExtensionToggleLi
- #ifdef XCSECURITY
- { "SECURITY", &noSecurityExtension },
- #endif
+@@ -331,6 +341,9 @@ static ExtensionToggle ExtensionToggleLi
+ #ifdef SolarisIAExtension
+ { IANAME /* "SolarisIA" */, &noIAExtension },
+ #endif
+#ifdef TSOL
+ { TSOLNAME /* "SUN_TSOL" */, &noXTSolExtension },
+#endif
- #ifdef XSYNC
- { "SYNC", &noSyncExtension },
+ #ifdef RES
+ { "X-Resource", &noResExtension },
#endif
-@@ -682,6 +699,11 @@ InitExtensions(argc, argv)
+@@ -493,6 +506,11 @@ InitExtensions(int argc, char *argv[])
#ifdef SolarisIAExtension
if (!noIAExtension) IAExtensionInit();
#endif
@@ -516,10 +537,10 @@
+#endif
}
- void
+ #else /* XFree86LOADER */
diff -urp -x '*~' -x '*.orig' os/connection.c os/connection.c
---- os/connection.c 2009-02-03 09:47:56.372418000 -0800
-+++ os/connection.c 2009-02-03 09:48:35.325140000 -0800
+--- os/connection.c 2009-05-08 17:43:31.889578000 -0700
++++ os/connection.c 2009-05-08 17:43:40.167673000 -0700
@@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE
SOFTWARE.
@@ -554,7 +575,7 @@
/*****************************************************************
* Stuff to create connections --- OS dependent
*
-@@ -298,6 +325,11 @@ static int ListenTransCount;
+@@ -261,6 +288,11 @@ static int ListenTransCount;
static void ErrorConnMax(XtransConnInfo /* trans_conn */);
@@ -566,9 +587,9 @@
static XtransConnInfo
lookup_trans_conn (int fd)
{
-@@ -721,6 +753,12 @@ ClientAuthorized(ClientPtr client,
- !strncmp(saddr->sa_data, "/tmp/launch", 11)) goto done;
- #endif
+@@ -671,6 +703,12 @@ ClientAuthorized(ClientPtr client,
+ priv = (OsCommPtr)client->osPrivate;
+ trans_conn = priv->trans_conn;
+#ifdef TSOL
+ if (pSecHook)
@@ -576,49 +597,6 @@
+ string_n, auth_string, client, &reason);
+ else
+#endif /* TSOL */
- auth_id = CheckAuthorization (proto_n, auth_proto,
- string_n, auth_string, client, &reason);
-
-diff -urp -x '*~' -x '*.orig' Xext/security.c Xext/security.c
---- Xext/security.c 2009-02-03 09:47:54.475192000 -0800
-+++ Xext/security.c 2009-02-03 09:48:35.326019000 -0800
-@@ -1148,3 +1148,27 @@ SecurityExtensionInit(INITARGS)
- /* Label objects that were created before we could register ourself */
- SecurityLabelInitial();
- }
-+
-+/* API needed for Xtsol module to get/set client trustLevel */
-+_X_EXPORT unsigned int
-+getClientTrustLevel(ClientPtr client)
-+{
-+ SecurityStateRec *state;
-+
-+ state = dixLookupPrivate(&client->devPrivates, stateKey);
-+
-+ return state->trustLevel;
-+}
-+
-+_X_EXPORT unsigned int
-+setClientTrustLevel(ClientPtr client, unsigned int newLevel)
-+{
-+ SecurityStateRec *state;
-+ unsigned int oldLevel;
-+
-+ state = dixLookupPrivate(&client->devPrivates, stateKey);
-+ oldLevel = state->trustLevel;
-+ state->trustLevel = newLevel;
-+
-+ return oldLevel;
-+}
-diff -urp -x '*~' -x '*.orig' Xext/securitysrv.h Xext/securitysrv.h
---- Xext/securitysrv.h 2008-01-04 14:42:34.000000000 -0800
-+++ Xext/securitysrv.h 2009-02-03 09:48:35.410279000 -0800
-@@ -80,4 +80,8 @@ typedef struct {
- /* Give this value or higher to the -audit option to get security messages */
- #define SECURITY_AUDIT_LEVEL 4
-
-+/* API needed for Xtsol module to get/set client trustLevel */
-+extern unsigned int getClientTrustLevel(ClientPtr client);
-+extern unsigned int setClientTrustLevel(ClientPtr client, unsigned int newLevel);
-+
- #endif /* _SECURITY_SRV_H */
+ /* Allow any client to connect without authorization on a launchd socket,
+ because it is securely created -- this prevents a race condition on launch */
+ if(trans_conn->flags & TRANS_NOXAUTH) {
--- a/open-src/xserver/xvnc/Makefile Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xvnc/Makefile Fri May 15 09:36:46 2009 -0700
@@ -32,7 +32,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.18 09/04/26
+# @(#)Makefile 1.19 09/05/15
#
# Package name used in tarballs
@@ -84,6 +84,7 @@
vnc-includes.patch,-p1 \
vnc-viewerIPv6.patch,-p1 \
vnc-fasterPrivates.patch \
+ vnc-input-1.6.patch \
c++public.patch \
solaris-port.patch
--- a/open-src/xserver/xvnc/vnc-fasterPrivates.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xvnc/vnc-fasterPrivates.patch Fri May 15 09:36:46 2009 -0700
@@ -1,16 +1,18 @@
-Make Xvnc build after applying ../xorg/faster-devPrivates.patch
-which changes the type of DevPrivateKey.
+Make Xvnc work with new Xorg 1.6 faster rework of devPrivates, which stores
+an index in the address pointed to by the key.
--- unix/xc/programs/Xserver/vnc/vncHooks.cc 2008-10-08 08:21:12.289265000 -0700
+++ unix/xc/programs/Xserver/vnc/vncHooks.cc 2008-10-08 08:20:15.523901000 -0700
-@@ -90,8 +90,8 @@
+@@ -90,8 +90,10 @@
GCOps *wrappedOps;
} vncHooksGCRec, *vncHooksGCPtr;
-static DevPrivateKey vncHooksScrPrivateKey = &vncHooksScrPrivateKey;
-static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey;
-+static DevPrivateKey vncHooksScrPrivateKey = (DevPrivateKey) &vncHooksScrPrivateKey;
-+static DevPrivateKey vncHooksGCPrivateKey = (DevPrivateKey) &vncHooksGCPrivateKey;
++static int vncHooksScrPrivateKeyIndex;
++static int vncHooksGCPrivateKeyIndex;
++static DevPrivateKey vncHooksScrPrivateKey = &vncHooksScrPrivateKeyIndex;
++static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKeyIndex;
#define vncHooksScreenPrivate(scrn) \
(vncHooksScreenPtr) dixLookupPrivate (&(scrn)->devPrivates, \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/vnc-input-1.6.patch Fri May 15 09:36:46 2009 -0700
@@ -0,0 +1,272 @@
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+Changes to Xvnc DDX layer to match Xorg 1.6 input device/events API changes
+
+Includes fix contributed by J�rgen Keil <[email protected]> for
+OpenSolaris Bug #8687: german keyboard layout: umlaut keys not accepted by Xvnc
+http://defect.opensolaris.org/bz/show_bug.cgi?id=8687
+
+diff -urp -x '*~' -x '*.orig' unix/xc/programs/Xserver/vnc/XserverDesktop.cc unix/xc/programs/Xserver/vnc/XserverDesktop.cc
+--- unix/xc/programs/Xserver/vnc/XserverDesktop.cc 2009-04-27 09:17:40.198280000 -0700
++++ unix/xc/programs/Xserver/vnc/XserverDesktop.cc 2009-04-27 09:16:54.127059000 -0700
+@@ -40,9 +40,8 @@ extern "C" {
+ #define public c_public
+ #define class c_class
+
+- // windowTable is in globals.h in XFree 4, but not in XFree 3 unfortunately
+-extern WindowPtr *WindowTable;
+-extern char *display;
++#include "globals.h" // extern WindowPtr *WindowTable;
++#include "opaque.h" // extern char *display;
+
+ #include "inputstr.h"
+ #include "servermd.h"
+@@ -57,7 +56,7 @@ extern char *display;
+ #undef class
+ }
+
+-static xEvent *eventq = NULL;
++static EventList *eventq = NULL;
+ static DeviceIntPtr vncKeyboard = NULL;
+ static DeviceIntPtr vncMouse = NULL;
+
+@@ -213,16 +212,16 @@ XserverDesktop::XserverDesktop(ScreenPtr
+
+ // XXX Memory leak here, eventq is not free()-d because it has to exist till server exits
+ if (!eventq)
+- eventq = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum());
++ eventq = InitEventList(GetMaximumEventsNum());
+ if (!eventq)
+ FatalError("couldn't allocate room for events\n");
+
+ if (vncMouse == NULL) {
+- vncMouse = AddInputDevice(vfbMouseProc, TRUE);
++ vncMouse = AddInputDevice(serverClient, vfbMouseProc, TRUE);
+ RegisterPointerDevice (vncMouse);
+ }
+ if (vncKeyboard == NULL) {
+- vncKeyboard = AddInputDevice(vfbKeybdProc, TRUE);
++ vncKeyboard = AddInputDevice(serverClient, vfbKeybdProc, TRUE);
+ RegisterKeyboardDevice (vncKeyboard);
+ }
+ }
+@@ -531,10 +530,10 @@ void XserverDesktop::positionCursor()
+ void XserverDesktop::blockHandler(fd_set* fds)
+ {
+ try {
+- ScreenPtr screenWithCursor = GetCurrentRootWindow()->drawable.pScreen;
++ ScreenPtr screenWithCursor = GetCurrentRootWindow(vncMouse)->drawable.pScreen;
+ if (screenWithCursor == pScreen) {
+ int x, y;
+- GetSpritePosition(&x, &y);
++ GetSpritePosition(vncMouse, &x, &y);
+ if (x != cursorPos.x || y != cursorPos.y) {
+ cursorPos = oldCursorPos = Point(x, y);
+ server->setCursorPos(cursorPos);
+@@ -695,15 +694,16 @@ void XserverDesktop::pointerEvent(const
+ // end of processing a load of RFB.
+ //(*pScreen->SetCursorPosition) (pScreen, pos.x, pos.y, FALSE);
+
+- NewCurrentScreen(pScreen, pos.x, pos.y);
++ NewCurrentScreen(vncMouse, pScreen, pos.x, pos.y);
+
+ if (!pos.equals(cursorPos)) {
+ valuators[0] = pos.x;
+ valuators[1] = pos.y;
++ GetEventList(&eventq);
+ n = GetPointerEvents (eventq, vncMouse, MotionNotify, 0,
+ POINTER_ABSOLUTE, 0, 2, valuators);
+ for (i = 0; i < n; i++)
+- mieqEnqueue (vncMouse, eventq + i);
++ mieqEnqueue (vncMouse, eventq[i].event);
+ }
+
+ for (int i = 0; i < 5; i++) {
+@@ -720,7 +719,7 @@ void XserverDesktop::pointerEvent(const
+ ButtonPress : ButtonRelease,
+ detail, POINTER_RELATIVE, 0, 0, NULL);
+ for (j = 0; j < n; j++)
+- mieqEnqueue (vncMouse, eventq + j);
++ mieqEnqueue (vncMouse, eventq[j].event);
+ }
+ }
+
+@@ -842,7 +841,7 @@ private:
+ n = GetKeyboardEvents (eventq, vncKeyboard,
+ down ? KeyPress : KeyRelease, keycode);
+ for (i = 0; i < n; i++)
+- mieqEnqueue (vncKeyboard, eventq + i);
++ mieqEnqueue (vncKeyboard, eventq[i].event);
+ vlog.debug("fake keycode %d %s", keycode, down ? "down" : "up");
+ }
+ int modIndex;
+@@ -917,6 +917,6 @@
+ vlog.debug("Ignoring caps lock");
+ return;
+ }
+- KeyClassPtr keyc = vncKeyboard->key;
++ KeyClassPtr keyc = inputInfo.keyboard->key;
+ KeySymsPtr keymap = &keyc->curKeySyms;
+ int i, j, k, n;
+@@ -970,7 +969,7 @@ void XserverDesktop::keyEvent(rdr::U32 k
+ if (!keymap->map[(kc - keymap->minKeyCode) * keymap->mapWidth]) {
+ keymap->map[(kc - keymap->minKeyCode) * keymap->mapWidth] = keysym;
+ col = 0;
+- SendMappingNotify(MappingKeyboard, kc, 1, serverClient);
++ SendMappingNotify(vncKeyboard, MappingKeyboard, kc, 1, serverClient);
+ vlog.info("Added unknown keysym 0x%x to keycode %d",keysym,kc);
+ break;
+ }
+@@ -1009,7 +1008,7 @@ void XserverDesktop::keyEvent(rdr::U32 k
+ n = GetKeyboardEvents (eventq, vncKeyboard, down ? KeyPress : KeyRelease,
+ kc);
+ for (i = 0; i < n; i++)
+- mieqEnqueue (vncKeyboard, eventq + i);
++ mieqEnqueue (vncKeyboard, eventq[i].event);
+ }
+
+
+@@ -1366,7 +1365,7 @@ static int vfbMouseProc(DeviceIntPtr pDe
+ map[3] = 3;
+ map[4] = 4;
+ map[5] = 5;
+- InitPointerDeviceStruct(&pDev->c_public, map, 5, GetMotionHistory,
++ InitPointerDeviceStruct(&pDev->c_public, map, 5,
+ (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2);
+ break;
+
+diff -urp -x '*~' -x '*.orig' unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+--- unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2009-04-27 09:17:40.199148000 -0700
++++ unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2009-04-27 09:16:54.127984000 -0700
+@@ -235,7 +235,6 @@
+ "Parameter names are case-insensitive. The parameters are:\n\n");
+ rfb::Configuration::listParams(79, 14);
+ }
+-}
+
+ static bool displayNumFree(int num)
+ {
+@@ -720,21 +720,30 @@ static Bool vfbCursorOffScreen(ScreenPtr
+ return FALSE;
+ }
+ static void vfbCrossScreen (ScreenPtr pScreen, Bool entering) {}
+-static Bool vfbRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) {
++static Bool vfbRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
++ CursorPtr pCursor) {
+ return TRUE;
+ }
+-static Bool vfbUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) {
++static Bool vfbUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
++ CursorPtr pCursor) {
+ return TRUE;
+ }
+-static void vfbSetCursor(ScreenPtr pScreen, CursorPtr pCursor,
++static void vfbSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
+ int x, int y) {}
+-static void vfbMoveCursor(ScreenPtr pScreen, int x, int y) {}
++static void vfbMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) {}
+
++static Bool vfbDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) {
++ return TRUE;
++}
++static void vfbDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) {}
++
+ static miPointerSpriteFuncRec vfbPointerSpriteFuncs = {
+ vfbRealizeCursor,
+ vfbUnrealizeCursor,
+ vfbSetCursor,
+- vfbMoveCursor
++ vfbMoveCursor,
++ vfbDeviceCursorInitialize,
++ vfbDeviceCursorCleanup
+ };
+
+ static miPointerScreenFuncRec vfbPointerScreenFuncs = {
+@@ -935,7 +937,6 @@ Bool LegalModifier(unsigned int key, Dev
+ void ProcessInputEvents()
+ {
+ mieqProcessInputEvents();
+- miPointerUpdate();
+ }
+
+ void DDXRingBell(int percent, int pitch, int duration)
+@@ -950,3 +956,5 @@
+ {
+ mieqInit ();
+ }
++
++} // extern "C"
+
+diff -urp -x '*~' -x '*.orig' unix/xc/programs/Xserver/vnc/vncHooks.cc unix/xc/programs/Xserver/vnc/vncHooks.cc
+--- unix/xc/programs/Xserver/vnc/vncHooks.cc 2009-04-27 09:17:40.232606000 -0700
++++ unix/xc/programs/Xserver/vnc/vncHooks.cc 2009-04-27 09:16:54.124221000 -0700
+@@ -27,6 +27,7 @@
+ extern "C" {
+ #define class c_class
+ #define private c_private
++#define public c_public
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+ #include "gcstruct.h"
+@@ -47,6 +48,7 @@ extern "C" {
+
+ #undef class
+ #undef private
++#undef public
+ }
+
+ #include "RegionHelper.h"
+@@ -112,7 +114,8 @@ static RegionPtr vncHooksRestoreAreas(Wi
+ static void vncHooksInstallColormap(ColormapPtr pColormap);
+ static void vncHooksStoreColors(ColormapPtr pColormap, int ndef,
+ xColorItem* pdef);
+-static Bool vncHooksDisplayCursor(ScreenPtr pScreen, CursorPtr cursor);
++static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
++ CursorPtr cursor);
+ static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
+ pointer pReadmask);
+
+@@ -417,12 +420,14 @@ static void vncHooksStoreColors(Colormap
+
+ // DisplayCursor - get the cursor shape
+
+-static Bool vncHooksDisplayCursor(ScreenPtr pScreen_, CursorPtr cursor)
++static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen_,
++ CursorPtr cursor)
+ {
+ SCREEN_UNWRAP(pScreen_, DisplayCursor);
+
+- Bool ret = (*pScreen->DisplayCursor) (pScreen, cursor);
++ Bool ret = (*pScreen->DisplayCursor) (pDev, pScreen, cursor);
+
++ if (cursor != NullCursor)
+ vncHooksScreen->desktop->setCursor(cursor);
+
+
--- a/open-src/xserver/xvnc/vnc-xorg.patch Thu May 14 20:00:54 2009 -0700
+++ b/open-src/xserver/xvnc/vnc-xorg.patch Fri May 15 09:36:46 2009 -0700
@@ -1,64 +1,65 @@
## Patch originally from Fedora - Revision 1.4 of:
http://cvs.fedoraproject.org/viewvc/rpms/vnc/devel/vnc-xorg.patch
+## Updated to apply to Xorg 1.5.99.901
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac.vnc 2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2008-07-16 13:33:50.000000000 +0200
+diff -urp -x '*~' -x '*.orig' vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac 2009-01-23 17:12:07.905592000 -0800
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac 2009-01-23 17:16:49.289083000 -0800
@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
- AC_INIT([xorg-server], 1.4.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+ AC_INIT([xorg-server], 1.5.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
-@@ -1212,6 +1211,9 @@ if test "x$XVFB" = xyes; then
+@@ -1272,6 +1271,9 @@ if test "x$XVFB" = xyes; then
AC_SUBST([XVFB_SYS_LIBS])
fi
+dnl Xvnc DDX
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"])
dnl Xnest DDX
-@@ -2176,6 +2178,7 @@ hw/dmx/input/Makefile
+@@ -1926,6 +1928,7 @@ hw/dmx/input/Makefile
hw/dmx/glxProxy/Makefile
hw/dmx/Makefile
hw/vfb/Makefile
+hw/vnc/Makefile
- hw/xgl/Makefile
- hw/xgl/egl/Makefile
- hw/xgl/egl/module/Makefile
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.vnc 2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2008-07-16 13:33:15.000000000 +0200
-@@ -43,7 +43,8 @@ SUBDIRS = \
+ hw/xnest/Makefile
+ hw/xwin/Makefile
+ hw/xquartz/Makefile
+diff -urp -x '*~' -x '*.orig' vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2008-10-12 16:18:43.000000000 -0700
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2009-01-23 17:16:49.414933000 -0800
+@@ -33,7 +33,8 @@ SUBDIRS = \
+ $(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \
$(KDRIVE_SUBDIRS) \
- $(XQUARTZ_SUBDIRS) \
-- $(XPRINT_SUBDIRS)
-+ $(XPRINT_SUBDIRS) \
+- $(XQUARTZ_SUBDIRS)
++ $(XQUARTZ_SUBDIRS) \
+ vnc
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
-diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c
---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.vnc 2008-07-16 13:33:14.000000000 +0200
-+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2008-07-16 13:33:15.000000000 +0200
-@@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
- #ifdef MITMISC
- extern void MITMiscExtensionInit(INITARGS);
+diff -urp -x '*~' -x '*.orig' vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c
+--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2009-01-23 17:12:07.969104000 -0800
++++ vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2009-01-23 17:16:49.493023000 -0800
+@@ -219,6 +219,7 @@ extern void XInputExtensionInit(INITARGS
+ extern void XTestExtensionInit(INITARGS);
#endif
+ extern void BigReqExtensionInit(INITARGS);
+extern void vncExtensionInit(INITARGS);
- #ifdef XIDLE
- extern void XIdleExtensionInit(INITARGS);
+ #ifdef SCREENSAVER
+ extern void ScreenSaverExtensionInit (INITARGS);
+ #endif
+@@ -432,6 +433,7 @@ InitExtensions(int argc, char *argv[])
+ if (!noTestExtensions) XTestExtensionInit();
#endif
-@@ -566,6 +567,7 @@ InitExtensions(argc, argv)
- #ifdef MITMISC
- if (!noMITMiscExtension) MITMiscExtensionInit();
+ BigReqExtensionInit();
++ vncExtensionInit();
+ #if defined(SCREENSAVER)
+ if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
#endif
-+ vncExtensionInit();
- #ifdef XIDLE
- if (!noXIdleExtension) XIdleExtensionInit();
- #endif
--- a/packages/SUNWxorg-cfg/copyright.add Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-
---------------------------------------------------------------------
-
-Files from the lib/libxkbui package are covered by the following notice:
-
-include lib/libxkbui/COPYING
-
---------------------------------------------------------------------
-
-Files from the xserver package are covered by the following notice:
-
-include xserver/xorg/COPYING
-
--- a/packages/SUNWxorg-cfg/depend Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-##########################################################################
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-##########################################################################
-#
-# ident "@(#)depend 1.3 05/11/07 SMI"
-#
-# X.Org Foundation X server for Solaris
-
-P SUNWcsr Core Solaris, (Root)
-P SUNWcsu Core Solaris, (Usr)
-P SUNWcsl Core Solaris, (Shared Libs)
-P SUNWxwrtl X Window System & Graphics Runtime Library Links in /usr/lib
-P SUNWxorg-server X.Org Foundation Xserver
-P SUNWxorg-clientlibs X.Org Foundation X Client Libraries
--- a/packages/SUNWxorg-cfg/pkginfo.tmpl Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-##########################################################################
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-##########################################################################
-#
-# ident "@(#)pkginfo.tmpl 1.5 05/11/07 SMI"
-#
-
-PKG="SUNWxorg-cfg"
-NAME="X.Org Foundation Xserver configuration tool"
-ARCH="ISA"
-VERSION=0.1,REV=0.2000.02.02
-CATEGORY="system"
-DESC="Configuration tool for X Window System server based on X.Org Foundation open source release"
-BASEDIR="/usr"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-MAXINST="1000"
-SUNW_PKGVERS=1.0
-SUNW_PRODNAME="X.Org Foundation X11 for Solaris"
-SUNW_PRODVERS=1.0
-SUNW_PKGTYPE=usr
--- a/packages/SUNWxorg-cfg/prototype_com Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-##########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-##########################################################################
-#
-# ident "@(#)prototype_com 1.16 09/01/14 SMI"
-#
-# X.Org server configuration tool
-
-!HOME=../usr/X11
-
-i pkginfo
-i depend
-i copyright
-
-d none X11 0755 root bin
-
-!search $HOME/$XSERVERBINDIR
-d none X11/bin 0755 root bin
-f none X11/bin/xorgcfg 0755 root bin
-
-!search $HOME/lib/xorgcfg
-d none X11/lib 0755 root bin
-d none X11/lib/xorgcfg 0755 root bin
-f none X11/lib/xorgcfg/libxkbui.so.1 0444 root bin
-
-!search $HOME/lib/X11/app-defaults
-d none X11/lib/X11 0755 root bin
-d none X11/lib/X11/app-defaults 0755 root bin
-f none X11/lib/X11/app-defaults/XOrgCfg 0444 root bin
-
-!search $HOME/include/X11/pixmaps
-d none X11/include 0755 root bin
-d none X11/include/X11 0755 root bin
-d none X11/include/X11/pixmaps 0755 root bin
-f none X11/include/X11/pixmaps/card.xpm 0444 root bin
-f none X11/include/X11/pixmaps/mouse.xpm 0444 root bin
-f none X11/include/X11/pixmaps/computer.xpm 0444 root bin
-f none X11/include/X11/pixmaps/keyboard.xpm 0444 root bin
-f none X11/include/X11/pixmaps/monitor.xpm 0444 root bin
-
-!search $HOME/include/X11/bitmaps
-d none X11/include 0755 root bin
-d none X11/include/X11 0755 root bin
-d none X11/include/X11/bitmaps 0755 root bin
-f none X11/include/X11/bitmaps/card.xbm 0444 root bin
-f none X11/include/X11/bitmaps/up.xbm 0444 root bin
-f none X11/include/X11/bitmaps/down.xbm 0444 root bin
-f none X11/include/X11/bitmaps/left.xbm 0444 root bin
-f none X11/include/X11/bitmaps/right.xbm 0444 root bin
-f none X11/include/X11/bitmaps/shorter.xbm 0444 root bin
-f none X11/include/X11/bitmaps/narrower.xbm 0444 root bin
-f none X11/include/X11/bitmaps/wider.xbm 0444 root bin
-f none X11/include/X11/bitmaps/taller.xbm 0444 root bin
-f none X11/include/X11/bitmaps/mouse.xbm 0444 root bin
-f none X11/include/X11/bitmaps/keyboard.xbm 0444 root bin
-f none X11/include/X11/bitmaps/monitor.xbm 0444 root bin
-
-!search $HOME/share/man/man1
-d none X11/share 0755 root bin
-d none X11/share/man 0755 root bin
-d none X11/share/man/man1 0755 root bin
-f none X11/share/man/man1/xorgcfg.1 0444 root bin
--- a/packages/SUNWxorg-cfg/prototype_i386 Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-###########################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident "@(#)prototype_i386 1.1 07/01/04 SMI"
-#
-
-# Include ISA independent files (prototype_com)
-#
-!XSERVERBINDIR=bin/i386
-!include prototype_com
--- a/packages/SUNWxorg-cfg/prototype_sparc Thu May 14 20:00:54 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-###########################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident "@(#)prototype_sparc 1.1 07/01/04 SMI"
-#
-
-# Include ISA independent files (prototype_com)
-#
-!XSERVERBINDIR=bin
-!include prototype_com
-
--- a/packages/SUNWxorg-graphics-ddx/prototype_i386 Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-graphics-ddx/prototype_i386 Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_i386 1.17 09/01/14 SMI"
+# ident "@(#)prototype_i386 1.18 09/05/15 SMI"
#
# X.Org Foundation X server for Solaris
@@ -50,6 +50,8 @@
f none X11/lib/modules/drivers/ark_drv.so 0755 root bin
f none X11/lib/modules/drivers/ast_drv.so 0755 root bin
f none X11/lib/modules/drivers/ati_drv.so 0755 root bin
+f none X11/lib/modules/drivers/ch7017.so 0755 root bin
+f none X11/lib/modules/drivers/ch7xxx.so 0755 root bin
f none X11/lib/modules/drivers/chips_drv.so 0755 root bin
f none X11/lib/modules/drivers/cirrus_alpine.so 0755 root bin
f none X11/lib/modules/drivers/cirrus_drv.so 0755 root bin
@@ -59,6 +61,7 @@
f none X11/lib/modules/drivers/i740_drv.so 0755 root bin
f none X11/lib/modules/drivers/intel_drv.so 0755 root bin
s none X11/lib/modules/drivers/i810_drv.so=intel_drv.so
+f none X11/lib/modules/drivers/ivch.so 0755 root bin
f none X11/lib/modules/drivers/mach64_drv.so 0755 root bin
f none X11/lib/modules/drivers/mga_drv.so 0755 root bin
f none X11/lib/modules/drivers/neomagic_drv.so 0755 root bin
@@ -71,9 +74,11 @@
f none X11/lib/modules/drivers/s3_drv.so 0755 root bin
f none X11/lib/modules/drivers/s3virge_drv.so 0755 root bin
f none X11/lib/modules/drivers/savage_drv.so 0755 root bin
+f none X11/lib/modules/drivers/sil164.so 0755 root bin
f none X11/lib/modules/drivers/siliconmotion_drv.so 0755 root bin
f none X11/lib/modules/drivers/sis_drv.so 0755 root bin
f none X11/lib/modules/drivers/tdfx_drv.so 0755 root bin
+f none X11/lib/modules/drivers/tfp410.so 0755 root bin
f none X11/lib/modules/drivers/tga_drv.so 0755 root bin
f none X11/lib/modules/drivers/trident_drv.so 0755 root bin
f none X11/lib/modules/drivers/tseng_drv.so 0755 root bin
@@ -84,6 +89,8 @@
!search $HOME/lib/modules/amd64/drivers
d none X11/lib/modules/drivers/amd64 0755 root bin
f none X11/lib/modules/drivers/amd64/ati_drv.so 0755 root bin
+f none X11/lib/modules/drivers/amd64/ch7017.so 0755 root bin
+f none X11/lib/modules/drivers/amd64/ch7xxx.so 0755 root bin
f none X11/lib/modules/drivers/amd64/cirrus_alpine.so 0755 root bin
f none X11/lib/modules/drivers/amd64/cirrus_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/cirrus_laguna.so 0755 root bin
@@ -94,10 +101,13 @@
f none X11/lib/modules/drivers/amd64/ast_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/intel_drv.so 0755 root bin
s none X11/lib/modules/drivers/amd64/i810_drv.so=intel_drv.so
+f none X11/lib/modules/drivers/amd64/ivch.so 0755 root bin
f none X11/lib/modules/drivers/amd64/mach64_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/mga_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/nv_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/openchrome_drv.so 0755 root bin
+f none X11/lib/modules/drivers/amd64/sil164.so 0755 root bin
+f none X11/lib/modules/drivers/amd64/tfp410.so 0755 root bin
f none X11/lib/modules/drivers/amd64/trident_drv.so 0755 root bin
s none X11/lib/modules/drivers/amd64/via_drv.so=openchrome_drv.so
f none X11/lib/modules/drivers/amd64/vmware_drv.so 0755 root bin
--- a/packages/SUNWxorg-headers/prototype Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-headers/prototype Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.13 09/05/13 SMI"
+# ident "@(#)prototype 1.14 09/05/15 SMI"
#
# Xorg server DDK headers
@@ -49,10 +49,6 @@
f none X11/include/xorg/IBM.h 0444 root bin
f none X11/include/xorg/TI.h 0444 root bin
f none X11/include/xorg/XIstubs.h 0444 root bin
-f none X11/include/xorg/afb.h 0444 root bin
-f none X11/include/xorg/agpgart.h 0444 root bin
-f none X11/include/xorg/assyntax.h 0444 root bin
-f none X11/include/xorg/atKeynames.h 0444 root bin
f none X11/include/xorg/bstore.h 0444 root bin
f none X11/include/xorg/bstorestr.h 0444 root bin
f none X11/include/xorg/bt829.h 0444 root bin
@@ -85,21 +81,19 @@
f none X11/include/xorg/fb.h 0444 root bin
f none X11/include/xorg/fbdevhw.h 0444 root bin
f none X11/include/xorg/fboverlay.h 0444 root bin
-f none X11/include/xorg/fbpseudocolor.h 0444 root bin
f none X11/include/xorg/fbrop.h 0444 root bin
f none X11/include/xorg/fi1236.h 0444 root bin
f none X11/include/xorg/fourcc.h 0444 root bin
f none X11/include/xorg/gc.h 0444 root bin
f none X11/include/xorg/gcstruct.h 0444 root bin
+f none X11/include/xorg/geext.h 0444 root bin
+f none X11/include/xorg/geint.h 0444 root bin
f none X11/include/xorg/globals.h 0444 root bin
f none X11/include/xorg/glyphstr.h 0444 root bin
f none X11/include/xorg/hotplug.h 0444 root bin
f none X11/include/xorg/i2c_def.h 0444 root bin
f none X11/include/xorg/input.h 0444 root bin
f none X11/include/xorg/inputstr.h 0444 root bin
-f none X11/include/xorg/mfb.h 0444 root bin
-f none X11/include/xorg/mfbmap.h 0444 root bin
-f none X11/include/xorg/mfbunmap.h 0444 root bin
f none X11/include/xorg/mi.h 0444 root bin
f none X11/include/xorg/mibank.h 0444 root bin
f none X11/include/xorg/mibstore.h 0444 root bin
@@ -129,6 +123,7 @@
f none X11/include/xorg/privates.h 0444 root bin
f none X11/include/xorg/property.h 0444 root bin
f none X11/include/xorg/propertyst.h 0444 root bin
+f none X11/include/xorg/ptrveloc.h 0444 root bin
f none X11/include/xorg/randrstr.h 0444 root bin
f none X11/include/xorg/region.h 0444 root bin
f none X11/include/xorg/regionstr.h 0444 root bin
@@ -136,6 +131,7 @@
f none X11/include/xorg/renderedge.h 0444 root bin
f none X11/include/xorg/resource.h 0444 root bin
f none X11/include/xorg/rgb.h 0444 root bin
+f none X11/include/xorg/rrtransform.h 0444 root bin
f none X11/include/xorg/sarea.h 0444 root bin
f none X11/include/xorg/screenint.h 0444 root bin
f none X11/include/xorg/scrnintstr.h 0444 root bin
@@ -143,6 +139,7 @@
f none X11/include/xorg/servermd.h 0444 root bin
f none X11/include/xorg/shadow.h 0444 root bin
f none X11/include/xorg/shadowfb.h 0444 root bin
+f none X11/include/xorg/shmint.h 0444 root bin
f none X11/include/xorg/site.h 0444 root bin
f none X11/include/xorg/swaprep.h 0444 root bin
f none X11/include/xorg/swapreq.h 0444 root bin
@@ -169,7 +166,6 @@
f none X11/include/xorg/xf86Module.h 0444 root bin
f none X11/include/xorg/xf86Opt.h 0444 root bin
f none X11/include/xorg/xf86Optrec.h 0444 root bin
-f none X11/include/xorg/xf86OSmouse.h 0444 root bin
f none X11/include/xorg/xf86Parser.h 0444 root bin
f none X11/include/xorg/xf86Pci.h 0444 root bin
f none X11/include/xorg/xf86PciInfo.h 0444 root bin
@@ -181,7 +177,6 @@
f none X11/include/xorg/xf86Rename.h 0444 root bin
f none X11/include/xorg/xf86Resources.h 0444 root bin
f none X11/include/xorg/xf86Sbus.h 0444 root bin
-f none X11/include/xorg/xf86Version.h 0444 root bin
f none X11/include/xorg/xf86Xinput.h 0444 root bin
f none X11/include/xorg/xf86_OSlib.h 0444 root bin
f none X11/include/xorg/xf86_OSproc.h 0444 root bin
@@ -196,10 +191,12 @@
f none X11/include/xorg/xf86xvpriv.h 0444 root bin
f none X11/include/xorg/xisb.h 0444 root bin
f none X11/include/xorg/xkbfile.h 0444 root bin
+f none X11/include/xorg/xkbrules.h 0444 root bin
f none X11/include/xorg/xkbsrv.h 0444 root bin
f none X11/include/xorg/xkbstr.h 0444 root bin
f none X11/include/xorg/xorg-server.h 0444 root bin
f none X11/include/xorg/xorgVersion.h 0444 root bin
+f none X11/include/xorg/xserver-properties.h 0444 root bin
f none X11/include/xorg/xvdix.h 0444 root bin
f none X11/include/xorg/xvmcext.h 0444 root bin
--- a/packages/SUNWxorg-mesa/prototype Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-mesa/prototype Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.21 09/01/15 SMI"
+# ident "@(#)prototype 1.22 09/05/15 SMI"
#
# Mesa - OpenGL Workalike for Solaris
@@ -153,11 +153,15 @@
!search $HOME/lib/modules/extensions
d none X11/lib/modules/extensions 0755 root bin
f none X11/lib/modules/extensions/libdri.so 0755 root bin
+f none X11/lib/modules/extensions/libdri2.so 0755 root bin
d none X11/lib/modules/extensions/mesa 0755 root bin
f none X11/lib/modules/extensions/mesa/libglx.so 0755 root bin
s none X11/lib/modules/extensions/GL=mesa 0755 root bin
s none X11/lib/modules/extensions/libglx.so=../../../../../var/run/opengl/server/libglx.so 0755 root bin
+!search $HOME/include/xorg
+d none X11/include/xorg 0755 root bin
+f none X11/include/xorg/dri2.h 0444 root bin
# 64-bit X server-side components
d none X11/lib/modules/dri/$plat_64 0755 root bin
@@ -172,6 +176,7 @@
!search $HOME/lib/modules/$plat_64/extensions
d none X11/lib/modules/extensions/$plat_64 0755 root bin
f none X11/lib/modules/extensions/$plat_64/libdri.so 0755 root bin
+f none X11/lib/modules/extensions/$plat_64/libdri2.so 0755 root bin
d none X11/lib/modules/extensions/mesa/$plat_64 0755 root bin
f none X11/lib/modules/extensions/mesa/$plat_64/libglx.so 0755 root bin
s none X11/lib/modules/extensions/$plat_64/libglx.so=../../../../../../var/run/opengl/server/amd64/libglx.so 0755 root bin
@@ -220,13 +225,19 @@
!search $HOME/../lib/pkgconfig
d none lib 0755 root bin
d none lib/pkgconfig 0755 root other
+f none lib/pkgconfig/dri.pc 0444 root bin
f none lib/pkgconfig/gl.pc 0444 root bin
+f none lib/pkgconfig/glu.pc 0444 root bin
+f none lib/pkgconfig/glw.pc 0444 root bin
f none lib/pkgconfig/glproto.pc 0444 root bin
!search $HOME/../lib/$plat_64/pkgconfig
d none lib/$plat_64 0755 root bin
d none lib/$plat_64/pkgconfig 0755 root other
+f none lib/$plat_64/pkgconfig/dri.pc 0444 root bin
f none lib/$plat_64/pkgconfig/gl.pc 0444 root bin
+f none lib/$plat_64/pkgconfig/glu.pc 0444 root bin
+f none lib/$plat_64/pkgconfig/glw.pc 0444 root bin
s none lib/$plat_64/pkgconfig/glproto.pc=../../pkgconfig/glproto.pc
--- a/packages/SUNWxorg-server/copyright.add.i386 Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-server/copyright.add.i386 Fri May 15 09:36:46 2009 -0700
@@ -1,77 +1,53 @@
-------------------------------------------------------------------------------
+--------------------------------------------------------------------
+
Files from the driver/xf86-input-acecad package are covered by the following notice:
include driver/xf86-input-acecad/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-calcomp package are covered by the following notice:
-include driver/xf86-input-calcomp/COPYING
-------------------------------------------------------------------------------
+--------------------------------------------------------------------
+
Files from the driver/xf86-input-citron package are covered by the following notice:
include driver/xf86-input-citron/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-digitaledge package are covered by the following notice:
-
-include driver/xf86-input-digitaledge/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-dmc package are covered by the following notice:
-include driver/xf86-input-dmc/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-dynapro package are covered by the following notice:
+--------------------------------------------------------------------
-include driver/xf86-input-dynapro/COPYING
-------------------------------------------------------------------------------
Files from the driver/xf86-input-elographics package are covered by the following notice:
include driver/xf86-input-elographics/COPYING
-------------------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
Files from the driver/xf86-input-fpit package are covered by the following notice:
include driver/xf86-input-fpit/COPYING
-------------------------------------------------------------------------------
+
+--------------------------------------------------------------------
+
Files from the driver/xf86-input-hyperpen package are covered by the following notice:
include driver/xf86-input-hyperpen/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-jamstudio package are covered by the following notice:
-
-include driver/xf86-input-jamstudio/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-magellan package are covered by the following notice:
-include driver/xf86-input-magellan/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-microtouch package are covered by the following notice:
+--------------------------------------------------------------------
-include driver/xf86-input-microtouch/COPYING
-------------------------------------------------------------------------------
Files from the driver/xf86-input-mutouch package are covered by the following notice:
include driver/xf86-input-mutouch/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-palmax package are covered by the following notice:
-include driver/xf86-input-palmax/COPYING
-------------------------------------------------------------------------------
+--------------------------------------------------------------------
+
Files from the driver/xf86-input-penmount package are covered by the following notice:
include driver/xf86-input-penmount/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-spaceorb package are covered by the following notice:
-
-include driver/xf86-input-spaceorb/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-summa package are covered by the following notice:
-include driver/xf86-input-summa/COPYING
-------------------------------------------------------------------------------
-Files from the driver/xf86-input-tek4957 package are covered by the following notice:
+--------------------------------------------------------------------
-include driver/xf86-input-tek4957/COPYING
-------------------------------------------------------------------------------
Files from the driver/xf86-input-vmmouse package are covered by the following notice:
include driver/xf86-input-vmmouse/COPYING
+--------------------------------------------------------------------
+
+Files from the lib/libdrm package are covered by the following notice:
+
+include lib/libdrm/COPYING
--- a/packages/SUNWxorg-server/prototype_com Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-server/prototype_com Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_com 1.32 09/01/14 SMI"
+# ident "@(#)prototype_com 1.33 09/05/15 SMI"
#
# X.Org Foundation X server for Solaris & OpenSolaris
@@ -44,7 +44,6 @@
d none X11/bin 0755 root bin
f none X11/bin/gtf 0555 root bin
f none X11/bin/cvt 0555 root bin
-f none X11/bin/xorgconfig 0555 root bin
!search $HOME/bin
f none X11/bin/xkbcomp 0755 root bin
@@ -54,7 +53,6 @@
!search $HOME/lib/X11
d none X11/lib/X11 0755 root bin
f none X11/lib/X11/Options 0444 root bin
-f none X11/lib/X11/Cards 0444 root bin
!search $HOME/lib/X11/xserver
d none X11/lib/X11/xserver 0755 root bin
@@ -62,21 +60,16 @@
!search $HOME/$XSERVERMODDIR
d none X11/lib/modules 0755 root bin
-f none X11/lib/modules/libafb.so 0755 root bin
f none X11/lib/modules/libexa.so 0755 root bin
f none X11/lib/modules/libfb.so 0755 root bin
f none X11/lib/modules/libint10.so 0755 root bin
-f none X11/lib/modules/libmfb.so 0755 root bin
f none X11/lib/modules/libshadow.so 0755 root bin
f none X11/lib/modules/libshadowfb.so 0755 root bin
f none X11/lib/modules/libvbe.so 0755 root bin
f none X11/lib/modules/libvgahw.so 0755 root bin
f none X11/lib/modules/libwfb.so 0755 root bin
f none X11/lib/modules/libxaa.so 0755 root bin
-f none X11/lib/modules/libxf1bpp.so 0755 root bin
-f none X11/lib/modules/libxf4bpp.so 0755 root bin
f none X11/lib/modules/libxf8_16bpp.so 0755 root bin
-f none X11/lib/modules/libxf8_32bpp.so 0755 root bin
!search $HOME/$XSERVERMODDIR/drivers
d none X11/lib/modules/drivers 0755 root bin
@@ -88,10 +81,6 @@
f none X11/lib/modules/extensions/libdbe.so 0755 root bin
f none X11/lib/modules/extensions/libextmod.so 0755 root bin
-!search $HOME/$XSERVERMODDIR/fonts
-d none X11/lib/modules/fonts 0755 root bin
-f none X11/lib/modules/fonts/libfreetype.so 0755 root bin
-
!search $HOME/$XSERVERMODDIR/input
d none X11/lib/modules/input 0755 root bin
f none X11/lib/modules/input/kbd_drv.so 0755 root bin
@@ -125,9 +114,10 @@
d none X11/share/man/man1 0755 root bin
f none X11/share/man/man1/Xephyr.1 0444 root bin
f none X11/share/man/man1/Xorg.1 0444 root bin
+f none X11/share/man/man1/Xvfb.1 0444 root bin
+f none X11/share/man/man1/cvt.1 0444 root bin
f none X11/share/man/man1/gtf.1 0444 root bin
f none X11/share/man/man1/xkbcomp.1 0444 root bin
-f none X11/share/man/man1/xorgconfig.1 0444 root bin
!search $HOME/share/man/man4
d none X11/share/man/man4 0755 root bin
--- a/packages/SUNWxorg-server/prototype_i386 Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxorg-server/prototype_i386 Fri May 15 09:36:46 2009 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_i386 1.16 09/01/15 SMI"
+# ident "@(#)prototype_i386 1.17 09/05/15 SMI"
#
# X.Org Foundation X server for Solaris
@@ -62,28 +62,25 @@
d none X11/lib/X11 0755 root bin
d none X11/lib/X11/xserver 0755 root bin
f none X11/lib/X11/xserver/libdrm.so.2 0755 root bin
+f none X11/lib/X11/xserver/libdrm_intel.so.1 0755 root bin
!search $HOME/lib/X11/xserver/$plat_64
d none X11/lib/X11/xserver/$plat_64 0755 root bin
f none X11/lib/X11/xserver/$plat_64/libdrm.so.2 0755 root bin
+f none X11/lib/X11/xserver/$plat_64/libdrm_intel.so.1 0755 root bin
!search $HOME/lib/modules/amd64
d none X11/lib/modules/amd64 0755 root bin
-f none X11/lib/modules/amd64/libafb.so 0755 root bin
f none X11/lib/modules/amd64/libexa.so 0755 root bin
f none X11/lib/modules/amd64/libfb.so 0755 root bin
f none X11/lib/modules/amd64/libint10.so 0755 root bin
-f none X11/lib/modules/amd64/libmfb.so 0755 root bin
f none X11/lib/modules/amd64/libshadow.so 0755 root bin
f none X11/lib/modules/amd64/libshadowfb.so 0755 root bin
f none X11/lib/modules/amd64/libvbe.so 0755 root bin
f none X11/lib/modules/amd64/libvgahw.so 0755 root bin
f none X11/lib/modules/amd64/libwfb.so 0755 root bin
f none X11/lib/modules/amd64/libxaa.so 0755 root bin
-f none X11/lib/modules/amd64/libxf1bpp.so 0755 root bin
-f none X11/lib/modules/amd64/libxf4bpp.so 0755 root bin
f none X11/lib/modules/amd64/libxf8_16bpp.so 0755 root bin
-f none X11/lib/modules/amd64/libxf8_32bpp.so 0755 root bin
!search $HOME/lib/modules/amd64/drivers
d none X11/lib/modules/drivers/amd64 0755 root bin
@@ -95,74 +92,38 @@
f none X11/lib/modules/extensions/amd64/libdbe.so 0755 root bin
f none X11/lib/modules/extensions/amd64/libextmod.so 0755 root bin
-!search $HOME/lib/modules/amd64/fonts
-d none X11/lib/modules/fonts/amd64 0755 root bin
-f none X11/lib/modules/fonts/amd64/libfreetype.so 0755 root bin
-
!search $HOME/$XSERVERMODDIR/input
d none X11/lib/modules/input 0755 root bin
f none X11/lib/modules/input/acecad_drv.so 0755 root bin
-f none X11/lib/modules/input/calcomp_drv.so 0755 root bin
f none X11/lib/modules/input/citron_drv.so 0755 root bin
-f none X11/lib/modules/input/digitaledge_drv.so 0755 root bin
-f none X11/lib/modules/input/dmc_drv.so 0755 root bin
-f none X11/lib/modules/input/dynapro_drv.so 0755 root bin
f none X11/lib/modules/input/elographics_drv.so 0755 root bin
f none X11/lib/modules/input/fpit_drv.so 0755 root bin
f none X11/lib/modules/input/hyperpen_drv.so 0755 root bin
-f none X11/lib/modules/input/js_x_drv.so 0755 root bin
-f none X11/lib/modules/input/magellan_drv.so 0755 root bin
-f none X11/lib/modules/input/microtouch_drv.so 0755 root bin
f none X11/lib/modules/input/mutouch_drv.so 0755 root bin
-f none X11/lib/modules/input/palmax_drv.so 0755 root bin
f none X11/lib/modules/input/penmount_drv.so 0755 root bin
-f none X11/lib/modules/input/spaceorb_drv.so 0755 root bin
-f none X11/lib/modules/input/summa_drv.so 0755 root bin
-f none X11/lib/modules/input/tek4957_drv.so 0755 root bin
f none X11/lib/modules/input/vmmouse_drv.so 0755 root bin
-#f none X11/lib/modules/input/wacom_drv.so 0755 root bin
-
!search $HOME/lib/modules/amd64/input
d none X11/lib/modules/input/amd64 0755 root bin
f none X11/lib/modules/input/amd64/acecad_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/calcomp_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/citron_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/digitaledge_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/dmc_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/dynapro_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/elographics_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/fpit_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/hyperpen_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/js_x_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/kbd_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/magellan_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/microtouch_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/mouse_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/mutouch_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/palmax_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/penmount_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/spaceorb_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/summa_drv.so 0755 root bin
-f none X11/lib/modules/input/amd64/tek4957_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/void_drv.so 0755 root bin
f none X11/lib/modules/input/amd64/vmmouse_drv.so 0755 root bin
-#f none X11/lib/modules/input/amd64/wacom_drv.so 0755 root bin
!search $HOME/share/man/man7
f none X11/share/man/man7/acecad.7 0444 root bin
-f none X11/share/man/man7/calcomp.7 0444 root bin
f none X11/share/man/man7/citron.7 0444 root bin
-f none X11/share/man/man7/dmc.7 0444 root bin
-f none X11/share/man/man7/dynapro.7 0444 root bin
f none X11/share/man/man7/elographics.7 0444 root bin
f none X11/share/man/man7/fpit.7 0444 root bin
-f none X11/share/man/man7/js_x.7 0444 root bin
-f none X11/share/man/man7/microtouch.7 0444 root bin
f none X11/share/man/man7/mutouch.7 0444 root bin
-f none X11/share/man/man7/palmax.7 0444 root bin
f none X11/share/man/man7/penmount.7 0444 root bin
-f none X11/share/man/man7/tek4957.7 0444 root bin
f none X11/share/man/man7/vmmouse.7 0444 root bin
# HAL probe support for vmmouse driver
@@ -173,3 +134,6 @@
!search $HOME/lib/X11/xserver
f none X11/lib/X11/xserver/vmmouse_detect 0555 root bin
+
+!search $HOME/share/man/man1
+f none X11/share/man/man1/vmmouse_detect.1 0444 root bin
--- a/packages/SUNWxwinc/copyright.add Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxwinc/copyright.add Fri May 15 09:36:46 2009 -0700
@@ -19,6 +19,12 @@
--------------------------------------------------------------------
+Files from the proto/dri2proto package are covered by the following notice:
+
+include proto/dri2proto/COPYING
+
+--------------------------------------------------------------------
+
Files from the proto/evieproto package are covered by the following notice:
include proto/evieproto/COPYING
--- a/packages/SUNWxwinc/prototype Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxwinc/prototype Fri May 15 09:36:46 2009 -0700
@@ -27,7 +27,7 @@
# of the copyright holder.
#
#
-# ident "@(#)prototype 35.95 09/05/13 SMI"
+# ident "@(#)prototype 35.96 09/05/15 SMI"
#
# X Window System include files
@@ -432,6 +432,7 @@
f none X11/include/X11/extensions/Xdbeproto.h 0444 root bin
f none X11/include/X11/extensions/Xeviestr.h 0444 root bin
f none X11/include/X11/extensions/Xext.h 0444 root bin
+f none X11/include/X11/extensions/Xge.h 0444 root bin
f none X11/include/X11/extensions/Xinerama.h 0444 root bin
f none X11/include/X11/extensions/bigreqstr.h 0444 root bin
f none X11/include/X11/extensions/composite.h 0444 root bin
@@ -440,7 +441,11 @@
f none X11/include/X11/extensions/damagewire.h 0444 root bin
f none X11/include/X11/extensions/dpms.h 0444 root bin
f none X11/include/X11/extensions/dpmsstr.h 0444 root bin
+f none X11/include/X11/extensions/dri2proto.h 0444 root bin
+f none X11/include/X11/extensions/dri2tokens.h 0444 root bin
f none X11/include/X11/extensions/extutil.h 0444 root bin
+f none X11/include/X11/extensions/ge.h 0444 root bin
+f none X11/include/X11/extensions/geproto.h 0444 root bin
f none X11/include/X11/extensions/lbxbuf.h 0444 root bin
f none X11/include/X11/extensions/lbxbufstr.h 0444 root bin
f none X11/include/X11/extensions/lbxdeltastr.h 0444 root bin
@@ -594,7 +599,6 @@
f none X11/include/X11/fonts/fontconf.h 0444 root bin
f none X11/include/X11/fonts/fontencc.h 0444 root bin
f none X11/include/X11/fonts/fontmisc.h 0444 root bin
-f none X11/include/X11/fonts/fontmod.h 0444 root bin
f none X11/include/X11/fonts/fontshow.h 0444 root bin
f none X11/include/X11/fonts/fontutil.h 0444 root bin
f none X11/include/X11/fonts/fontxlfd.h 0444 root bin
@@ -788,6 +792,7 @@
f none lib/pkgconfig/bigreqsproto.pc 0444 root bin
f none lib/pkgconfig/compositeproto.pc 0444 root bin
f none lib/pkgconfig/damageproto.pc 0444 root bin
+f none lib/pkgconfig/dri2proto.pc 0444 root bin
f none lib/pkgconfig/evieproto.pc 0444 root bin
f none lib/pkgconfig/fixesproto.pc 0444 root bin
f none lib/pkgconfig/fontcacheproto.pc 0444 root bin
@@ -869,6 +874,7 @@
s none lib/$plat_64/pkgconfig/bigreqsproto.pc=../../pkgconfig/bigreqsproto.pc
s none lib/$plat_64/pkgconfig/compositeproto.pc=../../pkgconfig/compositeproto.pc
s none lib/$plat_64/pkgconfig/damageproto.pc=../../pkgconfig/damageproto.pc
+s none lib/$plat_64/pkgconfig/dri2proto.pc=../../pkgconfig/dri2proto.pc
s none lib/$plat_64/pkgconfig/evieproto.pc=../../pkgconfig/evieproto.pc
s none lib/$plat_64/pkgconfig/fixesproto.pc=../../pkgconfig/fixesproto.pc
s none lib/$plat_64/pkgconfig/fontcacheproto.pc=../../pkgconfig/fontcacheproto.pc
--- a/packages/SUNWxwman/prototype_com Thu May 14 20:00:54 2009 -0700
+++ b/packages/SUNWxwman/prototype_com Fri May 15 09:36:46 2009 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.113 09/03/11 SMI"
+# ident "@(#)prototype_com 35.114 09/05/15 SMI"
#
# X Window System online user man pages
@@ -364,9 +364,6 @@
# open-src/xserver/xorg
f none X11/share/man/man1/Xserver.1 0444 root bin
-# open-src/xserver/xorg/hw/xprint/doc/Xprt
-f none X11/share/man/man1/Xprt.1 0444 root bin
-
# open-src/doc/xorg-docs
!search $NEWHOME/man5
d none X11/share/man/man5 0755 root bin
--- a/packages/upgrade-X Thu May 14 20:00:54 2009 -0700
+++ b/packages/upgrade-X Fri May 15 09:36:46 2009 -0700
@@ -2,7 +2,7 @@
###
#
-# @(#)upgrade-X 1.51 09/05/13
+# @(#)upgrade-X 1.52 09/05/15
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
#
@@ -173,7 +173,6 @@
SUNWttf-google-droid
SUNWvncviewer
SUNWxcursor-themes
- SUNWxorg-cfg
SUNWxorg-client-docs
SUNWxorg-client-programs
SUNWxorg-clientlibs
@@ -272,9 +271,10 @@
# snv_111: 6815064 Merge SUNWxwhl into SUNWxwinc
REM_PKGS+=" SUNWxwhl"
-# snv_116: 6840423 Move headers from SUNWxorg-headers to SUNWxwinc,
-# merge SUNWxorg-devel-docs into SUNWxwpmn
-REM_PKGS+=" SUNWxorg-headers SUNWxorg-devel-docs"
+# snv_116: 6840423/6826940 Move headers from SUNWxorg-headers to SUNWxwinc,
+# merge SUNWxorg-devel-docs into SUNWxwpmn, remove SUNWxorg-cfg
+#
+REM_PKGS+=" SUNWxorg-headers SUNWxorg-devel-docs SUNWxorg-cfg"
# Various compatibility links in SUNWxorg-server have been replaced with
# files in other packages, so we need to remove SUNWxorg-server first