xserver/xorg/IA.patch

	IA.patch revision 705
705N/A# Copyright 2009 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
705N/Adiff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
705N/A--- Makefile.am 2009-04-14 10:14:56.000000000 -0700
705N/A+++ Makefile.am 2009-05-08 17:43:31.905647000 -0700
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 \
705N/A    hw
98N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac
705N/A--- configure.ac    2009-05-08 17:43:23.621871000 -0700
705N/A+++ configure.ac    2009-05-08 17:43:31.908445000 -0700
705N/A@@ -1009,6 +1009,9 @@ 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'
235N/A+
235N/A AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
235N/A
235N/A AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
705N/A@@ -1252,7 +1255,7 @@ AC_MSG_RESULT([$XVFB])
235N/A AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
235N/A
235N/A if test "x$XVFB" = xyes; then
705N/A-   XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
705N/A+   XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $IA_LIB"
705N/A    XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
235N/A    AC_SUBST([XVFB_LIBS])
606N/A    AC_SUBST([XVFB_SYS_LIBS])
705N/A@@ -1270,7 +1273,7 @@ AC_MSG_RESULT([$XNEST])
235N/A AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
235N/A
235N/A if test "x$XNEST" = xyes; then
705N/A-   XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
705N/A+   XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $IA_LIB"
705N/A    XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
235N/A    AC_SUBST([XNEST_LIBS])
606N/A    AC_SUBST([XNEST_SYS_LIBS])
705N/A@@ -1773,7 +1776,7 @@ if test "$KDRIVE" = yes; then
606N/A
606N/A     KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
235N/A
705N/A-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
705N/A+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_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*)
705N/A@@ -1930,3 +1933,6 @@ hw/kdrive/sdl/Makefile
705N/A hw/kdrive/src/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
705N/A--- hw/dmx/Makefile.am  2009-04-14 10:14:56.000000000 -0700
705N/A+++ hw/dmx/Makefile.am  2009-05-08 17:43:31.909047000 -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
705N/A--- hw/xfree86/common/xf86Config.c  2009-05-08 17:43:23.432853000 -0700
705N/A+++ hw/xfree86/common/xf86Config.c  2009-05-08 17:43:31.911031000 -0700
705N/A@@ -121,6 +121,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
705N/A--- hw/xfree86/dixmods/Makefile.am  2008-12-16 14:43:11.000000000 -0800
705N/A+++ hw/xfree86/dixmods/Makefile.am  2009-05-08 17:43:31.912778000 -0700
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
705N/A--- mi/miinitext.c  2009-04-14 10:14:57.000000000 -0700
705N/A+++ mi/miinitext.c  2009-05-08 17:43:31.913906000 -0700
705N/A@@ -83,6 +83,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
705N/A@@ -151,6 +152,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
705N/A@@ -186,6 +190,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
705N/A@@ -272,6 +279,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.
705N/A@@ -318,6 +328,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
705N/A@@ -477,6 +490,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 */