debian/changelog | 6 ++++++
debian/patches/111_armel-drv-fallbacks.patch | 8 +++++---
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 32a6a97f450fc4231fbcb5696fb528998e778c57
Author: Alberto Milone <alberto.mil...@canonical.com>
Date: Mon Apr 12 17:30:02 2010 +0200
Adding changes from Alexander Sack to add support for omapfb
in 111_armel-drv-fallbacks.patch
diff --git a/debian/changelog b/debian/changelog
index 0be473b..e8cd6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.6-2ubuntu3) lucid; urgency=low
+
+ * add support for omapfb to 111_armel-drv-fallbacks.patch
+
+ -- Alexander Sack <a...@ubuntu.com> Mon, 12 Apr 2010 14:43:42 +0200
+
xorg-server (2:1.7.6-2ubuntu2) lucid; urgency=low
[Bryce Harrington]
diff --git a/debian/patches/111_armel-drv-fallbacks.patch
b/debian/patches/111_armel-drv-fallbacks.patch
index 35ebc71..835be3f 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -46,15 +46,17 @@ Index: xorg-server-1.7.6/hw/xfree86/common/xf86AutoConfig.c
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -544,7 +571,16 @@
+@@ -544,7 +571,18 @@
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
#else
+#if defined(__linux__) && defined(__arm__)
+ if (test_sysfs_device("mxc_gpu", "imx"))
-+ matches[i++] = xnfstrdup("imx");
++ matches[i++] = xnfstrdup("imx");
+ else if (test_sysfs_device("dovefb", "dovefb"))
-+ matches[i++] = xnfstrdup("dovefb");
++ matches[i++] = xnfstrdup("dovefb");
++ else if (test_sysfs_device("omapfb", "omapfb"))
++ matches[i++] = xnfstrdup("omapfb");
+ else
+ matches[i++] = xnfstrdup("fbdev");
+#else
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o1lc9-0001bg...@alioth.debian.org
