xserver/xorg/IA.patch

	IA.patch revision 235
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# Use subject to license terms.
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi#
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# Permission is hereby granted, free of charge, to any person obtaining a
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# copy of this software and associated documentation files (the
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# "Software"), to deal in the Software without restriction, including
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# without limitation the rights to use, copy, modify, merge, publish,
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# distribute, and/or sell copies of the Software, and to permit persons
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# to whom the Software is furnished to do so, provided that the above
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# copyright notice(s) and this permission notice appear in all copies of
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# the Software and that both the above copyright notice(s) and this
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# permission notice appear in supporting documentation.
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi#
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi#
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# Except as contained in this notice, the name of a copyright holder
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# shall not be used in advertising or otherwise to promote the sale, use
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# or other dealings in this Software without prior written authorization
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi# of the copyright holder.
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchidiff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi--- Makefile.am 2006-11-16 10:01:22.000000000 -0800
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+++ Makefile.am 2007-09-20 14:21:57.003122000 -0700
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -58,6 +58,7 @@ SUBDIRS = \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    $(XTRAP_DIR) \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    $(COMPOSITE_DIR) \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    $(GLX_DIR) \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+   IA \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    exa \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    hw
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchidiff -urp -x '*~' -x '*.orig' configure.ac configure.ac
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi--- configure.ac    2007-09-20 14:21:36.871770000 -0700
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+++ configure.ac    2007-09-20 14:21:57.684612000 -0700
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -783,6 +783,9 @@
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    XI_INC='-I$(top_srcdir)/Xi'
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi fi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+# SolarisIA extension
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+IA_LIB='$(top_builddir)/IA/libIA.la'
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -1023,7 +1026,7 @@
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi if test "x$XVFB" = xyes; then
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi-   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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+   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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    AC_SUBST([XVFB_LIBS])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi fi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -1039,7 +1042,7 @@
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi if test "x$XNEST" = xyes; then
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi-   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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+   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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    AC_SUBST([XNEST_LIBS])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi fi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -1559,7 +1562,7 @@
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi     # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi     #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi     #    $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi-    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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+    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"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi     case $host_os in
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    *linux*)
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -1866,3 +1866,6 @@ hw/xprint/config/en_US/print/Makefile
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi hw/xprint/config/en_US/Makefile
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi xorg-server.pc
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi ])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+# Add Sun IA extension
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+AC_OUTPUT([IA/Makefile])
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchidiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi--- hw/xfree86/common/xf86AutoConfig.c  2006-11-16 10:01:24.000000000 -0800
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+++ hw/xfree86/common/xf86AutoConfig.c  2007-09-20 14:21:57.861184000 -0700
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -51,6 +51,7 @@
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    "\tLoad\t\"type1\"\n" \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    "\tLoad\t\"record\"\n" \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    "\tLoad\t\"dri\"\n" \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+   "\tLoad\t\"IA\"\n" \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    "EndSection\n\n"
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi #define BUILTIN_DEVICE_NAME \
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchidiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi--- hw/xfree86/common/xf86Config.c  2006-11-30 17:40:10.000000000 -0800
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi+++ hw/xfree86/common/xf86Config.c  2007-09-20 14:21:57.862784000 -0700
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi@@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
fc2512cfb727d49529d8ed99164db871f4829b73Robert Mustacchi    count = 7;
+
+   /* Sun addition - IA extension */
+   ptr = xf86addNewLoadDirective(ptr, "IA", XF86_LOAD_MODULE, NULL);
+   count++;
     }

     /*
diff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
--- hw/xfree86/dixmods/Makefile.am  2006-11-16 10:01:24.000000000 -0800
+++ hw/xfree86/dixmods/Makefile.am  2007-09-20 14:21:57.863164000 -0700
@@ -102,3 +102,10 @@ libxorgxkb_la_LIBADD = $(top_builddir)/d
 libxtrap_la_LDFLAGS = -avoid-version
 libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
 libxtrap_la_SOURCES = xf86XTrapModule.c
+
+
+# Sun IA extension module additions
+extsmodule_LTLIBRARIES += libIA.la
+libIA_la_LDFLAGS = -avoid-version
+libIA_la_LIBADD = $(top_builddir)/IA/libIA.la
+libIA_la_SOURCES = iamodule.c
diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c
--- mi/miinitext.c  2006-11-16 10:01:26.000000000 -0800
+++ mi/miinitext.c  2007-09-20 14:21:57.965252000 -0700
@@ -84,6 +84,8 @@ SOFTWARE.
 #include "micmap.h"
 #include "globals.h"

+#define SolarisIAExtension
+
 #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
 #undef GLXEXT
 #endif
@@ -109,6 +111,7 @@ SOFTWARE.
 #undef DAMAGE
 #undef XFIXES
 #undef XEVIE
+#undef SolarisIAExtension
 #else
 #ifndef LOADABLEPRINTDDX
 #undef XPRINT
@@ -215,6 +218,9 @@ extern Bool noXIdleExtension;
 #ifdef XV
 extern Bool noXvExtension;
 #endif
+#ifdef SolarisIAExtension
+Bool noIAExtension;
+#endif

 #ifndef XFree86LOADER
 #define INITARGS void
@@ -257,6 +263,9 @@ typedef void (*InitExtension)(INITARGS);
 #ifdef RES
 #include <X11/extensions/XResproto.h>
 #endif
+#ifdef SolarisIAExtension
+#include <X11/extensions/interactive.h>
+#endif

 /* FIXME: this whole block of externs should be from the appropriate headers */
 #ifdef EVI
@@ -384,6 +393,9 @@ extern void DamageExtensionInit(INITARGS
 #ifdef COMPOSITE
 extern void CompositeExtensionInit(INITARGS);
 #endif
+#ifdef SolarisIAExtension
+extern void IAExtensionInit(void);
+#endif

 /* The following is only a small first step towards run-time
  * configurable extensions.
@@ -447,6 +459,9 @@ static ExtensionToggle ExtensionToggleLi
 #ifdef XSYNC
     { "SYNC", &noSyncExtension },
 #endif
+#ifdef SolarisIAExtension
+    { IANAME /* "SolarisIA" */, &noIAExtension },
+#endif
 #ifdef TOGCUP
     { "TOG-CUP", &noXcupExtension },
 #endif
@@ -663,6 +678,9 @@ InitExtensions(argc, argv)
 #ifdef DAMAGE
     if (!noDamageExtension) DamageExtensionInit();
 #endif
+#ifdef SolarisIAExtension
+    if (!noIAExtension) IAExtensionInit();
+#endif
 }

 void