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

Proposed by Ricardo Salveti on 2011-08-18
Status: Merged
Merged at revision: 222
Proposed branch: lp:~linaro-maintainers/ubuntu/oneiric/xorg-server/pvr-omap4-fallback
Merge into: lp:ubuntu/oneiric/xorg-server
Diff against target: 50 lines (+12/-7)
2 files modified
debian/changelog (+7/-0)
debian/patches/111_armel-drv-fallbacks.patch (+5/-7)
To merge this branch: bzr merge lp:~linaro-maintainers/ubuntu/oneiric/xorg-server/pvr-omap4-fallback
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-08-18 Pending
Review via email: mp+71992@code.launchpad.net

Description of the change

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).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-11 10:03:26 +0000
3+++ debian/changelog 2011-08-18 07:25:28 +0000
4@@ -1,3 +1,10 @@
5+xorg-server (2:1.10.2.902-1ubuntu4) UNRELEASED; urgency=low
6+
7+ * debian/patches/112_armel-pvr-drv.patch:
8+ - Including support for the pvr driver available at OMAP 4 (LP: #828494)
9+
10+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Thu, 18 Aug 2011 02:03:31 -0300
11+
12 xorg-server (2:1.10.2.902-1ubuntu3) oneiric; urgency=low
13
14 * debian/patches/220_xi21_always_deliver_raw_events.diff:
15
16=== modified file 'debian/patches/111_armel-drv-fallbacks.patch'
17--- debian/patches/111_armel-drv-fallbacks.patch 2011-04-11 09:51:56 +0000
18+++ debian/patches/111_armel-drv-fallbacks.patch 2011-08-18 07:25:28 +0000
19@@ -1,11 +1,7 @@
20----
21- hw/xfree86/common/xf86AutoConfig.c | 32 ++++++++++++++++++++++++++++++++
22- 1 file changed, 32 insertions(+)
23-
24 Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
25 ===================================================================
26---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
27-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-04-09 10:38:10.000000000 +0300
28+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-11 01:50:04 +0000
29++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-11 01:52:08 +0000
30 @@ -44,6 +44,12 @@
31 # include "xf86sbusBus.h"
32 #endif
33@@ -48,7 +44,7 @@
34 static void
35 listPossibleVideoDrivers(char *matches[], int nmatches)
36 {
37-@@ -282,6 +310,14 @@
38+@@ -282,6 +310,16 @@
39 #if !defined(__linux__) && defined(__sparc__)
40 matches[i++] = xnfstrdup("wsfb");
41 #else
42@@ -57,6 +53,8 @@
43 + matches[i++] = xnfstrdup("imx");
44 + else if (test_sysfs_device("dovefb", "dovefb"))
45 + matches[i++] = xnfstrdup("dovefb");
46++ else if (test_sysfs_device("omap", "pvr"))
47++ matches[i++] = xnfstrdup("pvr");
48 + else if (test_sysfs_device("omapfb", "omapfb"))
49 + matches[i++] = xnfstrdup("omapfb");
50 +#endif /* defined(__linux__) && defined(__arm__) */

Subscribers

People subscribed via source and target branches