X Strike Force X.Org X11 SVN commit: r1320 - in branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian: . patches
Author: dnusinow
Date: 2006-02-26 17:43:51 -0500 (Sun, 26 Feb 2006)
New Revision: 1320
Added:
branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/
branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/01_ati_r128_update_chip_identification.diff
branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/series
Modified:
branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/changelog
branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/rules
Log:
* Port patches from trunk
+ general/043_ati_r128_update_chip_identification.diff
Modified: branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/changelog 2006-02-26 22:36:06 UTC (rev 1319)
+++ branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/changelog 2006-02-26 22:43:51 UTC (rev 1320)
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.5.7.3-2) experimental; urgency=low
+
+ * Port patches from trunk
+ + general/043_ati_r128_update_chip_identification.diff
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 17:42:45 -0500
+
xserver-xorg-video-ati (1:6.5.7.3-1) experimental; urgency=low
* First upload to Debian
Added: branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/01_ati_r128_update_chip_identification.diff
===================================================================
--- branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/01_ati_r128_update_chip_identification.diff 2006-02-26 22:36:06 UTC (rev 1319)
+++ branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/01_ati_r128_update_chip_identification.diff 2006-02-26 22:43:51 UTC (rev 1320)
@@ -0,0 +1,75 @@
+Index: xf86-video-ati-X11R7.0-6.5.7.3/src/r128_chipset.h
+===================================================================
+--- xf86-video-ati-X11R7.0-6.5.7.3.orig/src/r128_chipset.h 2006-01-12 22:54:09.000000000 -0500
++++ xf86-video-ati-X11R7.0-6.5.7.3/src/r128_chipset.h 2006-02-26 17:42:19.000000000 -0500
+@@ -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)" },
Added: branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/series 2006-02-26 22:36:06 UTC (rev 1319)
+++ branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/patches/series 2006-02-26 22:43:51 UTC (rev 1320)
@@ -0,0 +1 @@
+01_ati_r128_update_chip_identification.diff
Modified: branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/rules 2006-02-26 22:36:06 UTC (rev 1319)
+++ branches/modular/driver/xf86-video-ati-X11R7.0-6.5.7.3/debian/rules 2006-02-26 22:43:51 UTC (rev 1320)
@@ -31,7 +31,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: