IA.patch revision 606
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' configure.ac configure.ac
606N/A--- configure.ac 2008-10-17 15:44:42.831612000 -0700
606N/A+++ configure.ac 2008-10-17 15:44:58.744720000 -0700
606N/A@@ -1003,6 +1003,9 @@ AC_DEFINE(XINPUT, 1, [Support X Input ex
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'
235N/A+
235N/A AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
235N/A
235N/A AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
606N/A@@ -1224,7 +1227,7 @@ AC_MSG_RESULT([$XVFB])
235N/A AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
235N/A
235N/A if test "x$XVFB" = xyes; then
606N/A- 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"
606N/A+ 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"
606N/A XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
235N/A AC_SUBST([XVFB_LIBS])
606N/A AC_SUBST([XVFB_SYS_LIBS])
606N/A@@ -1242,7 +1245,7 @@ AC_MSG_RESULT([$XNEST])
235N/A AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
235N/A
235N/A if test "x$XNEST" = xyes; then
606N/A- 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"
606N/A+ 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"
606N/A XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
235N/A AC_SUBST([XNEST_LIBS])
606N/A AC_SUBST([XNEST_SYS_LIBS])
606N/A@@ -1962,7 +1965,7 @@ if test "$KDRIVE" = yes; then
606N/A
606N/A KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
235N/A
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*)
606N/A@@ -2266,3 +2269,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])
606N/Adiff -urp -x '*~' -x '*.orig' hw/dmx/Makefile.am hw/dmx/Makefile.am
606N/A--- hw/dmx/Makefile.am 2007-10-17 07:01:23.000000000 -0700
606N/A+++ hw/dmx/Makefile.am 2008-10-17 15:44:58.745221000 -0700
606N/A@@ -86,6 +86,7 @@ XDMX_LIBS = \
606N/A $(GLX_LIBS) \
606N/A input/libdmxinput.a \
606N/A config/libdmxconfig.a \
606N/A+ $(top_builddir)/IA/libIA.la \
606N/A $(XSERVER_LIBS)
98N/A
606N/A Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
606N/A--- hw/xfree86/common/xf86Config.c 2008-10-10 11:12:48.000000000 -0700
606N/A+++ hw/xfree86/common/xf86Config.c 2008-10-17 15:44:58.746569000 -0700
606N/A@@ -126,6 +126,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
606N/A--- hw/xfree86/dixmods/Makefile.am 2008-10-10 11:12:48.000000000 -0700
606N/A+++ hw/xfree86/dixmods/Makefile.am 2008-10-17 15:44:58.747030000 -0700
606N/A@@ -112,3 +112,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
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
606N/Adiff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
606N/A--- Makefile.am 2008-10-10 11:12:48.000000000 -0700
606N/A+++ Makefile.am 2008-10-17 15:44:58.741284000 -0700
606N/A@@ -58,6 +58,7 @@ SUBDIRS = \
606N/A $(XTRAP_DIR) \
606N/A $(COMPOSITE_DIR) \
606N/A $(GLX_DIR) \
606N/A+ IA \
606N/A exa \
606N/A config \
606N/A hw
235N/Adiff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
606N/A--- mi/miinitext.c 2008-10-10 11:12:48.000000000 -0700
606N/A+++ mi/miinitext.c 2008-10-17 15:44:58.747720000 -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
606N/A@@ -221,6 +224,9 @@ extern Bool noSELinuxExtension;
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
606N/A@@ -263,6 +269,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
606N/A@@ -386,6 +395,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.
606N/A@@ -449,6 +461,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
606N/A@@ -664,6 +679,9 @@ InitExtensions(argc, argv)
606N/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
235N/A void