98N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.

98N/A# Use subject to license terms.

98N/A#

98N/A# Permission is hereby granted, free of charge, to any person obtaining a

98N/A# copy of this software and associated documentation files (the

98N/A# "Software"), to deal in the Software without restriction, including

98N/A# without limitation the rights to use, copy, modify, merge, publish,

98N/A# distribute, and/or sell copies of the Software, and to permit persons

98N/A# to whom the Software is furnished to do so, provided that the above

98N/A# copyright notice(s) and this permission notice appear in all copies of

98N/A# the Software and that both the above copyright notice(s) and this

98N/A# permission notice appear in supporting documentation.

98N/A#

98N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

98N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

98N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

98N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

98N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

98N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

98N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

98N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

98N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

98N/A#

98N/A# Except as contained in this notice, the name of a copyright holder

98N/A# shall not be used in advertising or otherwise to promote the sale, use

98N/A# or other dealings in this Software without prior written authorization

98N/A# of the copyright holder.

98N/A

98N/Adiff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am

194N/A--- Makefile.am 2006-11-16 10:01:22.000000000 -0800

235N/A+++ Makefile.am 2007-09-20 14:21:57.003122000 -0700

98N/A@@ -58,6 +58,7 @@ SUBDIRS = \

98N/A $(XTRAP_DIR) \

98N/A $(COMPOSITE_DIR) \

98N/A $(GLX_DIR) \

98N/A+ IA \

98N/A exa \

98N/A hw

98N/A

98N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac

235N/A--- configure.ac 2007-09-20 14:21:36.871770000 -0700

235N/A+++ configure.ac 2007-09-20 14:21:57.684612000 -0700

235N/A@@ -783,6 +783,9 @@

235N/A XI_INC='-I$(top_srcdir)/Xi'

235N/A fi

235N/A

235N/A+# SolarisIA extension

235N/A+IA_LIB='$(top_builddir)/IA/libIA.la'

235N/A+

235N/A AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)

235N/A

235N/A AC_DEFINE(SHAPE, 1, [Support SHAPE extension])

235N/A@@ -1023,7 +1026,7 @@

235N/A AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

235N/A

235N/A if test "x$XVFB" = xyes; then

235N/A- XVFB_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 $CWRAP_LIB $OS_LIB $LIBS"

235N/A+ XVFB_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 $CWRAP_LIB $OS_LIB $LIBS"

235N/A AC_SUBST([XVFB_LIBS])

235N/A fi

235N/A

235N/A@@ -1039,7 +1042,7 @@

235N/A AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])

235N/A

235N/A if test "x$XNEST" = xyes; then

235N/A- XNEST_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 $CWRAP_LIB $OS_LIB $LIBS"

235N/A+ XNEST_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 $CWRAP_LIB $OS_LIB $LIBS"

235N/A AC_SUBST([XNEST_LIBS])

235N/A fi

235N/A

235N/A@@ -1559,7 +1562,7 @@

235N/A # dix os fb mi extension glx (NOTYET) damage shadow xpstubs

235N/A #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \

235N/A # $MIEXT_SHADOW_LIB $XPSTUBS_LIB"

235N/A- 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"

235N/A+ 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"

235N/A KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'

235N/A case $host_os in

235N/A *linux*)

235N/A@@ -1866,3 +1866,6 @@ hw/xprint/config/en_US/print/Makefile

98N/A hw/xprint/config/en_US/Makefile

98N/A xorg-server.pc

98N/A ])

98N/A+

98N/A+# Add Sun IA extension

98N/A+AC_OUTPUT([IA/Makefile])

98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c

194N/A--- hw/xfree86/common/xf86AutoConfig.c 2006-11-16 10:01:24.000000000 -0800

235N/A+++ hw/xfree86/common/xf86AutoConfig.c 2007-09-20 14:21:57.861184000 -0700

98N/A@@ -51,6 +51,7 @@

98N/A "\tLoad\t\"type1\"\n" \

98N/A "\tLoad\t\"record\"\n" \

98N/A "\tLoad\t\"dri\"\n" \

98N/A+ "\tLoad\t\"IA\"\n" \

98N/A "EndSection\n\n"

98N/A

