debian/changelog | 7 +++++++ debian/patches/01_gen_pci_ids.diff | 33 --------------------------------- debian/patches/series | 1 - 3 files changed, 7 insertions(+), 34 deletions(-)
New commits: commit 258ad95862a5838f8badeb45775354ddaf97643b Author: David Nusinow <[email protected]> Date: Mon May 4 22:25:04 2009 -0400 Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. diff --git a/debian/changelog b/debian/changelog index 4e7c7b7..314e0c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-nsc (1:2.8.3-5) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + -- David Nusinow <[email protected]> Mon, 04 May 2009 22:23:55 -0400 + xserver-xorg-video-nsc (1:2.8.3-4) unstable; urgency=low * Fix 01_gen_pci_ids.diff to drop cyrix ids instead of the ns ones, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index d9abfd7..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,33 +0,0 @@ -Generate the PCI ids list that the driver supports. It claims support for: -Cyrix and NS vendor id with device id: 0104, 0504 and 0030. -0104 is actually declared twice, that's why there's a sort -u below. - -But some of the above hardware actually seems to be supported much better -in other drivers, or is even actually not supported for real by nsc. -The upstream driver should be fixed, but we need a workaround for now so -that the server always autoload the other driver. - -For now, we keep the upstream code untouched and we just don't let these IDs -appear in the nsc.ids: -* 0030 is Geode GX2 which seems to have never actually been supported in -nsc, - while the -geode officially supports it -* Cyrix ids are supported by the -cyrix better - (and device 0504 and 0030 with vendor Cyrix seem to not exist anyway) - -See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483699 for the full -discussion about this. - -Index: xserver-xorg-video-nsc/src/Makefile.am -=================================================================== ---- xserver-xorg-video-nsc.orig/src/Makefile.am 2007-09-13 09:46:05.000000000 +0200 -+++ xserver-xorg-video-nsc/src/Makefile.am 2007-09-13 09:48:21.000000000 +0200 -@@ -120,3 +120,9 @@ - gfx/vip_1400.c - - -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = nsc.ids -+ -+nsc.ids: nsc_driver.c -+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u | grep -v 0030 | sed -e 's/0x/100B/' > nsc.ids -+# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u | grep -v 0030 | sed -e 's/0x/1078/' >> nsc.ids diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b55d79f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_gen_pci_ids.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
