debian/changelog | 9 +++++++++ debian/patches/111_armel-drv-fallbacks.patch | 12 +++++------- 2 files changed, 14 insertions(+), 7 deletions(-)
New commits: commit 3c50828c901d584d1b623d8f0f325c954d7ec775 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Mar 21 12:54:39 2012 +1100 Fix arm autoprobe patch (LP: #959928) diff --git a/debian/changelog b/debian/changelog index 3756386..4bc443c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low + + * debian/patches/111_armel-drv-fallbacks.patch: + - Avoid loading the driver to test if it's available. Xorg will later load + and validate the module, and if it's already loaded it'll trigger an + error and invalidate the driver (LP: #959928) + + -- Ricardo Salveti de Araujo <[email protected]> Tue, 20 Mar 2012 02:09:18 -0300 + xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low * debian/patches/500_pointer_barrier_thresholds.diff: diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch index 540a2d0..5014278 100644 --- a/debian/patches/111_armel-drv-fallbacks.patch +++ b/debian/patches/111_armel-drv-fallbacks.patch @@ -1,7 +1,7 @@ -Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c +Index: xorg-server-1.11.4/hw/xfree86/common/xf86AutoConfig.c =================================================================== ---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-24 12:56:49.565650621 +0300 -+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-24 12:56:49.575650619 +0300 +--- xorg-server-1.11.4.orig/hw/xfree86/common/xf86AutoConfig.c 2012-03-20 02:08:02.154998574 -0300 ++++ xorg-server-1.11.4/hw/xfree86/common/xf86AutoConfig.c 2012-03-20 02:08:46.819220051 -0300 @@ -44,6 +44,12 @@ # include "xf86sbusBus.h" #endif @@ -15,7 +15,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c #ifdef sun # include <sys/visual_io.h> # include <ctype.h> -@@ -198,6 +204,28 @@ +@@ -198,6 +204,26 @@ return ret == CONFIG_OK; } @@ -35,8 +35,6 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c + if(!current_dir) + return 0; + -+ if (!LoadModule(driver_name, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) -+ return 0; + return 1; +} +#endif /* defined(__arm__) && defined(__linux__) */ @@ -44,7 +42,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c static void listPossibleVideoDrivers(char *matches[], int nmatches) { -@@ -282,6 +310,16 @@ +@@ -282,6 +308,16 @@ #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); #else -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