98N/A #define BUILTIN_DEVICE_NAME \

98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c

194N/A--- hw/xfree86/common/xf86Config.c 2006-11-30 17:40:10.000000000 -0800

235N/A+++ hw/xfree86/common/xf86Config.c 2007-09-20 14:21:57.862784000 -0700

98N/A@@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli

98N/A ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);

98N/A ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);

98N/A count = 7;

98N/A+

98N/A+ /* Sun addition - IA extension */

98N/A+ ptr = xf86addNewLoadDirective(ptr, "IA", XF86_LOAD_MODULE, NULL);

98N/A+ count++;

98N/A }

98N/A

98N/A /*

98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am

194N/A--- hw/xfree86/dixmods/Makefile.am 2006-11-16 10:01:24.000000000 -0800

235N/A+++ hw/xfree86/dixmods/Makefile.am 2007-09-20 14:21:57.863164000 -0700

98N/A@@ -102,3 +102,10 @@ libxorgxkb_la_LIBADD = $(top_builddir)/d

98N/A libxtrap_la_LDFLAGS = -avoid-version

98N/A libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la

98N/A libxtrap_la_SOURCES = xf86XTrapModule.c

98N/A+

98N/A+

98N/A+# Sun IA extension module additions

98N/A+extsmodule_LTLIBRARIES += libIA.la

98N/A+libIA_la_LDFLAGS = -avoid-version

98N/A+libIA_la_LIBADD = $(top_builddir)/IA/libIA.la

98N/A+libIA_la_SOURCES = iamodule.c

235N/Adiff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c

235N/A--- mi/miinitext.c 2006-11-16 10:01:26.000000000 -0800

235N/A+++ mi/miinitext.c 2007-09-20 14:21:57.965252000 -0700

235N/A@@ -84,6 +84,8 @@ SOFTWARE.

235N/A #include "micmap.h"

235N/A #include "globals.h"

235N/A

235N/A+#define SolarisIAExtension

235N/A+

235N/A #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */

235N/A #undef GLXEXT

235N/A #endif

235N/A@@ -109,6 +111,7 @@ SOFTWARE.

235N/A #undef DAMAGE

235N/A #undef XFIXES

235N/A #undef XEVIE

235N/A+#undef SolarisIAExtension

235N/A #else

235N/A #ifndef LOADABLEPRINTDDX

235N/A #undef XPRINT

235N/A@@ -215,6 +218,9 @@ extern Bool noXIdleExtension;

235N/A #ifdef XV

235N/A extern Bool noXvExtension;

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+Bool noIAExtension;

235N/A+#endif

235N/A

235N/A #ifndef XFree86LOADER

235N/A #define INITARGS void

235N/A@@ -257,6 +263,9 @@ typedef void (*InitExtension)(INITARGS);

235N/A #ifdef RES

235N/A #include <X11/extensions/XResproto.h>

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+#include <X11/extensions/interactive.h>

235N/A+#endif

235N/A

235N/A /* FIXME: this whole block of externs should be from the appropriate headers */

235N/A #ifdef EVI

235N/A@@ -384,6 +393,9 @@ extern void DamageExtensionInit(INITARGS

235N/A #ifdef COMPOSITE

235N/A extern void CompositeExtensionInit(INITARGS);

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+extern void IAExtensionInit(void);

235N/A+#endif

235N/A

235N/A /* The following is only a small first step towards run-time

235N/A * configurable extensions.

235N/A@@ -447,6 +459,9 @@ static ExtensionToggle ExtensionToggleLi

235N/A #ifdef XSYNC

235N/A { "SYNC", &noSyncExtension },

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+ { IANAME /* "SolarisIA" */, &noIAExtension },

235N/A+#endif

235N/A #ifdef TOGCUP

235N/A { "TOG-CUP", &noXcupExtension },

235N/A #endif

235N/A@@ -663,6 +678,9 @@ InitExtensions(argc, argv)

235N/A #ifdef DAMAGE

235N/A if (!noDamageExtension) DamageExtensionInit();

235N/A #endif

235N/A+#ifdef SolarisIAExtension

235N/A+ if (!noIAExtension) IAExtensionInit();

235N/A+#endif

235N/A }

235N/A

235N/A void