1265N/A# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.

98N/A#

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

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

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

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

1124N/Adiff --git a/Makefile.am b/Makefile.am

1265N/Aindex cea140b..b1408f2 100644

1124N/A--- a/Makefile.am

1124N/A+++ b/Makefile.am

1265N/A@@ -37,6 +37,7 @@ SUBDIRS = \

705N/A damageext \

705N/A $(COMPOSITE_DIR) \

705N/A $(GLX_DIR) \

705N/A+ IA \

705N/A exa \

705N/A config \

851N/A hw \

1124N/Adiff --git a/configure.ac b/configure.ac

1265N/Aindex 9e07c44..460da17 100644

1124N/A--- a/configure.ac

1124N/A+++ b/configure.ac

1265N/A@@ -1191,6 +1191,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])

606N/A XI_LIB='$(top_builddir)/Xi/libXi.la'

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

235N/A

235N/A+# SolarisIA extension

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

851N/A+XEXT_LIB="${XEXT_LIB} ${IA_LIB}"

235N/A+

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

851N/A AM_CONDITIONAL(XAA, test "x$XAA" = xyes)

851N/A AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)

1265N/A@@ -2240,3 +2244,6 @@ test/xi2/Makefile

1265N/A xserver.ent

98N/A xorg-server.pc

98N/A ])

98N/A+

98N/A+# Add Sun IA extension

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

1124N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c

1265N/Aindex aa3d97e..87004df 100644

1124N/A--- a/hw/xfree86/common/xf86Config.c

1124N/A+++ b/hw/xfree86/common/xf86Config.c

1124N/A@@ -125,6 +125,7 @@ static ModuleDefault ModuleDefaults[] = {

606N/A #ifdef DRI2

606N/A {.name = "dri2", .toLoad = TRUE, .load_opt=NULL},

606N/A #endif

606N/A+ {.name = "ia", .toLoad = TRUE, .load_opt=NULL},

606N/A {.name = NULL, .toLoad = FALSE, .load_opt=NULL}

606N/A };

98N/A

1124N/Adiff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am

1265N/Aindex a5be3ae..02a6d0d 100644

1124N/A--- a/hw/xfree86/dixmods/Makefile.am

1124N/A+++ b/hw/xfree86/dixmods/Makefile.am

1265N/A@@ -65,3 +65,11 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c

1265N/A libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)

705N/A

705N/A libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c

98N/A+

98N/A+

98N/A+# Sun IA extension module additions

606N/A+extsmodule_LTLIBRARIES += libia.la

908N/A+libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA

606N/A+libia_la_LDFLAGS = -avoid-version

606N/A+libia_la_LIBADD = $(top_builddir)/IA/libIA.la

606N/A+libia_la_SOURCES = iamodule.c

1124N/Adiff --git a/mi/miinitext.c b/mi/miinitext.c

1265N/Aindex 8836992..b3c29fb 100644

1124N/A--- a/mi/miinitext.c

1124N/A+++ b/mi/miinitext.c

1088N/A@@ -94,6 +94,7 @@ SOFTWARE.

235N/A #include "micmap.h"

235N/A #include "globals.h"

235N/A

235N/A+#define SolarisIAExtension

705N/A

705N/A extern Bool noTestExtensions;

705N/A

1088N/A@@ -153,6 +154,9 @@ extern Bool noSELinuxExtension;

235N/A extern Bool noXvExtension;

235N/A #endif

705N/A extern Bool noGEExtension;

235N/A+#ifdef SolarisIAExtension

235N/A+Bool noIAExtension;

235N/A+#endif

235N/A

235N/A #ifndef XFree86LOADER

235N/A #define INITARGS void

1088N/A@@ -184,6 +188,10 @@ 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>

908N/A+#include "../IA/interactive_srv.h"

235N/A+#endif

235N/A

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

705N/A #ifdef MITSHM

1124N/A@@ -304,6 +312,9 @@ static ExtensionToggle ExtensionToggleList[] =

705N/A #ifdef XCSECURITY

705N/A { "SECURITY", &noSecurityExtension },

235N/A #endif

235N/A+#ifdef SolarisIAExtension

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

1088N/A+#endif

705N/A #ifdef RES

705N/A { "X-Resource", &noResExtension },

235N/A #endif

1124N/A@@ -470,6 +481,9 @@ InitExtensions(int argc, char *argv[])

705N/A GlxPushProvider(&__glXDRISWRastProvider);

606N/A if (!noGlxExtension) GlxExtensionInit();

235N/A #endif

235N/A+#ifdef SolarisIAExtension

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

235N/A+#endif

235N/A }

235N/A

705N/A #else /* XFree86LOADER */