IA.patch revision 98
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' Makefile.am Makefile.am
98N/A--- Makefile.am 2006-12-01 14:48:41.000000000 -0800
98N/A+++ Makefile.am 2007-01-18 08:22:59.519005000 -0800
98N/A@@ -58,6 +58,7 @@ SUBDIRS = \
98N/A $(XTRAP_DIR) \
98N/A $(COMPOSITE_DIR) \
98N/A $(GLX_DIR) \
98N/A+ IA \
98N/A exa \
98N/A hw
98N/A
98N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac
98N/A--- configure.ac 2007-01-18 08:22:44.595715000 -0800
98N/A+++ configure.ac 2007-01-18 08:22:59.518766000 -0800
98N/A@@ -1867,3 +1867,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])
98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
98N/A--- hw/xfree86/common/xf86AutoConfig.c 2006-12-01 08:15:54.000000000 -0800
98N/A+++ hw/xfree86/common/xf86AutoConfig.c 2007-01-18 08:22:59.515973000 -0800
98N/A@@ -51,6 +51,7 @@
98N/A "\tLoad\t\"type1\"\n" \
98N/A "\tLoad\t\"record\"\n" \
98N/A "\tLoad\t\"dri\"\n" \
98N/A+ "\tLoad\t\"IA\"\n" \
98N/A "EndSection\n\n"
98N/A
98N/A #define BUILTIN_DEVICE_NAME \
98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
98N/A--- hw/xfree86/common/xf86Config.c 2006-12-01 14:48:41.000000000 -0800
98N/A+++ hw/xfree86/common/xf86Config.c 2007-01-18 08:22:59.517641000 -0800
98N/A@@ -294,6 +294,10 @@ xf86ModulelistFromConfig(pointer **optli
98N/A ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
98N/A ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
98N/A count = 7;
98N/A+
98N/A+ /* Sun addition - IA extension */
98N/A+ ptr = xf86addNewLoadDirective(ptr, "IA", XF86_LOAD_MODULE, NULL);
98N/A+ count++;
98N/A }
98N/A
98N/A /*
98N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am
98N/A--- hw/xfree86/dixmods/Makefile.am 2006-12-01 14:48:41.000000000 -0800
98N/A+++ hw/xfree86/dixmods/Makefile.am 2007-01-18 08:22:59.769629000 -0800
98N/A@@ -102,3 +102,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
98N/A+extsmodule_LTLIBRARIES += libIA.la
98N/A+libIA_la_LDFLAGS = -avoid-version
98N/A+libIA_la_LIBADD = $(top_builddir)/IA/libIA.la
98N/A+libIA_la_SOURCES = iamodule.c