debian/changelog | 7 +++++++ debian/patches/111_armel-drv-fallbacks.patch | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-)
New commits: commit 0d9d38cfe7f7a6329972552cac07977f282650f8 Author: Bryce Harrington <[email protected]> Date: Thu Mar 24 21:53:42 2011 -0700 patches/111_armel-drv-fallbacks.patch: Always fallback to -fbdev, not just when no other X driver matches. (Thanks jcristau) diff --git a/debian/changelog b/debian/changelog index b907d39..eaafe69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.10.0-0ubuntu3) UNRELEASED; urgency=low + + * patches/111_armel-drv-fallbacks.patch: Always fallback to -fbdev, + not just when no other X driver matches. (Thanks jcristau) + + -- Bryce Harrington <[email protected]> Thu, 24 Mar 2011 21:52:17 -0700 + xorg-server (2:1.10.0-0ubuntu2) natty; urgency=low [Chase Douglas] diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch index b2afd99..31c9333 100644 --- a/debian/patches/111_armel-drv-fallbacks.patch +++ b/debian/patches/111_armel-drv-fallbacks.patch @@ -48,7 +48,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c static void listPossibleVideoDrivers(char *matches[], int nmatches) { -@@ -272,7 +300,18 @@ +@@ -272,7 +300,15 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else @@ -59,11 +59,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c + matches[i++] = xnfstrdup("dovefb"); + else if (test_sysfs_device("omapfb", "omapfb")) + matches[i++] = xnfstrdup("omapfb"); -+ else -+ matches[i++] = xnfstrdup("fbdev"); -+#else - matches[i++] = xnfstrdup("fbdev"); +#endif /* defined(__linux__) && defined(__arm__) */ + matches[i++] = xnfstrdup("fbdev"); #endif } } -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
