Bug#483699: patch
The enclosed patch removes pci_gen_ids and replaces it with a static
device list that gets installed in the package. This finally allows
the Cyrix and Geode drivers to claim ownership of the hardware they
respectively support and leaves NSC with only PCI ID for devices that
factually concern the NSC code.
--
Martin-Éric Racine
http://q-funk.iki.fi
diff -pruN /tmp/xserver-xorg-video-nsc-2.8.3/debian/changelog /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/changelog
--- /tmp/xserver-xorg-video-nsc-2.8.3/debian/changelog 2008-06-04 20:26:05.000000000 +0300
+++ /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/changelog 2008-06-04 20:24:06.000000000 +0300
@@ -1,3 +1,12 @@
+xserver-xorg-video-nsc (1:2.8.3-2.1) unstable; urgency=medium
+
+ * NMU.
+ * Removed 01_gen_pci_ids.diff to avoid PCI ID conflicts with the
+ Cyrix and Geode drivers.
+ * Replaced the gen_pci_ids patch with a static ID list to install.
+
+ -- Martin-Ã?ric Racine <q-funk@iki.fi> Wed, 04 Jun 2008 20:22:28 +0300
+
xserver-xorg-video-nsc (1:2.8.3-2) unstable; urgency=low
* Upload to unstable
diff -pruN /tmp/xserver-xorg-video-nsc-2.8.3/debian/nsc.ids /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/nsc.ids
--- /tmp/xserver-xorg-video-nsc-2.8.3/debian/nsc.ids 1970-01-01 03:00:00.000000000 +0300
+++ /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/nsc.ids 2008-06-04 20:24:43.000000000 +0300
@@ -0,0 +1,3 @@
+100B0104
+100B0504
+
diff -pruN /tmp/xserver-xorg-video-nsc-2.8.3/debian/patches/01_gen_pci_ids.diff /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/patches/01_gen_pci_ids.diff
--- /tmp/xserver-xorg-video-nsc-2.8.3/debian/patches/01_gen_pci_ids.diff 2008-06-04 20:26:05.000000000 +0300
+++ /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/patches/01_gen_pci_ids.diff 1970-01-01 03:00:00.000000000 +0300
@@ -1,14 +0,0 @@
-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 | sed -e 's/0x/1078/' > nsc.ids
-+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/100B/' >> nsc.ids
diff -pruN /tmp/xserver-xorg-video-nsc-2.8.3/debian/patches/series /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/patches/series
--- /tmp/xserver-xorg-video-nsc-2.8.3/debian/patches/series 2008-06-04 20:26:05.000000000 +0300
+++ /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/patches/series 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff -pruN /tmp/xserver-xorg-video-nsc-2.8.3/debian/xserver-xorg-video-nsc.install /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/xserver-xorg-video-nsc.install
--- /tmp/xserver-xorg-video-nsc-2.8.3/debian/xserver-xorg-video-nsc.install 2008-06-04 20:26:05.000000000 +0300
+++ /home/meracine/Projects/Geode-X.org/xserver-xorg-video-nsc-2.8.3/debian/xserver-xorg-video-nsc.install 2008-06-04 20:25:08.000000000 +0300
@@ -1,3 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
+debian/nsc.ids usr/share/xserver-xorg/pci
Reply to: