xserver-xorg-video-ati: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/patches/01_gen_pci_ids.diff | 7 +++++--
src/Makefile.in | 5 ++++-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 14560bd37f9ec8be42ce9c67d79139d54c3cf0b2
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 15 23:11:01 2008 +0200
Do not export MACH64, MACH32 and R128 pci ids in radeon.ids
diff --git a/debian/changelog b/debian/changelog
index 33200fe..45fb9bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.9.0-1+lenny1) unstable; urgency=low
+
+ * Do not export MACH64, MACH32 and R128 pci ids in radeon.ids,
+ closes: #490990.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 15 Jul 2008 23:10:04 +0200
+
xserver-xorg-video-ati (1:6.9.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 5160ff7..4b607bf 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -6,7 +6,7 @@ Index: xserver-xorg-video-ati/src/Makefile.am
===================================================================
--- xserver-xorg-video-ati.orig/src/Makefile.am 2007-10-06 02:44:47.000000000 +0200
+++ xserver-xorg-video-ati/src/Makefile.am 2007-10-06 02:48:34.000000000 +0200
-@@ -153,3 +153,9 @@
+@@ -153,3 +153,12 @@
pcidb/ati_pciids.csv \
pcidb/parse_pci_ids.pl \
radeon_atombios.h
@@ -15,4 +15,7 @@ Index: xserver-xorg-video-ati/src/Makefile.am
+pcidata_DATA = radeon.ids
+
+radeon.ids: ati_pciids_gen.h
-+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > radeon.ids
++ cat ${srcdir}/ati_pciids_gen.h \
++ | grep -v PCI_CHIP_MACH32 | grep -v PCI_CHIP_MACH64 | grep -v PCI_CHIP_RAGE128 \
++ | awk '/^#define.*PCI_CHIP/ {print $$3}' \
++ | sed -e 's/0x/1002/' > radeon.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 14ec2b2..d3e47d3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1001,7 +1001,10 @@ uninstall-am: uninstall-ati_drv_laLTLIBRARIES uninstall-pcidataDATA \
radeon.ids: ati_pciids_gen.h
- awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > radeon.ids
+ cat ${srcdir}/ati_pciids_gen.h \
+ | grep -v PCI_CHIP_MACH32 | grep -v PCI_CHIP_MACH64 | grep -v PCI_CHIP_RAGE128 \
+ | awk '/^#define.*PCI_CHIP/ {print $$3}' \
+ | sed -e 's/0x/1002/' > radeon.ids
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Reply to: