author | Xavier Boudet <x-boudet@ti.com> | |
Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000) | ||
committer | Xavier Boudet <x-boudet@ti.com> | |
Wed, 21 Mar 2012 08:29:47 +0000 (08:29 +0000) |
Conflicts:
debian/changelog
debian/changelog
debian/changelog | patch | blob | history | |
debian/patches/111_armel-drv-fallbacks.patch | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 2496f56557d50bdbb2a3c57602bd4227fad266c5..18e833dec93d52b2a4c20a7b5a5d340eded8517e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
+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 <ricardo.salveti@linaro.org> Tue, 20 Mar 2012 02:09:18 -0300
+
xorg-server (2:1.11.4-0ubuntu6+ti1.0) precise; urgency=low
* Rebased dri2video support on 0ubuntu6
diff --git a/debian/patches/111_armel-drv-fallbacks.patch b/debian/patches/111_armel-drv-fallbacks.patch
index 540a2d05840d9331c227b4532f9d4debe5e4edd0..501427896de2a86b57542b612bb86a770cf37f72 100644 (file)
-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
#ifdef sun
# include <sys/visual_io.h>
# include <ctype.h>
-@@ -198,6 +204,28 @@
+@@ -198,6 +204,26 @@
return ret == CONFIG_OK;
}
+ 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__) */
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