diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2005-06-22 23:12:58 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2005-06-22 23:12:58 +0000 |
| commit | 0cf7952879e544e1646dee5afa41b3abdf9c9450 (patch) | |
| tree | 89d74d77c18612be34fd414d680b0bf656d69339 /x11-servers | |
| parent | df948e0eb136ee4a2986f4acd154fdf3efafecd5 (diff) | |
| download | ports-0cf7952879e544e1646dee5afa41b3abdf9c9450.tar.gz ports-0cf7952879e544e1646dee5afa41b3abdf9c9450.zip | |
[1] Fix the Chipset lines written by xorgcfg for 3dfx cards.
[2] Add the PCI ID for Radeon X600, 0x5B62 to a place that was missed.
PR: [1] ports/32121
Submitted by: [1] alane
[2] Vladimir Kushnir <vkushnir@i.kiev.ua>
Notes
Notes:
svn path=/head/; revision=137895
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-Cards | 22 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-radeon_driver.c | 8 |
3 files changed, 31 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index b08189dd4fbb..c620ffda74a9 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 6.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src diff --git a/x11-servers/xorg-server/files/patch-Cards b/x11-servers/xorg-server/files/patch-Cards new file mode 100644 index 000000000000..4dd51083b3e7 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Cards @@ -0,0 +1,22 @@ +Index: programs/Xserver/hw/xfree86/xf86config/Cards +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Cards,v +retrieving revision 1.2 +diff -u -r1.2 Cards +--- programs/Xserver/hw/xfree86/xf86config/Cards 23 Apr 2004 19:54:19 -0000 1.2 ++++ programs/Xserver/hw/xfree86/xf86config/Cards 13 Jun 2005 07:34:09 -0000 +@@ -2865,12 +2865,12 @@ + # 3Dfx + NAME Voodoo Banshee (generic) + SERVER SVGA +-CHIPSET Voodo Banshee ++CHIPSET 3dfx Banshee + DRIVER tdfx + + NAME Voodoo3 (generic) + SERVER SVGA +-CHIPSET Voodoo3 ++CHIPSET 3dfx Voodoo3 + DRIVER tdfx + + NAME Elsa Victory II diff --git a/x11-servers/xorg-server/files/patch-radeon_driver.c b/x11-servers/xorg-server/files/patch-radeon_driver.c index eddd3071447b..2adf232990f8 100644 --- a/x11-servers/xorg-server/files/patch-radeon_driver.c +++ b/x11-servers/xorg-server/files/patch-radeon_driver.c @@ -1,5 +1,13 @@ --- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Thu Feb 17 13:15:22 2005 +++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Thu Feb 17 13:21:09 2005 +@@ -2501,6 +2501,7 @@ + case PCI_CHIP_RV370_5464: + info->IsMobility = TRUE; + case PCI_CHIP_RV370_5B60: ++ case PCI_CHIP_RV370_5B62: + case PCI_CHIP_RV370_5B64: + case PCI_CHIP_RV370_5B65: + info->ChipFamily = CHIP_FAMILY_RV380; @@ -7159,7 +7159,6 @@ RADEONDoAdjustFrame(pScrn, x, y, FALSE); } |