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-r128dri | |
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-r128dri')
-rw-r--r-- | x11/XFree86-4/files/patch-r128dri | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/x11/XFree86-4/files/patch-r128dri b/x11/XFree86-4/files/patch-r128dri new file mode 100644 index 000000000000..fd04fd0c9c11 --- /dev/null +++ b/x11/XFree86-4/files/patch-r128dri @@ -0,0 +1,26 @@ +--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig Sat Oct 6 05:29:25 2001 ++++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c Fri Oct 5 17:28:40 2001 +@@ -705,6 +705,7 @@ + case PCI_CHIP_RAGE128LE: + case PCI_CHIP_RAGE128RE: + case PCI_CHIP_RAGE128RK: ++ case PCI_CHIP_RAGE128PE: + /* This is a PCI card, do nothing */ + break; + +@@ -985,12 +985,12 @@ + /* Check the r128 DRM version */ + version = drmGetVersion(info->drmFD); + if (version) { +- if (version->version_major != 2 || +- version->version_minor < 1) { ++ if (version->version_major != 3 || ++ version->version_minor < 0) { + /* incompatible drm version */ + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[dri] R128DRIScreenInit failed because of a version mismatch.\n" +- "[dri] r128.o kernel module version is %d.%d.%d but version 2.1.x is needed.\n" ++ "[dri] r128.o kernel module version is %d.%d.%d but version 3.0 or greater is needed.\n" + "[dri] Disabling the DRI.\n", + version->version_major, + version->version_minor, |