IA.patch revision 851
705N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
851N/A# Use is 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
705N/Adiff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
851N/A--- Makefile.am 2009-11-24 21:25:15.000000000 -0800
851N/A+++ Makefile.am 2009-12-02 18:57:55.879547825 -0800
705N/A@@ -36,6 +36,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 \
98N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac
851N/A--- configure.ac 2009-12-02 18:57:54.176548474 -0800
851N/A+++ configure.ac 2009-12-02 18:57:55.880850520 -0800
851N/A@@ -1082,6 +1082,10 @@ MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/
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)
851N/A@@ -2115,3 +2119,6 @@ test/Makefile
851N/A test/xi2/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/xf86Config.c hw/xfree86/common/xf86Config.c
851N/A--- hw/xfree86/common/xf86Config.c 2009-12-02 18:57:53.999906206 -0800
851N/A+++ hw/xfree86/common/xf86Config.c 2009-12-02 18:57:55.881970262 -0800
851N/A@@ -123,6 +123,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
98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
851N/A--- hw/xfree86/dixmods/Makefile.am 2009-10-30 21:19:51.000000000 -0700
851N/A+++ hw/xfree86/dixmods/Makefile.am 2009-12-02 18:57:55.882261006 -0800
705N/A@@ -66,3 +66,10 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $
705N/A
705N/A libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
705N/A libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
98N/A+
98N/A+
98N/A+# Sun IA extension module additions
606N/A+extsmodule_LTLIBRARIES += libia.la
606N/A+libia_la_LDFLAGS = -avoid-version
606N/A+libia_la_LIBADD = $(top_builddir)/IA/libIA.la
606N/A+libia_la_SOURCES = iamodule.c
235N/Adiff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
851N/A--- mi/miinitext.c 2009-11-22 16:33:40.000000000 -0800
851N/A+++ mi/miinitext.c 2009-12-02 18:57:55.882784783 -0800
851N/A@@ -95,6 +95,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
851N/A@@ -159,6 +160,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
851N/A@@ -190,6 +194,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 */
705N/A #ifdef MITSHM
851N/A@@ -274,6 +281,9 @@ extern void DamageExtensionInit(INITARGS
235N/A extern void CompositeExtensionInit(INITARGS);
235N/A #endif
705N/A extern void GEExtensionInit(INITARGS);
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.
851N/A@@ -320,6 +330,9 @@ static ExtensionToggle ExtensionToggleLi
705N/A #ifdef XCSECURITY
705N/A { "SECURITY", &noSecurityExtension },
235N/A #endif
235N/A+#ifdef SolarisIAExtension
235N/A+ { IANAME /* "SolarisIA" */, &noIAExtension },
235N/A+#endif
705N/A #ifdef RES
705N/A { "X-Resource", &noResExtension },
235N/A #endif
851N/A@@ -493,6 +506,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 */