[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r280 - in trunk/debian: . patches



Author: dnusinow
Date: 2005-06-26 15:42:38 -0500 (Sun, 26 Jun 2005)
New Revision: 280

Added:
   trunk/debian/patches/043_ati_r128_update_chip_identification.diff
Modified:
   trunk/debian/TODO
Log:
- Patch audit. Thanks to Nathanael Nerode.
  - 039_mkfontdir_force_correct_perms.diff: Irrelevant, as mkfontdir
    is now essentially an alias to mkfontscale, and the patched file is gone.
  - 043_ati_r128_update_chip_identification.diff: Forward-ported by
	Nathanael and added.


Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2005-06-26 20:39:59 UTC (rev 279)
+++ trunk/debian/TODO	2005-06-26 20:42:38 UTC (rev 280)
@@ -46,8 +46,6 @@
   -- Upstream says that it's incorrect and due to a toolchain bug.
      Have to see whether it's still needed for GNU/kFreeBSD, and if so,
      fix the bug.  See Freedesktop Bugzilla #1902.
-039_mkfontdir_force_correct_perms.diff
-043_ati_r128_update_chip_identification.diff
 049_Xserver_recognize_Linux_2.6_proc_bus_pci.diff
 050_fix_lnx_io_kbd_rate_fix.diff
 052_glint_fix_unresolved_symbols.diff

Added: trunk/debian/patches/043_ati_r128_update_chip_identification.diff
===================================================================
--- trunk/debian/patches/043_ati_r128_update_chip_identification.diff	2005-06-26 20:39:59 UTC (rev 279)
+++ trunk/debian/patches/043_ati_r128_update_chip_identification.diff	2005-06-26 20:42:38 UTC (rev 280)
@@ -0,0 +1,85 @@
+$Id: 043_ati_r128_update_chip_identification.diff 1370 2004-05-07 19:37:27Z bran
+den $
+
+Change descriptions of unidentified boards to be more clear about their
+unidentifiedness.
+
+This patch from Mike A. Harris.
+
+Not submitted upstream.
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_chipset.h
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_chipset.h	(revision 275)
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_chipset.h	(working copy)
+@@ -7,43 +7,43 @@
+     { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility M3 LF (AGP)" },
+     { PCI_CHIP_RAGE128MF, "ATI Rage 128 Mobility M4 MF (AGP)" },
+     { PCI_CHIP_RAGE128ML, "ATI Rage 128 Mobility M4 ML (AGP)" },
+-    { PCI_CHIP_RAGE128PA, "ATI Rage 128 Pro GL PA (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PB, "ATI Rage 128 Pro GL PB (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PC, "ATI Rage 128 Pro GL PC (PCI/AGP)" },
++    { PCI_CHIP_RAGE128PA, "ATI Rage 128 Pro GL PA (AGP?)" },
++    { PCI_CHIP_RAGE128PB, "ATI Rage 128 Pro GL PB (AGP?)" },
++    { PCI_CHIP_RAGE128PC, "ATI Rage 128 Pro GL PC (AGP?)" },
+     { PCI_CHIP_RAGE128PD, "ATI Rage 128 Pro GL PD (PCI)" },
+-    { PCI_CHIP_RAGE128PE, "ATI Rage 128 Pro GL PE (PCI/AGP)" },
++    { PCI_CHIP_RAGE128PE, "ATI Rage 128 Pro GL PE (AGP?)" },
+     { PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro GL PF (AGP)" },
+-    { PCI_CHIP_RAGE128PG, "ATI Rage 128 Pro VR PG (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PH, "ATI Rage 128 Pro VR PH (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PI, "ATI Rage 128 Pro VR PI (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PJ, "ATI Rage 128 Pro VR PJ (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PK, "ATI Rage 128 Pro VR PK (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PL, "ATI Rage 128 Pro VR PL (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PM, "ATI Rage 128 Pro VR PM (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PN, "ATI Rage 128 Pro VR PN (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PO, "ATI Rage 128 Pro VR PO (PCI/AGP)" },
++    { PCI_CHIP_RAGE128PG, "ATI Rage 128 Pro VR PG (AGP?)" },
++    { PCI_CHIP_RAGE128PH, "ATI Rage 128 Pro VR PH (AGP?)" },
++    { PCI_CHIP_RAGE128PI, "ATI Rage 128 Pro VR PI (AGP?)" },
++    { PCI_CHIP_RAGE128PJ, "ATI Rage 128 Pro VR PJ (AGP?)" },
++    { PCI_CHIP_RAGE128PK, "ATI Rage 128 Pro VR PK (AGP?)" },
++    { PCI_CHIP_RAGE128PL, "ATI Rage 128 Pro VR PL (AGP?)" },
++    { PCI_CHIP_RAGE128PM, "ATI Rage 128 Pro VR PM (AGP?)" },
++    { PCI_CHIP_RAGE128PN, "ATI Rage 128 Pro VR PN (AGP?)" },
++    { PCI_CHIP_RAGE128PO, "ATI Rage 128 Pro VR PO (AGP?)" },
+     { PCI_CHIP_RAGE128PP, "ATI Rage 128 Pro VR PP (PCI)" },
+-    { PCI_CHIP_RAGE128PQ, "ATI Rage 128 Pro VR PQ (PCI/AGP)" },
++    { PCI_CHIP_RAGE128PQ, "ATI Rage 128 Pro VR PQ (AGP?)" },
+     { PCI_CHIP_RAGE128PR, "ATI Rage 128 Pro VR PR (PCI)" },
+-    { PCI_CHIP_RAGE128PS, "ATI Rage 128 Pro VR PS (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PT, "ATI Rage 128 Pro VR PT (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PU, "ATI Rage 128 Pro VR PU (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PV, "ATI Rage 128 Pro VR PV (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PW, "ATI Rage 128 Pro VR PW (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128PX, "ATI Rage 128 Pro VR PX (PCI/AGP)" },
++    { PCI_CHIP_RAGE128PS, "ATI Rage 128 Pro VR PS (AGP?)" },
++    { PCI_CHIP_RAGE128PT, "ATI Rage 128 Pro VR PT (AGP?)" },
++    { PCI_CHIP_RAGE128PU, "ATI Rage 128 Pro VR PU (AGP?)" },
++    { PCI_CHIP_RAGE128PV, "ATI Rage 128 Pro VR PV (AGP?)" },
++    { PCI_CHIP_RAGE128PW, "ATI Rage 128 Pro VR PW (AGP?)" },
++    { PCI_CHIP_RAGE128PX, "ATI Rage 128 Pro VR PX (AGP?)" },
+     { PCI_CHIP_RAGE128RE, "ATI Rage 128 GL RE (PCI)" },
+     { PCI_CHIP_RAGE128RF, "ATI Rage 128 GL RF (AGP)" },
+     { PCI_CHIP_RAGE128RG, "ATI Rage 128 RG (AGP)" },
+     { PCI_CHIP_RAGE128RK, "ATI Rage 128 VR RK (PCI)" },
+     { PCI_CHIP_RAGE128RL, "ATI Rage 128 VR RL (AGP)" },
+-    { PCI_CHIP_RAGE128SE, "ATI Rage 128 4X SE (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128SF, "ATI Rage 128 4X SF (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128SG, "ATI Rage 128 4X SG (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128SH, "ATI Rage 128 4X SH (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128SK, "ATI Rage 128 4X SK (PCI/AGP)" },
+-    { PCI_CHIP_RAGE128SL, "ATI Rage 128 4X SL (PCI/AGP)" },
++    { PCI_CHIP_RAGE128SE, "ATI Rage 128 4X SE (AGP?)" },
++    { PCI_CHIP_RAGE128SF, "ATI Rage 128 4X SF (AGP?)" },
++    { PCI_CHIP_RAGE128SG, "ATI Rage 128 4X SG (AGP?)" },
++    { PCI_CHIP_RAGE128SH, "ATI Rage 128 4X SH (AGP?)" },
++    { PCI_CHIP_RAGE128SK, "ATI Rage 128 4X SK (AGP?)" },
++    { PCI_CHIP_RAGE128SL, "ATI Rage 128 4X SL (AGP?)" },
+     { PCI_CHIP_RAGE128SM, "ATI Rage 128 4X SM (AGP)" },
+-    { PCI_CHIP_RAGE128SN, "ATI Rage 128 4X SN (PCI/AGP)" },
++    { PCI_CHIP_RAGE128SN, "ATI Rage 128 4X SN (AGP?)" },
+     { PCI_CHIP_RAGE128TF, "ATI Rage 128 Pro ULTRA TF (AGP)" },
+     { PCI_CHIP_RAGE128TL, "ATI Rage 128 Pro ULTRA TL (AGP)" },
+     { PCI_CHIP_RAGE128TR, "ATI Rage 128 Pro ULTRA TR (AGP)" },



Reply to: