diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-01-22 14:19:57 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-01-22 14:19:57 +0000 |
| commit | 50c0b241d4b881a9b8f34262a054d6554dad8b8d (patch) | |
| tree | f32525b2ca4879af92f802949ceac04763159c35 /x11/XFree86-4/files/patch-i810 | |
| parent | Don't compile/install useless statically linked version of shared object. (diff) | |
Back out XFree86 4.2.0 and all recent modifications for the sake of
preserving the upcoming 4.5 release. Bump PORTEPOCH to denote portversion
going backwards. All files have been reverted to exactly what they were
3 days ago, before the 4.2.0 upgrade, except PORTEPOCH bump.
Approved by: re, portmgr, maintainer timeout
Notes
Notes:
svn path=/head/; revision=53563
Diffstat (limited to 'x11/XFree86-4/files/patch-i810')
| -rw-r--r-- | x11/XFree86-4/files/patch-i810 | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/x11/XFree86-4/files/patch-i810 b/x11/XFree86-4/files/patch-i810 index 31da4dce7804..b6d75b108146 100644 --- a/x11/XFree86-4/files/patch-i810 +++ b/x11/XFree86-4/files/patch-i810 @@ -1,6 +1,22 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Fri Jan 18 22:58:50 2002 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Fri Jan 18 23:10:36 2002 -@@ -2098,9 +2098,10 @@ +--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Wed May 30 06:51:29 2001 ++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Thu Jan 3 11:11:42 2002 +@@ -1019,10 +1019,15 @@ + { + vgaHWPtr hwp; + I810Ptr pI810; ++ unsigned temp; + + hwp = VGAHWPTR(pScrn); + pI810 = I810PTR(pScrn); + DoSave(pScrn, &hwp->SavedReg, &pI810->SavedReg, TRUE); ++ ++ temp = INREG(MEMMODE); ++ temp |= 4; ++ OUTREG(MEMMODE, temp); + } + + +@@ -2006,9 +2011,10 @@ if (I810_DEBUG & DEBUG_VERBOSE_DRI) ErrorF("\n\nENTER VT\n"); @@ -12,7 +28,7 @@ #ifdef XF86DRI if (pI810->directRenderingEnabled) { if (I810_DEBUG & DEBUG_VERBOSE_DRI) -@@ -2139,9 +2140,10 @@ +@@ -2047,9 +2053,10 @@ } I810Restore(pScrn); |