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

xserver-xorg-video-openchrome: Changes to 'debian-unstable'



 debian/changelog                   |    2 ++
 debian/patches/01_gen_pci_ids.diff |   18 ------------------
 debian/patches/series              |    1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit f5474628d73740c467796ff83e00115d3d37cc7a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sat Dec 5 09:59:37 2009 +0200

    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 1eeb22b..c460e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-video-openchrome (1:0.2.904+svn812-2) UNRELEASED; urgency=low
 
   * Build against Xserver 1.7.
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+    choose a driver during autoconfiguration.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 05 Dec 2009 01:59:03 +0200
 
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 7485fe3..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Generate a list of known PCIs for xorg to auto-detect them and use openchrome for those
-Index: xserver-xorg-video-openchrome/src/Makefile.am
-===================================================================
---- xserver-xorg-video-openchrome.orig/src/Makefile.am
-+++ xserver-xorg-video-openchrome/src/Makefile.am
-@@ -92,6 +92,12 @@ EXTRA_DIST += \
- endif
- 
- 
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = openchrome.ids
-+
-+openchrome.ids : via_id.h
-+	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/via_id.h | sed -e 's/0x/1106/' > openchrome.ids
-+
- via_driver.lo: svnversion.h
- svnversion.h: $(openchrome_drv_la_SOURCES)
- 	@if [ -d .svn ]; then \
diff --git a/debian/patches/series b/debian/patches/series
index b55d79f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_gen_pci_ids.diff


Reply to: