# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
diff -Nurp -x '*~' -x '*.orig' Makefile.am Makefile.am
--- Makefile.am	2010-08-26 14:51:37.000000000 -0700
+++ Makefile.am	2011-02-15 15:53:19.157650482 -0800
@@ -36,6 +36,7 @@ SUBDIRS = \
 	damageext \
 	$(COMPOSITE_DIR) \
 	$(GLX_DIR) \
+	IA \
 	exa \
 	config \
 	hw \
diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
--- configure.ac	2011-02-15 15:53:16.732320605 -0800
+++ configure.ac	2011-02-15 15:53:19.158803446 -0800
@@ -1158,6 +1158,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input ex
 XI_LIB='$(top_builddir)/Xi/libXi.la'
 XI_INC='-I$(top_srcdir)/Xi'
 
+# SolarisIA extension
+IA_LIB='$(top_builddir)/IA/libIA.la'
+XEXT_LIB="${XEXT_LIB} ${IA_LIB}"
+
 AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
 AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
 AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
@@ -2273,3 +2277,6 @@ test/Makefile
 test/xi2/Makefile
 xorg-server.pc
 ])
+
+# Add Sun IA extension
+AC_OUTPUT([IA/Makefile])
diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
--- hw/xfree86/common/xf86Config.c	2011-02-15 15:53:16.711587149 -0800
+++ hw/xfree86/common/xf86Config.c	2011-02-15 15:53:19.159630285 -0800
@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = 
 #ifdef DRI2
     {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
 #endif
+    {.name = "ia",       .toLoad = TRUE,    .load_opt=NULL},
     {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
 };
 
diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
--- hw/xfree86/dixmods/Makefile.am	2009-09-27 18:57:00.000000000 -0700
+++ hw/xfree86/dixmods/Makefile.am	2011-02-15 15:53:19.159921744 -0800
@@ -66,3 +66,11 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $
 
 libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
 libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
+
+
+# Sun IA extension module additions
+extsmodule_LTLIBRARIES += libia.la
+libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
+libia_la_LDFLAGS = -avoid-version
+libia_la_LIBADD = $(top_builddir)/IA/libIA.la
+libia_la_SOURCES = iamodule.c
diff -Nurp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
--- mi/miinitext.c	2010-05-02 19:59:26.000000000 -0700
+++ mi/miinitext.c	2011-02-15 15:53:19.160356394 -0800
@@ -94,6 +94,7 @@ SOFTWARE.
 #include "micmap.h"
 #include "globals.h"
 
+#define SolarisIAExtension
 
 extern Bool noTestExtensions;
 
@@ -153,6 +154,9 @@ extern Bool noSELinuxExtension;
 extern Bool noXvExtension;
 #endif
 extern Bool noGEExtension;
+#ifdef SolarisIAExtension
+Bool noIAExtension;
+#endif
 
 #ifndef XFree86LOADER
 #define INITARGS void
@@ -184,6 +188,10 @@ typedef void (*InitExtension)(INITARGS);
 #ifdef RES
 #include <X11/extensions/XResproto.h>
 #endif
+#ifdef SolarisIAExtension
+#include <X11/extensions/interactive.h>
+#include "../IA/interactive_srv.h"
+#endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
 #ifdef MITSHM
@@ -304,6 +312,9 @@ static ExtensionToggle ExtensionToggleLi
 #ifdef XCSECURITY
     { "SECURITY", &noSecurityExtension },
 #endif
+#ifdef SolarisIAExtension
+    { IANAME /* "SolarisIA" */, &noIAExtension },
+#endif
 #ifdef RES
     { "X-Resource", &noResExtension },
 #endif
@@ -472,6 +483,9 @@ InitExtensions(int argc, char *argv[])
 	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
+#ifdef SolarisIAExtension
+    if (!noIAExtension) IAExtensionInit();
+#endif
 }
 
 #else /* XFree86LOADER */