--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-i810/6538497_6554161.patch	Tue May 15 18:59:31 2007 -0700
@@ -0,0 +1,49 @@
+--- 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/Makefile	Tue May 15 17:52:17 2007 -0700
+++ b/open-src/driver/xf86-video-i810/Makefile	Tue May 15 18:59:31 2007 -0700
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.7	07/01/31
+# @(#)Makefile	1.8	07/05/08
 #
 
 # Package name used in tarballs
@@ -40,7 +40,8 @@
 DRIVER_VERS=1.7.4
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=6484688.patch build-dri.patch libraries.patch
+SOURCE_PATCHES=6484688.patch build-dri.patch libraries.patch \
+		6538497_6554161.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/6538497.patch	Tue May 15 18:59:31 2007 -0700
@@ -0,0 +1,35 @@
+--- src/mesa/drivers/dri/i915/server/i830_common.h	Fri Sep 29 00:42:14 2006
++++ src/mesa/drivers/dri/i915/server/i830_common.h	Wed Apr  4 09:59:55 2007
+@@ -89,6 +89,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/mesa/drivers/dri/i915/server/i830_dri.h	Mon Jan 23 18:10:49 2006
++++ src/mesa/drivers/dri/i915/server/i830_dri.h	Wed Apr  4 10:04:50 2007
+@@ -22,16 +22,20 @@
+    drm_handle_t backbuffer;
+ 
+    drmSize depthbufferSize;
++   drmSize pad0;
+    drm_handle_t depthbuffer;
+ 
+    drmSize rotatedSize;
++   drmSize pad1;
+    drm_handle_t rotatedbuffer;
+ 
+    drm_handle_t textures;
+    int textureSize;
++   drmSize pad2;
+ 
+    drm_handle_t agp_buffers;
+    drmSize agp_buf_size;
++   drmSize pad3;
+ 
+    int deviceID;
+    int width;

--- a/open-src/lib/mesa/Makefile	Tue May 15 17:52:17 2007 -0700
+++ b/open-src/lib/mesa/Makefile	Tue May 15 18:59:31 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/15
+# @(#)Makefile	1.7	07/05/16
 #
 
 PWD:sh=pwd
@@ -53,7 +53,8 @@
 	solaris-paths.patch	\
 	mklib.patch		\
 	solaris-dri-port.patch	\
-	glext.h.patch
+	glext.h.patch           \
+	6538497.patch
 
 # Directory created by unpacking source
 SOURCE_DIR=$(BUILD_DIR)/Mesa-$(MESA_VERS)

--- a/open-src/xserver/xorg/Makefile	Tue May 15 17:52:17 2007 -0700
+++ b/open-src/xserver/xorg/Makefile	Tue May 15 18:59:31 2007 -0700
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.41	07/05/15
+# @(#)Makefile	1.42	07/05/16
 #
 
 PWD:sh=pwd
@@ -97,7 +97,8 @@
 	xf86ModesAdd.patch \
 	lg3d.patch \
 	6535006.patch \
-	6540484.patch
+	6540484.patch \
+	signal-handler.patch
 
 # Directory created by unpacking source
 SOURCE_DIR=$(BUILD_DIR)/$(MODULE_NAME)-$(XORGSERVER_VERS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/signal-handler.patch	Tue May 15 18:59:31 2007 -0700
@@ -0,0 +1,24 @@
+--- hw/xfree86/dri/dri.c	Tue Jan 23 13:39:16 2007
++++ hw/xfree86/dri/dri.c	Tue Mar 27 10:07:00 2007
+@@ -2158,7 +2158,11 @@
+     entry     = drmGetEntry(fd);
+     entry->f  = f;
+ 
++#if defined(__sun) && defined(__SVR4)
++    return 1;
++#else
+     return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
++#endif
+ }
+ 
+ int drmRemoveSIGIOHandler(int fd)
+@@ -2167,5 +2171,9 @@
+ 
+     entry->f = NULL;
+ 
++#if defined(__sun) && defined(__SVR4)
++    return 1;
++#else
+     return xf86RemoveSIGIOHandler(fd);
++#endif
+ }