Merge lp:~linaro-maintainers/ubuntu/oneiric/xorg-server/pvr-omap4-fallback into lp:ubuntu/oneiric/xorg-server

[Ricardo Salveti]

Simple change, just updating debian/patches/112_armel-pvr-drv.patch to include another use case at ARM, when using Ubuntu on a Pandaboard (OMAP 4).

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-11 10:03:26 +0000
+++ debian/changelog	2011-08-18 07:25:28 +0000
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.2.902-1ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/112_armel-pvr-drv.patch:
+    - Including support for the pvr driver available at OMAP 4 (LP: #828494)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 18 Aug 2011 02:03:31 -0300
+
 xorg-server (2:1.10.2.902-1ubuntu3) oneiric; urgency=low
 
   * debian/patches/220_xi21_always_deliver_raw_events.diff:
 
=== modified file 'debian/patches/111_armel-drv-fallbacks.patch'
--- debian/patches/111_armel-drv-fallbacks.patch	2011-04-11 09:51:56 +0000
+++ debian/patches/111_armel-drv-fallbacks.patch	2011-08-18 07:25:28 +0000
@@ -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 @@
  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 @@
 +           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__) */