debian/changelog | 11
++++
debian/patches/169_xf86AutoConfig_choose_default_driver_if_no_pci.patch | 25
++++++++++
debian/patches/series | 1
3 files changed, 37 insertions(+)
New commits:
commit a2e77d707a5e597d136e73269f67786fe4cd861a
Author: Bryce Harrington <[EMAIL PROTECTED]>
Date: Tue May 13 18:34:08 2008 -0700
Adding patch for #219424
diff --git a/debian/changelog b/debian/changelog
index 3d2624b..2b44c46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.4.1~git20080131-1ubuntu11) intrepid; urgency=low
+
+ * 169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
+ - Choose the default driver for the platform instead of the generic
+ default (vesa) if there is no PCI info. Without this, on platforms
+ like PS3 where fbdev should be used rather than vesa, the system
+ will fail to start up. (LP: #219424)
+
+ -- Bryce Harrington <[EMAIL PROTECTED]> Tue, 13 May 2008 13:09:17 -0700
+
+
xorg-server (2:1.4.1~git20080131-1ubuntu10) intrepid; urgency=low
[Timo Aaltonen]
diff --git
a/debian/patches/169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
b/debian/patches/169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
new file mode 100644
index 0000000..cae64f6
--- /dev/null
+++ b/debian/patches/169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
@@ -0,0 +1,25 @@
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2008-05-10
16:33:59.000000000 +0100
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-05-10
16:47:34.000000000 +0100
+@@ -372,7 +372,7 @@
+
+ if (!info) {
+ ErrorF("Could not get primary PCI info\n");
+- goto end;
++ goto nopci;
+ }
+
+ idsdir = opendir("/usr/share/xserver-xorg/pci");
+@@ -453,6 +453,13 @@
+ closedir(idsdir);
+ }
+
++ /*
++ * We jump here if there's no PCI info. We may be on a platform like the
++ * PS3 where we should fallback to the platform default driver like fbdev
++ * or vesa.
++ */
++ nopci:
++
+ /* TODO Handle multiple drivers claiming to support the same PCI ID */
+ if (matches[0]) {
+ chosen_driver = matches[0];
diff --git a/debian/patches/series b/debian/patches/series
index 381b6dc..526af56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@
166_fix_lpl_monitors.diff
167_xf86AutoConfig_geode_addition.diff -p0
168_closedir.patch
+169_xf86AutoConfig_choose_default_driver_if_no_pci.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
