--- a/open-src/xserver/xorg/IA.patch Sat Jan 10 10:35:32 2009 -0800
+++ b/open-src/xserver/xorg/IA.patch Thu Jan 15 12:55:00 2009 -0800
@@ -26,23 +26,12 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
-diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am
---- Makefile.am 2006-11-16 10:01:22.000000000 -0800
-+++ Makefile.am 2007-09-20 14:21:57.003122000 -0700
-@@ -58,6 +58,7 @@ SUBDIRS = \
- $(XTRAP_DIR) \
- $(COMPOSITE_DIR) \
- $(GLX_DIR) \
-+ IA \
- exa \
- hw
-
diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac 2007-09-20 14:21:36.871770000 -0700
-+++ configure.ac 2007-09-20 14:21:57.684612000 -0700
-@@ -783,6 +783,9 @@
- XI_INC='-I$(top_srcdir)/Xi'
- fi
+--- configure.ac 2008-10-17 15:44:42.831612000 -0700
++++ configure.ac 2008-10-17 15:44:58.744720000 -0700
+@@ -1003,6 +1003,9 @@ AC_DEFINE(XINPUT, 1, [Support X Input ex
+ XI_LIB='$(top_builddir)/Xi/libXi.la'
+ XI_INC='-I$(top_srcdir)/Xi'
+# SolarisIA extension
+IA_LIB='$(top_builddir)/IA/libIA.la'
@@ -50,82 +39,90 @@
AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
-@@ -1023,7 +1026,7 @@
+@@ -1224,7 +1227,7 @@ AC_MSG_RESULT([$XVFB])
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then
-- 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"
-+ 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"
+- 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"
++ 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"
+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
AC_SUBST([XVFB_LIBS])
- fi
-
-@@ -1039,7 +1042,7 @@
+ AC_SUBST([XVFB_SYS_LIBS])
+@@ -1242,7 +1245,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
-- 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"
-+ 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"
+- 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"
++ 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"
+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
AC_SUBST([XNEST_LIBS])
- fi
+ AC_SUBST([XNEST_SYS_LIBS])
+@@ -1962,7 +1965,7 @@ if test "$KDRIVE" = yes; then
+
+ KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
-@@ -1559,7 +1562,7 @@
- # dix os fb mi extension glx (NOTYET) damage shadow xpstubs
- #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \
- # $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
- 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"
+ 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"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
case $host_os in
*linux*)
-@@ -1866,3 +1866,6 @@ hw/xprint/config/en_US/print/Makefile
+@@ -2266,3 +2269,6 @@ hw/xprint/config/en_US/print/Makefile
hw/xprint/config/en_US/Makefile
xorg-server.pc
])
+
+# Add Sun IA extension
+AC_OUTPUT([IA/Makefile])
-diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
---- hw/xfree86/common/xf86AutoConfig.c 2006-11-16 10:01:24.000000000 -0800
-+++ hw/xfree86/common/xf86AutoConfig.c 2007-09-20 14:21:57.861184000 -0700
-@@ -51,6 +51,7 @@
- "\tLoad\t\"type1\"\n" \
- "\tLoad\t\"record\"\n" \
- "\tLoad\t\"dri\"\n" \
-+ "\tLoad\t\"IA\"\n" \
- "EndSection\n\n"
+diff -urp -x '*~' -x '*.orig' hw/dmx/Makefile.am hw/dmx/Makefile.am
+--- hw/dmx/Makefile.am 2007-10-17 07:01:23.000000000 -0700
++++ hw/dmx/Makefile.am 2008-10-17 15:44:58.745221000 -0700
+@@ -86,6 +86,7 @@ XDMX_LIBS = \
+ $(GLX_LIBS) \
+ input/libdmxinput.a \
+ config/libdmxconfig.a \
++ $(top_builddir)/IA/libIA.la \
+ $(XSERVER_LIBS)
- #define BUILTIN_DEVICE_NAME \
+ Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
---- hw/xfree86/common/xf86Config.c 2006-11-30 17:40:10.000000000 -0800
-+++ hw/xfree86/common/xf86Config.c 2007-09-20 14:21:57.862784000 -0700
-@@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli
- ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
- ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
- count = 7;
-+
-+ /* Sun addition - IA extension */
-+ ptr = xf86addNewLoadDirective(ptr, "IA", XF86_LOAD_MODULE, NULL);
-+ count++;
- }
+--- hw/xfree86/common/xf86Config.c 2008-10-10 11:12:48.000000000 -0700
++++ hw/xfree86/common/xf86Config.c 2008-10-17 15:44:58.746569000 -0700
+@@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] =
+ #ifdef DRI2
+ {.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
+ #endif
++ {.name = "ia", .toLoad = TRUE, .load_opt=NULL},
+ {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
+ };
- /*
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
+--- hw/xfree86/dixmods/Makefile.am 2008-10-10 11:12:48.000000000 -0700
++++ hw/xfree86/dixmods/Makefile.am 2008-10-17 15:44:58.747030000 -0700
+@@ -112,3 +112,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
++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' Makefile.am Makefile.am
+--- Makefile.am 2008-10-10 11:12:48.000000000 -0700
++++ Makefile.am 2008-10-17 15:44:58.741284000 -0700
+@@ -58,6 +58,7 @@ SUBDIRS = \
+ $(XTRAP_DIR) \
+ $(COMPOSITE_DIR) \
+ $(GLX_DIR) \
++ IA \
+ exa \
+ config \
+ hw
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
+--- mi/miinitext.c 2008-10-10 11:12:48.000000000 -0700
++++ mi/miinitext.c 2008-10-17 15:44:58.747720000 -0700
@@ -84,6 +84,8 @@ SOFTWARE.
#include "micmap.h"
#include "globals.h"
@@ -143,7 +140,7 @@
#else
#ifndef LOADABLEPRINTDDX
#undef XPRINT
-@@ -215,6 +218,9 @@ extern Bool noXIdleExtension;
+@@ -221,6 +224,9 @@ extern Bool noSELinuxExtension;
#ifdef XV
extern Bool noXvExtension;
#endif
@@ -153,7 +150,7 @@
#ifndef XFree86LOADER
#define INITARGS void
-@@ -257,6 +263,9 @@ typedef void (*InitExtension)(INITARGS);
+@@ -263,6 +269,9 @@ typedef void (*InitExtension)(INITARGS);
#ifdef RES
#include <X11/extensions/XResproto.h>
#endif
@@ -163,7 +160,7 @@
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef EVI
-@@ -384,6 +393,9 @@ extern void DamageExtensionInit(INITARGS
+@@ -386,6 +395,9 @@ extern void DamageExtensionInit(INITARGS
#ifdef COMPOSITE
extern void CompositeExtensionInit(INITARGS);
#endif
@@ -173,7 +170,7 @@
/* The following is only a small first step towards run-time
* configurable extensions.
-@@ -447,6 +459,9 @@ static ExtensionToggle ExtensionToggleLi
+@@ -449,6 +461,9 @@ static ExtensionToggle ExtensionToggleLi
#ifdef XSYNC
{ "SYNC", &noSyncExtension },
#endif
@@ -183,9 +180,9 @@
#ifdef TOGCUP
{ "TOG-CUP", &noXcupExtension },
#endif
-@@ -663,6 +678,9 @@ InitExtensions(argc, argv)
- #ifdef DAMAGE
- if (!noDamageExtension) DamageExtensionInit();
+@@ -664,6 +679,9 @@ InitExtensions(argc, argv)
+ GlxPushProvider(&__glXDRISWRastProvider);
+ if (!noGlxExtension) GlxExtensionInit();
#endif
+#ifdef SolarisIAExtension
+ if (!noIAExtension) IAExtensionInit();
@@ -193,13 +190,3 @@
}
void
---- hw/dmx/Makefile.am.orig 2008-01-13 23:02:37.956946569 -0700
-+++ hw/dmx/Makefile.am 2008-01-13 23:01:59.409213790 -0700
-@@ -82,6 +82,7 @@
- $(GLX_LIBS) \
- input/libdmxinput.a \
- config/libdmxconfig.a \
-+ $(top_builddir)/IA/libIA.la \
- @DMXMODULES_LIBS@
-
- Xdmx_CFLAGS = \