aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorsf <sf@FreeBSD.org>2002-01-06 04:47:49 +0800
committersf <sf@FreeBSD.org>2002-01-06 04:47:49 +0800
commitff8dada7be53360cb3730a78f9fc6abc1e31802b (patch)
tree43741626ccecae99b54c2207f52816e5d32718f0 /x11
parent4dbed8fb6c925b2f7c326fbc66e2ecf00b9f4b35 (diff)
downloadfreebsd-ports-gnome-ff8dada7be53360cb3730a78f9fc6abc1e31802b.tar.gz
freebsd-ports-gnome-ff8dada7be53360cb3730a78f9fc6abc1e31802b.tar.zst
freebsd-ports-gnome-ff8dada7be53360cb3730a78f9fc6abc1e31802b.zip
sync with x11/XFree86-4
- support ATI XPERT 128.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-libraries/files/patch-r12856
-rw-r--r--x11/XFree86-4-libraries/files/patch-r128dri8
2 files changed, 64 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-r128 b/x11/XFree86-4-libraries/files/patch-r128
new file mode 100644
index 000000000000..09eb16583c4e
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-r128
@@ -0,0 +1,56 @@
+--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig Fri May 11 09:56:10 2001
++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h Wed Dec 26 19:23:28 2001
+@@ -234,6 +234,7 @@
+ #define PCI_CHIP_RAGE128ML 0x4D4C
+ #define PCI_CHIP_RAGE128PD 0x5044
+ #define PCI_CHIP_RAGE128PF 0x5046
++#define PCI_CHIP_RAGE128PE 0x5050
+ #define PCI_CHIP_RAGE128PR 0x5052
+ #define PCI_CHIP_RADEON_QD 0x5144
+ #define PCI_CHIP_RADEON_QE 0x5145
+@@ -826,6 +827,7 @@
+ {PCI_CHIP_RAGE128MF, "Rage 128 Mobility MF",0},
+ {PCI_CHIP_RAGE128ML, "Rage 128 Mobility ML",0},
+ {PCI_CHIP_RAGE128PD, "Rage 128 Pro PD",0},
++ {PCI_CHIP_RAGE128PE, "Rage 128 Xpert 128",0},
+ {PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0},
+ {PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0},
+ {PCI_CHIP_RADEON_QD, "Radeon QD",0},
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c.orig Fri May 4 21:05:33 2001
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c Wed Dec 26 19:24:14 2001
+@@ -81,6 +81,7 @@
+ { PCI_CHIP_RAGE128RK, "ATI Rage 128 RK (PCI)" },
+ { PCI_CHIP_RAGE128RL, "ATI Rage 128 RL (AGP)" },
+ { PCI_CHIP_RAGE128PD, "ATI Rage 128 Pro PD (PCI)" },
++ { PCI_CHIP_RAGE128PE, "ATI Rage 128 Xpert 128 (PCI)" },
+ { PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro PF (AGP)" },
+ { PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility LE (PCI)" },
+ { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility LF (AGP)" },
+@@ -96,6 +97,7 @@
+ { PCI_CHIP_RAGE128RK, PCI_CHIP_RAGE128RK, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128RL, PCI_CHIP_RAGE128RL, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128PD, PCI_CHIP_RAGE128PD, RES_SHARED_VGA },
++ { PCI_CHIP_RAGE128PE, PCI_CHIP_RAGE128PE, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128PF, PCI_CHIP_RAGE128PF, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA },
+ { PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA },
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Wed May 30 00:51:08 2001
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Wed Dec 26 19:24:14 2001
+@@ -895,6 +895,7 @@
+ case PCI_CHIP_RAGE128RK:
+ case PCI_CHIP_RAGE128RL:
+ case PCI_CHIP_RAGE128PD:
++ case PCI_CHIP_RAGE128PE:
+ case PCI_CHIP_RAGE128PF:
+ default: info->HasPanelRegs = FALSE; break;
+ }
+@@ -1025,7 +1026,8 @@
+ case PCI_CHIP_RAGE128LE:
+ case PCI_CHIP_RAGE128RE:
+ case PCI_CHIP_RAGE128RK:
+- case PCI_CHIP_RAGE128PD: info->IsPCI = TRUE; break;
++ case PCI_CHIP_RAGE128PD:
++ case PCI_CHIP_RAGE128PE: info->IsPCI = TRUE; break;
+ case PCI_CHIP_RAGE128LF:
+ case PCI_CHIP_RAGE128MF:
+ case PCI_CHIP_RAGE128ML:
diff --git a/x11/XFree86-4-libraries/files/patch-r128dri b/x11/XFree86-4-libraries/files/patch-r128dri
index c09b58c6ad40..fd04fd0c9c11 100644
--- a/x11/XFree86-4-libraries/files/patch-r128dri
+++ b/x11/XFree86-4-libraries/files/patch-r128dri
@@ -1,5 +1,13 @@
--- 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);