xorg-server: Changes to 'ubuntu'
debian/changelog | 5 +++++
debian/patches/111_armel-drv-fallbacks.patch | 12 +++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit c4ec662167b4e83e9caf05194055ba80148a33a1
Author: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Date: Mon Aug 22 17:16:29 2011 +0300
Include support for the pvr driver available on OMAP 4 (LP: #828494)
diff --git a/debian/changelog b/debian/changelog
index bd96e13..e060f2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg-server (2:1.10.2.902-1ubuntu4) UNRELEASED; urgency=low
+ [ Christopher James Halse Rogers ]
* Drop i8xx-disablement patch. 2.6.39 and later kernels contain a patch
which alledgedly fixes the cache-incoherency problems. (LP: #817814)
+ [ Ricardo Salveti de Araujo ]
+ * debian/patches/112_armel-pvr-drv.patch:
+ - Include support for the pvr driver available on OMAP 4 (LP: #828494)
+
-- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 01 Aug 2011 16:27:52 +1000
xorg-server (2:1.10.2.902-1ubuntu3) oneiric; urgency=low
diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index 17bbb94..59415dc 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -1,11 +1,7 @@
----
- hw/xfree86/common/xf86AutoConfig.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-11 01:50:04 +0000
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-11 01:52:08 +0000
@@ -44,6 +44,12 @@
# include "xf86sbusBus.h"
#endif
@@ -48,7 +44,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -282,6 +310,14 @@
+@@ -282,6 +310,16 @@
#if !defined(__linux__) && defined(__sparc__)
matches[i++] = xnfstrdup("wsfb");
#else
@@ -57,6 +53,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ matches[i++] = xnfstrdup("imx");
+ else if (test_sysfs_device("dovefb", "dovefb"))
+ matches[i++] = xnfstrdup("dovefb");
++ else if (test_sysfs_device("omap", "pvr"))
++ matches[i++] = xnfstrdup("pvr");
+ else if (test_sysfs_device("omapfb", "omapfb"))
+ matches[i++] = xnfstrdup("omapfb");
+#endif /* defined(__linux__) && defined(__arm__) */
Reply to: