Author: branden
Date: 2004-05-03 23:59:35 -0500 (Mon, 03 May 2004)
New Revision: 1359
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/030a_radeon_igp_support.diff
trunk/debian/patches/030b_radeon_rv280_support.diff
trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
Log:
Grab updated list of PCI IDs from XFree86 CVS as of 2003-10-30. Remove
superseded parts of patches #030a, #030b, #099.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-03 23:29:13 UTC (rev 1358)
+++ trunk/debian/CHANGESETS 2004-05-04 04:59:35 UTC (rev 1359)
@@ -29,6 +29,6 @@
Update XFree86 PCI ID database from CVS HEAD as of 2003-10-30. This lays the
foundation for future updates to drivers and PCI bus handling code.
- 1358
+ 1358, 1359
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-03 23:29:13 UTC (rev 1358)
+++ trunk/debian/changelog 2004-05-04 04:59:35 UTC (rev 1359)
@@ -19,8 +19,11 @@
+ In Xlib, don't perform an UltraSPARC (SPARC64)-specific kludge on AMD64,
just as we don't on IA64.
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 1 May 2004 11:55:18 -0500
+ * Grab updated list of PCI IDs from XFree86 CVS as of 2003-10-30. Remove
+ superseded parts of patches #030a, #030b, #099.
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 3 May 2004 23:58:35 -0500
+
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Changes by Branden Robinson and Fabio Massimo di Nitto:
Modified: trunk/debian/patches/030a_radeon_igp_support.diff
===================================================================
--- trunk/debian/patches/030a_radeon_igp_support.diff 2004-05-03 23:29:13 UTC
(rev 1358)
+++ trunk/debian/patches/030a_radeon_igp_support.diff 2004-05-04 04:59:35 UTC
(rev 1359)
@@ -3,19 +3,6 @@
IGP support for the Radeon driver - this patch from Michel Daenzer and ATI's
Hui
Yu.
---- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h.1_igp Fri Mar 7
05:30:45 2003
-+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Tue Mar 18
06:01:51 2003
-@@ -186,6 +186,10 @@
- #define PCI_CHIP_RV200_QX 0x5158
- #define PCI_CHIP_RV100_QY 0x5159
- #define PCI_CHIP_RV100_QZ 0x515A
-+#define PCI_CHIP_RS100_4136 0x4136
-+#define PCI_CHIP_RS100_4336 0x4336
-+#define PCI_CHIP_RS200_4137 0x4137
-+#define PCI_CHIP_RS200_4337 0x4337
- #define PCI_CHIP_R200_Qh 0x5168
- #define PCI_CHIP_R200_Qi 0x5169
- #define PCI_CHIP_R200_Qj 0x516A
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c.1_igp Tue Mar 18
05:39:13 2003
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c Tue Mar 18
06:06:54 2003
@@ -87,7 +87,9 @@
Modified: trunk/debian/patches/030b_radeon_rv280_support.diff
===================================================================
--- trunk/debian/patches/030b_radeon_rv280_support.diff 2004-05-03 23:29:13 UTC
(rev 1358)
+++ trunk/debian/patches/030b_radeon_rv280_support.diff 2004-05-04 04:59:35 UTC
(rev 1359)
@@ -3,23 +3,6 @@
Support for the RV280 and M9+ chipsets - this patch from Michel Daenzer and
ATI's Hui Yu.
---- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h.2_rv280 Fri Mar
7 05:30:46 2003
-+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Fri Mar 7
05:30:45 2003
-@@ -217,6 +217,14 @@
- #define PCI_CHIP_MACH64VT 0x5654
- #define PCI_CHIP_MACH64VU 0x5655
- #define PCI_CHIP_MACH64VV 0x5656
-+#define PCI_CHIP_RV280_5960 0x5960
-+#define PCI_CHIP_RV280_5961 0x5961
-+#define PCI_CHIP_RV280_5962 0x5962
-+#define PCI_CHIP_RV280_5963 0x5963
-+#define PCI_CHIP_RV280_5968 0x5968
-+#define PCI_CHIP_RV280_5969 0x5969
-+#define PCI_CHIP_RV280_596A 0x596A
-+#define PCI_CHIP_RV280_596B 0x596B
-
- /* Avance Logic */
- #define PCI_CHIP_ALG2064 0x2064
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c.2_rv280 Mon Mar
3 23:13:18 2003
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c Tue Mar 4
04:22:23 2003
@@ -675,6 +675,18 @@
Modified: trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
===================================================================
--- trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
2004-05-03 23:29:13 UTC (rev 1358)
+++ trunk/debian/patches/099_ati_recognize_more_RV280_models.diff
2004-05-04 04:59:35 UTC (rev 1359)
@@ -5,23 +5,6 @@
driver. Based on a diff with XFree86 CVS HEAD by Michel Dänzer. Thanks
also to Daniel Stone. Will be superseded by XFree86 4.4.
-diff -urN xc.orig/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
---- xc.orig/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004-01-14
13:19:13.000000000 +1100
-+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004-01-14
13:29:08.000000000 +1100
-@@ -221,10 +221,13 @@
- #define PCI_CHIP_RV280_5961 0x5961
- #define PCI_CHIP_RV280_5962 0x5962
- #define PCI_CHIP_RV280_5963 0x5963
-+#define PCI_CHIP_RV280_5964 0x5964
- #define PCI_CHIP_RV280_5968 0x5968
- #define PCI_CHIP_RV280_5969 0x5969
- #define PCI_CHIP_RV280_596A 0x596A
- #define PCI_CHIP_RV280_596B 0x596B
-+#define PCI_CHIP_RV280_5C61 0x5C61
-+#define PCI_CHIP_RV280_5C63 0x5C63
-
- /* Avance Logic */
- #define PCI_CHIP_ALG2064 0x2064
diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/atichip.c 2004-01-14
13:19:15.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c 2004-01-14
18:09:23.000000000 +1100
