--- a/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Sat Jan 10 10:35:32 2009 -0800
+++ b/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Thu Jan 15 12:55:00 2009 -0800
@@ -1,7 +1,10 @@
-diff -ur xf86-video-vesa-X11R7.2-1.3.0/src/vesa.c vesa/src/vesa.c
---- xf86-video-vesa-X11R7.2-1.3.0/src/vesa.c	2007-01-08 18:50:04.000000000 -0500
-+++ src/vesa.c	2007-02-23 08:56:40.000000000 -0500
-@@ -1406,19 +1406,19 @@
+Fixes Sun bug 6526933: Matrox MGA chip (embedded in ServerEngines "Pilot" BSC)
+does not work with vesa driver
+
+diff -urp -x '*~' -x '*.orig' src/vesa.c src/vesa.c
+--- src/vesa.c	2008-12-21 18:34:59.000000000 -0800
++++ src/vesa.c	2009-01-11 10:09:13.986045000 -0800
+@@ -1450,19 +1450,19 @@ SaveFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);	/* set graphics */
      slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
  
@@ -28,7 +31,7 @@
  }
  
  static void
-@@ -1475,11 +1475,6 @@
+@@ -1519,11 +1519,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);    /* set graphics */
      slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
  
@@ -40,7 +43,7 @@
      /* restore the registers that were changed */
      WriteMiscOut(miscOut);
      WriteAttr(pVesa, 0x10, attr10);
-@@ -1491,6 +1486,11 @@
+@@ -1535,6 +1530,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x08, gr8);
      WriteSeq(0x02, seq2);
      WriteSeq(0x04, seq4);