xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/patches/fedora-vboxvideo.diff | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+)
New commits:
commit 87207ee71bf39e881250f8bb4b09d939972e735c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 11 11:11:27 2009 +0200
Add vboxvideo to the autodetection routine
diff --git a/debian/changelog b/debian/changelog
index bfbbab9..865490d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
+
+ * Add patch stolen from Fedora to add the vboxvideo driver to the
+ autodetection routine (closes: #540884).
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 11 Aug 2009 11:09:25 +0200
+
xorg-server (2:1.6.3-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/fedora-vboxvideo.diff b/debian/patches/fedora-vboxvideo.diff
new file mode 100644
index 0000000..fec7116
--- /dev/null
+++ b/debian/patches/fedora-vboxvideo.diff
@@ -0,0 +1,21 @@
+From f8079585cd68ad2e742d611bdf9908dc6db5a4a9 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Fri, 10 Jul 2009 16:26:25 +0200
+Subject: [PATCH] Add vboxvideo to the autodetection routine
+
+---
+ hw/xfree86/common/xf86AutoConfig.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
+@@ -207,6 +207,7 @@
+ case 0x100c: driverList[0] = "tseng"; break;
+ case 0x1106: driverList[0] = "openchrome"; break;
+ case 0x15ad: driverList[0] = "vmware"; break;
++ case 0x80ee: driverList[0] = "vboxvideo"; break;
+ case 0x18ca:
+ if (dev->device_id == 0x47)
+ driverList[0] = "xgixp";
diff --git a/debian/patches/series b/debian/patches/series
index e88aa73..7cb847a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ Turn-on-ModeDebug-by-default.patch
Add-libgcrypt-as-an-option-for-sha1.diff
fedora-bad-fbdev-thats-mine.patch
fedora-pci-primary.diff
+fedora-vboxvideo.diff
Reply to: