--- a/open-src/driver/Makefile Fri Aug 10 16:53:07 2007 -0700
+++ b/open-src/driver/Makefile Fri Aug 10 16:56:14 2007 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.6 07/05/18
+# @(#)Makefile 1.7 07/08/10
#
###############################################################################
@@ -71,7 +71,7 @@
xf86-video-glint \
xf86-video-i128 \
xf86-video-i740 \
- xf86-video-i810 \
+ xf86-video-intel \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nsc \
--- a/open-src/driver/xf86-video-i810/6484688.patch Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-
-6484688: auto-config: i810: "680x480" on display when monitor is not properly probed
-
-diff -urp -x '*~' src/i830_driver.c src/i830_driver.c
---- src/i830_driver.c 2006-12-07 01:43:21.000000000 -0800
-+++ src/i830_driver.c 2006-12-20 10:09:25.130110000 -0800
-@@ -5176,7 +5176,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int f
- * used through the common layer.
- */
- #define DEFAULT_HSYNC_LO 28
--#define DEFAULT_HSYNC_HI 33
-+#define DEFAULT_HSYNC_HI 60
- #define DEFAULT_VREFRESH_LO 43
- #define DEFAULT_VREFRESH_HI 72
-
--- a/open-src/driver/xf86-video-i810/6538497_6554161.patch Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
---- src/i830_dri.h Tue Jan 9 22:05:04 2007
-+++ src/i830_dri.h Wed Apr 4 10:16:29 2007
-@@ -22,16 +22,20 @@
- drm_handle_t unused2; /* backbuffer */
-
- drmSize unused3; /* depthbufferSize */
-+ drmSize pad0;
- drm_handle_t unused4; /* depthbuffer */
-
- drmSize unused5; /* rotatedSize /*/
-+ drmSize pad1;
- drm_handle_t unused6; /* rotatedbuffer */
-
- drm_handle_t unused7; /* textures */
- int unused8; /* textureSize */
-+ drmSize pad2;
-
- drm_handle_t unused9; /* agp_buffers */
- drmSize unused10; /* agp_buf_size */
-+ drmSize pad3;
-
- int deviceID;
- int width;
-
---- src/i830_common.h Fri Sep 29 15:47:07 2006
-+++ src/i830_common.h Wed Apr 4 10:15:54 2007
-@@ -92,6 +92,7 @@
- int pf_current_page; /* which buffer is being displayed? */
- int perf_boxes; /* performance boxes to be displayed */
- int width, height; /* screen size in pixels */
-+ int pad0;
-
- drm_handle_t front_handle;
- int front_offset;
-
---- src/i830_randr.c Wed Dec 13 23:42:14 2006
-+++ src/i830_randr.c Thu Apr 26 09:22:38 2007
-@@ -182,6 +182,11 @@
- /* Reset, just so we ensure the drivers SwitchMode is called */
- scrp->currentMode = NULL;
- }
-+#if defined(__sun)
-+ else {
-+ currentMode = scrp->currentMode;
-+ }
-+#endif
- /*
- * We know that if the driver failed to SwitchMode to the rotated
- * version, then it should revert back to it's prior mode.
--- a/open-src/driver/xf86-video-i810/6559710.patch Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- src/i830_randr.c Wed May 30 10:33:16 2007
-+++ src/i830_randr.c Wed May 30 10:32:58 2007
-@@ -339,6 +339,12 @@
- xfree (randrp);
- return FALSE;
- }
-+
-+ if (i830RandRIndex == rrPrivIndex)
-+ {
-+ i830RandRIndex = AllocateScreenPrivateIndex();
-+ }
-+
- rp = rrGetScrPriv(pScreen);
- rp->rrGetInfo = I830RandRGetInfo;
- rp->rrSetConfig = I830RandRSetConfig;
--- a/open-src/driver/xf86-video-i810/Makefile Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-###############################################################################
-#
-# xf86-video-i810 Makefile
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# @(#)Makefile 1.10 07/07/25
-#
-
-# Package name used in tarballs
-DRIVER_NAME=xf86-video-i810
-
-# Version number (used in path names)
-DRIVER_VERS=1.7.4
-
-# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=6484688.patch build-dri.patch libraries.patch \
- 6538497_6554161.patch \
- 6559710.patch
-
-# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=man/*.man
-SUNTOUCH_MAN_FLAGS= \
- -a '{Architecture, x86} {Availability, SUNWxorg-graphics-ddx} {Interface Stability, Volatile}'
-
-DRIVER_CONFIG_OPTS=--with-xorg-sdk-dir=$(PROTODIR)/usr/X11/include/xorg
-
-# Libraries/modules to link with
-DRIVER_ADD_LIBS= \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR)/extensions \
- -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
- -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
-
-include ../Makefile.inc
-
-source_gen:: $(UNPACK_TARGET) autoreconf
-
-install_gen::
- mkdir -p $(PROTODIR)$(X11_DOC_DIR)
- cp -p $(SOURCE_DIR)/README $(PROTODIR)$(X11_DOC_DIR)/README.i810
--- a/open-src/driver/xf86-video-i810/build-dri.patch Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-
---- configure.ac 2006-12-07 01:43:28.000000000 -0800
-+++ configure.ac 2006-12-20 10:18:56.490999000 -0800
-@@ -80,7 +80,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
-
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+AC_ARG_WITH(xorg-sdk-dir,
-+ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
-+ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
-+ [sdkdir="$withval"],
-+ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
-
- # Checks for libraries.
-
-
--- a/open-src/driver/xf86-video-i810/libraries.patch Fri Aug 10 16:53:07 2007 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- src/Makefile.am 2006-12-07 01:43:21.000000000 -0800
-+++ src/Makefile.am 2007-01-11 18:31:31.064210000 -0800
-@@ -86,3 +86,9 @@
- EXTRA_DIST = \
- packed_yuv_sf.g4a \
- packed_yuv_wm.g4a
-+
-+
-+# Add libraries needed by driver module
-+i810_drv_la_LDFLAGS += \
-+ -ldrm -lfb -lint10 -lshadow -lshadowfb \
-+ -lvbe -lvgahw -lxaa -ldri -lglx -lXfont -lm
-
---- src/xvmc/Makefile.am 2006-09-28 07:48:32.000000000 -0700
-+++ src/xvmc/Makefile.am 2007-01-11 16:57:43.077171000 -0800
-@@ -4,5 +4,7 @@
- I810XvMC.h
-
- libI810XvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
--libI810XvMC_la_LDFLAGS = -version-number 1:0:0
--endif
-\ No newline at end of file
-+libI810XvMC_la_LDFLAGS = -version-number 1:0:0 \
-+ -lXvMC -lXv -lX11 -ldrm
-+endif
-+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/6538497_6554161.patch Fri Aug 10 16:56:14 2007 -0700
@@ -0,0 +1,48 @@
+--- src/i830_dri.h Tue May 22 10:57:01 2007
++++ src/i830_dri.h Tue May 22 10:57:57 2007
+@@ -22,16 +22,20 @@
+ drm_handle_t unused2; /* backbuffer */
+
+ drmSize unused3; /* depthbufferSize */
++ drmSize pad0;
+ drm_handle_t unused4; /* depthbuffer */
+
+- drmSize unused5; /* rotatedSize /*/
++ drmSize unused5; /* rotatedSize */
++ drmSize pad1;
+ drm_handle_t unused6; /* rotatedbuffer */
+
+ drm_handle_t unused7; /* textures */
+ int unused8; /* textureSize */
++ drmSize pad2;
+
+ drm_handle_t unused9; /* agp_buffers */
+ drmSize unused10; /* agp_buf_size */
++ drmSize pad3;
+
+ int deviceID;
+ int width;
+--- src/i830_common.h Tue May 22 10:58:16 2007
++++ src/i830_common.h Tue May 22 10:58:40 2007
+@@ -92,6 +92,7 @@
+ int pf_current_page; /* which buffer is being displayed? */
+ int perf_boxes; /* performance boxes to be displayed */
+ int width, height; /* screen size in pixels */
++ int pad0;
+
+ drm_handle_t front_handle;
+ int front_offset;
+--- src/modes/xf86RandR12.c Tue May 22 10:59:52 2007
++++ src/modes/xf86RandR12.c Tue May 22 11:00:45 2007
+@@ -207,6 +207,11 @@
+ /* Reset, just so we ensure the drivers SwitchMode is called */
+ scrp->currentMode = NULL;
+ }
++#if defined (__sun)
++ else {
++ currentMode = scrp->currentMode;
++ }
++#endif
+ /*
+ * We know that if the driver failed to SwitchMode to the rotated
+ * version, then it should revert back to it's prior mode.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/Makefile Fri Aug 10 16:56:14 2007 -0700
@@ -0,0 +1,70 @@
+###############################################################################
+#
+# xf86-video-intel Makefile
+#
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.11 07/08/10
+#
+
+# Package name used in tarballs
+DRIVER_NAME=xf86-video-intel
+
+# Version number (used in path names)
+DRIVER_VERS=2.1.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= build-dri.patch libraries.patch \
+ 6538497_6554161.patch
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Architecture, x86} {Availability, SUNWxorg-graphics-ddx} {Interface Stability, Volatile}'
+
+DRIVER_CONFIG_OPTS=--with-xorg-sdk-dir=$(PROTODIR)/usr/X11/include/xorg
+
+# Libraries/modules to link with
+DRIVER_ADD_LIBS= \
+ -L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+ -L$(PROTODIR)$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR)/extensions \
+ -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERMODS_DIR)$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \
+ -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
+
+include ../Makefile.inc
+
+# Need to regenerate configure & Makefile.in's after patching
+# configure.ac & Makefile.am's in libraries.patch & build-dri.patch
+$(SOURCE_DIR)/Makefile: autoreconf
+
+install_gen::
+ mkdir -p $(PROTODIR)$(X11_DOC_DIR)
+ cp -p $(SOURCE_DIR)/README $(PROTODIR)$(X11_DOC_DIR)/README.intel
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/build-dri.patch Fri Aug 10 16:56:14 2007 -0700
@@ -0,0 +1,44 @@
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac 2007-04-19 20:00:18.000000000 -0700
++++ configure.ac 2007-06-15 17:45:43.059034000 -0700
+@@ -85,7 +85,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++AC_ARG_WITH(xorg-sdk-dir,
++ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
++ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
++ [sdkdir="$withval"],
++ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
+
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0], have_pciaccess=yes, have_pciaccess=no)
+ AM_CONDITIONAL(HAVE_PCIACCESS, test "x$have_pciaccess" = xyes)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/libraries.patch Fri Aug 10 16:56:14 2007 -0700
@@ -0,0 +1,37 @@
+--- src/Makefile.am Fri May 18 16:11:28 2007
++++ src/Makefile.am Mon May 21 10:53:07 2007
+@@ -34,7 +34,9 @@
+ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
+
+ intel_drv_la_LTLIBRARIES = intel_drv.la
+-intel_drv_la_LDFLAGS = -module -avoid-version
++intel_drv_la_LDFLAGS = -module -avoid-version \
++ -ldrm -lfb -lint10 -lshadow -lshadowfb \
++ -lvbe -lvgahw -lxaa -lexa -ldri -lglx -lm
+ intel_drv_ladir = @moduledir@/drivers
+
+ XMODE_SRCS=\
+--- src/xvmc/Makefile.am 2007-05-18 16:24:27.389284000 +0800
++++ src/xvmc/Makefile.am 2007-05-18 16:35:43.860267000 +0800
+@@ -5,6 +5,7 @@
+
+ libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+-libI810XvMC_la_LDFLAGS = -version-number 1:0:0
++libI810XvMC_la_LDFLAGS = -version-number 1:0:0 \
++ -lXvMC -lXv -lX11 -ldrm
+ libI810XvMC_la_LIBADD = @DRI_LIBS@
+ endif
+--- src/ch7017/Makefile.am Mon May 21 11:06:12 2007
++++ src/ch7017/Makefile.am Mon May 21 11:06:27 2007
+@@ -6,7 +6,9 @@
+ AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@
+
+ ch7017_la_LTLIBRARIES = ch7017.la
+-ch7017_la_LDFLAGS = -module -avoid-version
++ch7017_la_LDFLAGS = -module -avoid-version \
++ -ldrm -lfb -lint10 -lshadow -lshadowfb \
++ -lvbe -lvgahw -lxaa -ldri -lglx -lm
+ ch7017_ladir = @moduledir@/drivers
+
+ ch7017_la_SOURCES = \
--- a/packages/SUNWxorg-doc/prototype_i386 Fri Aug 10 16:53:07 2007 -0700
+++ b/packages/SUNWxorg-doc/prototype_i386 Fri Aug 10 16:56:14 2007 -0700
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype_i386 1.11 07/05/18 SMI"
+# ident "@(#)prototype_i386 1.12 07/08/10 SMI"
#
# X.Org Foundation X server for Solaris
@@ -45,7 +45,7 @@
f none X11/share/doc/README.chips 0444 root bin
f none X11/share/doc/README.cyrix 0444 root bin
f none X11/share/doc/README.i740 0444 root bin
-f none X11/share/doc/README.i810 0444 root bin
+f none X11/share/doc/README.intel 0444 root bin
f none X11/share/doc/README.r128 0444 root bin
f none X11/share/doc/README.rapidaccess 0444 root bin
f none X11/share/doc/README.rendition 0444 root bin
@@ -65,6 +65,7 @@
f none X11/share/man/man7/i128.7 0444 root bin
f none X11/share/man/man7/i740.7 0444 root bin
f none X11/share/man/man7/i810.7 0444 root bin
+f none X11/share/man/man7/intel.7 0444 root bin
f none X11/share/man/man7/mga.7 0444 root bin
f none X11/share/man/man7/microtouch.7 0444 root bin
f none X11/share/man/man7/mutouch.7 0444 root bin
--- a/packages/SUNWxorg-graphics-ddx/prototype_i386 Fri Aug 10 16:53:07 2007 -0700
+++ b/packages/SUNWxorg-graphics-ddx/prototype_i386 Fri Aug 10 16:56:14 2007 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_i386 1.13 07/07/20 SMI"
+# ident "@(#)prototype_i386 1.14 07/08/10 SMI"
#
# X.Org Foundation X server for Solaris
@@ -59,7 +59,8 @@
f none X11/lib/modules/drivers/glint_drv.so 0755 root bin
f none X11/lib/modules/drivers/i128_drv.so 0755 root bin
f none X11/lib/modules/drivers/i740_drv.so 0755 root bin
-f none X11/lib/modules/drivers/i810_drv.so 0755 root bin
+f none X11/lib/modules/drivers/intel_drv.so 0755 root bin
+s none X11/lib/modules/drivers/i810_drv.so=intel_drv.so
f none X11/lib/modules/drivers/mga_drv.so 0755 root bin
f none X11/lib/modules/drivers/neomagic_drv.so 0755 root bin
f none X11/lib/modules/drivers/nsc_drv.so 0755 root bin
@@ -93,7 +94,8 @@
f none X11/lib/modules/drivers/amd64/vesa_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/vga_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/ast_drv.so 0755 root bin
-f none X11/lib/modules/drivers/amd64/i810_drv.so 0755 root bin
+f none X11/lib/modules/drivers/amd64/intel_drv.so 0755 root bin
+s none X11/lib/modules/drivers/amd64/i810_drv.so=intel_drv.so
f none X11/lib/modules/drivers/amd64/mga_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/nv_drv.so 0755 root bin
f none X11/lib/modules/drivers/amd64/trident_drv.so 0755 root bin