xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/patches/184_virtual_devices_autodetect.patch | 20 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+)
New commits:
commit ca65602c695fa6ba413249313899e51bb83c5e49
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Aug 24 15:14:55 2009 -0700
Add support for vbox and non-cirrus qemu devices
diff --git a/debian/changelog b/debian/changelog
index 9345acb..4d3705d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.6.3-1ubuntu4) karmic; urgency=low
+
+ * Add 184_virtual_devices_autodetect.patch: Automatic driver detection
+ for vbox and kvm for non-cirrus devices.
+ (LP: #338219, #348497)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 24 Aug 2009 14:58:22 -0700
+
xorg-server (2:1.6.3-1ubuntu3) karmic; urgency=low
* Add 183_dont_reset_event_time.patch: Upstream cherrypick.
diff --git a/debian/patches/184_virtual_devices_autodetect.patch b/debian/patches/184_virtual_devices_autodetect.patch
new file mode 100644
index 0000000..27ee22c
--- /dev/null
+++ b/debian/patches/184_virtual_devices_autodetect.patch
@@ -0,0 +1,20 @@
+Binary files xorg-server-ubuntu-git-patched/.git/index and xorg-server-ubuntu-git-virtual/.git/index differ
+diff -Nurp xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86AutoConfig.c xorg-server-ubuntu-git-virtual/hw/xfree86/common/xf86AutoConfig.c
+--- xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86AutoConfig.c 2009-08-24 14:39:45.000000000 -0700
++++ xorg-server-ubuntu-git-virtual/hw/xfree86/common/xf86AutoConfig.c 2009-08-24 14:54:37.000000000 -0700
+@@ -168,6 +168,7 @@ videoPtrToDriverList(struct pci_device *
+ case 0x1002: driverList[0] = "ati"; break;
+ case 0x102c: driverList[0] = "chips"; break;
+ case 0x1013: driverList[0] = "cirrus"; break;
++ case 0x1234: driverList[0] = "vesa"; break; /* qemu device not supported by cirrus */
+ case 0x8086:
+ switch (dev->device_id)
+ {
+@@ -212,6 +213,7 @@ videoPtrToDriverList(struct pci_device *
+ case 0x1023: driverList[0] = "trident"; break;
+ case 0x100c: driverList[0] = "tseng"; break;
+ case 0x1106: driverList[0] = "openchrome"; break;
++ case 0x80ee: driverList[0] = "vboxvideo"; break;
+ case 0x15ad: driverList[0] = "vmware"; break;
+ case 0x18ca:
+ if (dev->device_id == 0x47)
diff --git a/debian/patches/series b/debian/patches/series
index 661f227..5a4cdff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@ fedora-pci-primary.diff
181_fedora_log_proc_cmdline.patch
182_negative_sync_transitions.patch
183_dont_reset_event_time.patch
+184_virtual_devices_autodetect.patch
Reply to: