[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 debian/changelog                                           |    9 ++++
 debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch |   28 +++++++++++++
 debian/patches/series                                      |    1 
 3 files changed, 38 insertions(+)

New commits:
commit 67f934923b12f70b2b62d8993a7f247bd427dd99
Author: Bryce Harrington <bryce@canonical.com>
Date:   Tue Feb 15 15:30:39 2011 -0800

    Add 109_fix_length_of_glxgetfbconfigssgix.patch: Second try at fix for "BadLength (poly request too large or internal Xlib length" when using non-C, non-en locales.  This time with the real fix. (LP: #714280)

diff --git a/debian/changelog b/debian/changelog
index eff1c45..2ba67c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.10-1ubuntu3) natty; urgency=low
+
+  * Add 109_fix_length_of_glxgetfbconfigssgix.patch: Second try at fix for
+    "BadLength (poly request too large or internal Xlib length" when using
+    non-C, non-en locales.  This time with the real fix.
+    (LP: #714280)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 15 Feb 2011 15:28:33 -0800
+
 mesa (7.10-1ubuntu2) natty; urgency=low
 
   * Add 108_fix_leaks_dri2_screen_creation.patch: Cherrypick from upstream
diff --git a/debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch b/debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch
new file mode 100644
index 0000000..066e57a
--- /dev/null
+++ b/debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch
@@ -0,0 +1,28 @@
+From cbe9fc12a64c3ae89fd1b20e9e165aa4b76293a5 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Wed, 26 Jan 2011 12:03:17 +0000
+Subject: glx: fix length of GLXGetFBConfigsSGIX
+
+The extra length is the size of the request *minus* the size of the
+VendorPrivate header, not the addition.
+
+NOTE: This is a candidate for the 7.9 and 7.10 branches
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Brian Paul <brianp@vmware.com>
+---
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index c5e9d05..c75c9bf 100644
+--- a/src/glx/glxext.c
++++ b/src/glx/glxext.c
+@@ -688,7 +688,7 @@ static GLboolean
+    }
+    else if (strstr(psc->serverGLXexts, "GLX_SGIX_fbconfig") != NULL) {
+       GetReqExtra(GLXVendorPrivateWithReply,
+-                  sz_xGLXGetFBConfigsSGIXReq +
++                  sz_xGLXGetFBConfigsSGIXReq -
+                   sz_xGLXVendorPrivateWithReplyReq, vpreq);
+       sgi_req = (xGLXGetFBConfigsSGIXReq *) vpreq;
+       sgi_req->reqType = priv->majorOpcode;
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index ab4131f..93d03c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 105_use_shared_libdricore.patch
 107_winsys_buffer_nullptr.patch
 108_fix_leaks_dri2_screen_creation.patch
+109_fix_length_of_glxgetfbconfigssgix.patch


Reply to: