26 # or other dealings in this Software without prior written authorization |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am |
29 diff -urp -x '*~' -x '*.orig' Makefile.am Makefile.am |
30 --- Makefile.am 2006-11-16 10:01:22.000000000 -0800 |
30 --- Makefile.am 2006-11-16 10:01:22.000000000 -0800 |
31 +++ Makefile.am 2007-07-30 18:33:49.554487000 -0700 |
31 +++ Makefile.am 2007-09-20 14:21:57.003122000 -0700 |
32 @@ -58,6 +58,7 @@ SUBDIRS = \ |
32 @@ -58,6 +58,7 @@ SUBDIRS = \ |
33 $(XTRAP_DIR) \ |
33 $(XTRAP_DIR) \ |
34 $(COMPOSITE_DIR) \ |
34 $(COMPOSITE_DIR) \ |
35 $(GLX_DIR) \ |
35 $(GLX_DIR) \ |
36 + IA \ |
36 + IA \ |
37 exa \ |
37 exa \ |
38 hw |
38 hw |
39 |
39 |
40 diff -urp -x '*~' -x '*.orig' configure.ac configure.ac |
40 diff -urp -x '*~' -x '*.orig' configure.ac configure.ac |
41 --- configure.ac 2007-07-30 18:33:33.880185000 -0700 |
41 --- configure.ac 2007-09-20 14:21:36.871770000 -0700 |
42 +++ configure.ac 2007-07-30 18:33:49.575258000 -0700 |
42 +++ configure.ac 2007-09-20 14:21:57.684612000 -0700 |
43 @@ -1865,3 +1865,6 @@ hw/xprint/config/en_US/print/Makefile |
43 @@ -783,6 +783,9 @@ |
|
44 XI_INC='-I$(top_srcdir)/Xi' |
|
45 fi |
|
46 |
|
47 +# SolarisIA extension |
|
48 +IA_LIB='$(top_builddir)/IA/libIA.la' |
|
49 + |
|
50 AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes) |
|
51 |
|
52 AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) |
|
53 @@ -1023,7 +1026,7 @@ |
|
54 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) |
|
55 |
|
56 if test "x$XVFB" = xyes; then |
|
57 - 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" |
|
58 + 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" |
|
59 AC_SUBST([XVFB_LIBS]) |
|
60 fi |
|
61 |
|
62 @@ -1039,7 +1042,7 @@ |
|
63 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) |
|
64 |
|
65 if test "x$XNEST" = xyes; then |
|
66 - 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" |
|
67 + 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" |
|
68 AC_SUBST([XNEST_LIBS]) |
|
69 fi |
|
70 |
|
71 @@ -1559,7 +1562,7 @@ |
|
72 # dix os fb mi extension glx (NOTYET) damage shadow xpstubs |
|
73 #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \ |
|
74 # $MIEXT_SHADOW_LIB $XPSTUBS_LIB" |
|
75 - 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" |
|
76 + 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" |
|
77 KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' |
|
78 case $host_os in |
|
79 *linux*) |
|
80 @@ -1866,3 +1866,6 @@ hw/xprint/config/en_US/print/Makefile |
44 hw/xprint/config/en_US/Makefile |
81 hw/xprint/config/en_US/Makefile |
45 xorg-server.pc |
82 xorg-server.pc |
46 ]) |
83 ]) |
47 + |
84 + |
48 +# Add Sun IA extension |
85 +# Add Sun IA extension |
49 +AC_OUTPUT([IA/Makefile]) |
86 +AC_OUTPUT([IA/Makefile]) |
50 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c |
87 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c |
51 --- hw/xfree86/common/xf86AutoConfig.c 2006-11-16 10:01:24.000000000 -0800 |
88 --- hw/xfree86/common/xf86AutoConfig.c 2006-11-16 10:01:24.000000000 -0800 |
52 +++ hw/xfree86/common/xf86AutoConfig.c 2007-07-30 18:33:49.575752000 -0700 |
89 +++ hw/xfree86/common/xf86AutoConfig.c 2007-09-20 14:21:57.861184000 -0700 |
53 @@ -51,6 +51,7 @@ |
90 @@ -51,6 +51,7 @@ |
54 "\tLoad\t\"type1\"\n" \ |
91 "\tLoad\t\"type1\"\n" \ |
55 "\tLoad\t\"record\"\n" \ |
92 "\tLoad\t\"record\"\n" \ |
56 "\tLoad\t\"dri\"\n" \ |
93 "\tLoad\t\"dri\"\n" \ |
57 + "\tLoad\t\"IA\"\n" \ |
94 + "\tLoad\t\"IA\"\n" \ |
58 "EndSection\n\n" |
95 "EndSection\n\n" |
59 |
96 |
60 #define BUILTIN_DEVICE_NAME \ |
97 #define BUILTIN_DEVICE_NAME \ |
61 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
98 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
62 --- hw/xfree86/common/xf86Config.c 2006-11-30 17:40:10.000000000 -0800 |
99 --- hw/xfree86/common/xf86Config.c 2006-11-30 17:40:10.000000000 -0800 |
63 +++ hw/xfree86/common/xf86Config.c 2007-07-30 18:33:49.577216000 -0700 |
100 +++ hw/xfree86/common/xf86Config.c 2007-09-20 14:21:57.862784000 -0700 |
64 @@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli |
101 @@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli |
65 ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL); |
102 ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL); |
66 ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL); |
103 ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL); |
67 count = 7; |
104 count = 7; |
68 + |
105 + |
84 +# Sun IA extension module additions |
121 +# Sun IA extension module additions |
85 +extsmodule_LTLIBRARIES += libIA.la |
122 +extsmodule_LTLIBRARIES += libIA.la |
86 +libIA_la_LDFLAGS = -avoid-version |
123 +libIA_la_LDFLAGS = -avoid-version |
87 +libIA_la_LIBADD = $(top_builddir)/IA/libIA.la |
124 +libIA_la_LIBADD = $(top_builddir)/IA/libIA.la |
88 +libIA_la_SOURCES = iamodule.c |
125 +libIA_la_SOURCES = iamodule.c |
|
126 diff -urp -x '*~' -x '*.orig' mi/miinitext.c mi/miinitext.c |
|
127 --- mi/miinitext.c 2006-11-16 10:01:26.000000000 -0800 |
|
128 +++ mi/miinitext.c 2007-09-20 14:21:57.965252000 -0700 |
|
129 @@ -84,6 +84,8 @@ SOFTWARE. |
|
130 #include "micmap.h" |
|
131 #include "globals.h" |
|
132 |
|
133 +#define SolarisIAExtension |
|
134 + |
|
135 #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */ |
|
136 #undef GLXEXT |
|
137 #endif |
|
138 @@ -109,6 +111,7 @@ SOFTWARE. |
|
139 #undef DAMAGE |
|
140 #undef XFIXES |
|
141 #undef XEVIE |
|
142 +#undef SolarisIAExtension |
|
143 #else |
|
144 #ifndef LOADABLEPRINTDDX |
|
145 #undef XPRINT |
|
146 @@ -215,6 +218,9 @@ extern Bool noXIdleExtension; |
|
147 #ifdef XV |
|
148 extern Bool noXvExtension; |
|
149 #endif |
|
150 +#ifdef SolarisIAExtension |
|
151 +Bool noIAExtension; |
|
152 +#endif |
|
153 |
|
154 #ifndef XFree86LOADER |
|
155 #define INITARGS void |
|
156 @@ -257,6 +263,9 @@ typedef void (*InitExtension)(INITARGS); |
|
157 #ifdef RES |
|
158 #include <X11/extensions/XResproto.h> |
|
159 #endif |
|
160 +#ifdef SolarisIAExtension |
|
161 +#include <X11/extensions/interactive.h> |
|
162 +#endif |
|
163 |
|
164 /* FIXME: this whole block of externs should be from the appropriate headers */ |
|
165 #ifdef EVI |
|
166 @@ -384,6 +393,9 @@ extern void DamageExtensionInit(INITARGS |
|
167 #ifdef COMPOSITE |
|
168 extern void CompositeExtensionInit(INITARGS); |
|
169 #endif |
|
170 +#ifdef SolarisIAExtension |
|
171 +extern void IAExtensionInit(void); |
|
172 +#endif |
|
173 |
|
174 /* The following is only a small first step towards run-time |
|
175 * configurable extensions. |
|
176 @@ -447,6 +459,9 @@ static ExtensionToggle ExtensionToggleLi |
|
177 #ifdef XSYNC |
|
178 { "SYNC", &noSyncExtension }, |
|
179 #endif |
|
180 +#ifdef SolarisIAExtension |
|
181 + { IANAME /* "SolarisIA" */, &noIAExtension }, |
|
182 +#endif |
|
183 #ifdef TOGCUP |
|
184 { "TOG-CUP", &noXcupExtension }, |
|
185 #endif |
|
186 @@ -663,6 +678,9 @@ InitExtensions(argc, argv) |
|
187 #ifdef DAMAGE |
|
188 if (!noDamageExtension) DamageExtensionInit(); |
|
189 #endif |
|
190 +#ifdef SolarisIAExtension |
|
191 + if (!noIAExtension) IAExtensionInit(); |
|
192 +#endif |
|
193 } |
|
194 |
|
195 void |