xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++
debian/patches/113_quell_nouveau_aiglx.patch | 68 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 78 insertions(+)
New commits:
commit 4f7cea27bea67c87b9b0318352134fe35cdc96d5
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 31 16:42:55 2010 -0700
Pilfer fedora's patch to stifle aiglx error messages for nouveau
diff --git a/debian/changelog b/debian/changelog
index c7ebe0b..ff55836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.7.6-2ubuntu2) UNRELEASED; urgency=low
+
+ * Add 113_quell_nouveau_aiglx.patch: Don't emit error message about
+ AIGLX on nouveau. 3D is not supported yet on -nouveau so this error
+ message serves only to confuse bug reporters.
+ (LP: #529590)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 31 Mar 2010 16:37:45 -0700
+
xorg-server (2:1.7.6-2ubuntu1) lucid; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/patches/113_quell_nouveau_aiglx.patch b/debian/patches/113_quell_nouveau_aiglx.patch
new file mode 100644
index 0000000..9d0d392
--- /dev/null
+++ b/debian/patches/113_quell_nouveau_aiglx.patch
@@ -0,0 +1,68 @@
+Don't treat DRI setup failure as an error for nouveau.
+
+Patch derived from fedora's patch here:
+http://cvs.fedoraproject.org/viewvc/F-12/xorg-x11-server/xserver-1.6.1-nouveau.patch
+
+diff --git a/glx/glxdri.c b/glx/glxdri.c
+index 5fb75a4..45c79c9 100644
+--- a/glx/glxdri.c
++++ b/glx/glxdri.c
+@@ -967,6 +967,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ const __DRIconfig **driConfigs;
+ const __DRIextension **extensions;
+ int i;
++ int from = X_ERROR;
+
+ if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
+ !DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
+@@ -1046,7 +1047,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+
+ screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+ if (screen->driver == NULL) {
+- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
++ if (!strcmp(driverName, "nouveau"))
++ from = X_INFO;
++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
+ filename, dlerror());
+ goto handle_error;
+ }
+@@ -1183,7 +1186,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+
+ xfree(screen);
+
+- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
++ LogMessage(from, "AIGLX: reverting to software rendering\n");
+
+ return NULL;
+ }
+diff --git a/glx/glxdri2.c b/glx/glxdri2.c
+--- a/glx/glxdri2.c
++++ b/glx/glxdri2.c
+@@ -587,6 +587,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+ const __DRIextension **extensions;
+ const __DRIconfig **driConfigs;
+ int i;
++ int from = X_ERROR;
+
+ screen = xcalloc(1, sizeof *screen);
+ if (screen == NULL)
+@@ -613,7 +614,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+
+ screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+ if (screen->driver == NULL) {
+- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
++ if (!strcmp(driverName, "nouveau"))
++ from = X_INFO;
++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
+ filename, dlerror());
+ goto handle_error;
+ }
+@@ -692,7 +695,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+
+ xfree(screen);
+
+- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
++ LogMessage(from, "AIGLX: reverting to software rendering\n");
+
+ return NULL;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9bce5fd..43aba93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,6 +25,7 @@
110_findglyphbyhash-fix.patch
111_armel-drv-fallbacks.patch
112_xaa-fbcomposite-fix-negative-size.patch
+113_quell_nouveau_aiglx.patch
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
157_check_null_modes.patch
Reply to: