mesa: Changes to 'ubuntu'
debian/changelog | 4 ++
debian/patches/118_fix_24bpp_software_renering.diff | 30 ++++++++++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+)
New commits:
commit 63b435138b4a26cb5297a091ee29375d3efd0491
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 3 09:44:59 2011 +1000
New upstream closes LP bug in changelog
diff --git a/debian/changelog b/debian/changelog
index 5e3c31a..45bc3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (7.11-0ubuntu1) oneiric; urgency=low
* Fake merge from Debian experimental, updating previous changelog entries.
+ New upstream release fixes infrequent X crash (LP: #800778).
Remaining Ubuntu changes:
- debian/control
+ Drop lesstif-dev from Build-Depends; it's in Universe.
commit a975b68e78c3ce219f2e3b401752b0aebe708e7b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Aug 3 09:44:27 2011 +1000
Cherry-pick 24bpp software rendering patch from master
diff --git a/debian/changelog b/debian/changelog
index 4012293..5e3c31a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,9 @@ mesa (7.11-0ubuntu1) oneiric; urgency=low
- Use alternatives for libEGL to match the handling of libGL.
libEGL (and associated GL|ES and OpenVG libraries) now live in
/usr/lib/$MULTIARCH/mesa-egl. (LP: #812639)
+ * debian/patches/118_fix_24bpp_software_rendering.diff:
+ - Cherry pick upstream patch from master fixing graphical corruption when
+ using a 24bpp framebuffer and software rendering. (LP: #810339)
-- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 19 Jul 2011 09:15:22 +1000
diff --git a/debian/patches/118_fix_24bpp_software_renering.diff b/debian/patches/118_fix_24bpp_software_renering.diff
new file mode 100644
index 0000000..b7626f4
--- /dev/null
+++ b/debian/patches/118_fix_24bpp_software_renering.diff
@@ -0,0 +1,30 @@
+commit cfec000e7514342fd51859906e173ba2d474a55c
+Author: Marc Pignat <marc@pignat.org>
+Date: Tue Jun 28 15:21:58 2011 +0200
+
+ drisw: Fix 24bpp software rendering, take 2
+
+ This patch add the support for 24bpp in the dri/swrast implementation.
+ See http://bugs.freedesktop.org/show_bug.cgi?id=23525
+
+ Signed-off-by: Marc Pignat <marc at pignat.org>
+ Signed-off-by: Brian Paul <brianp@vmware.com>
+
+diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
+index d0137ee..7bd6450 100644
+--- a/src/glx/drisw_glx.c
++++ b/src/glx/drisw_glx.c
+@@ -100,6 +100,13 @@ XCreateDrawable(struct drisw_drawable * pdp,
+ 32, /* bitmap_pad */
+ 0); /* bytes_per_line */
+
++ /**
++ * swrast does not handle 24-bit depth with 24 bpp, so let X do the
++ * the conversion for us.
++ */
++ if (pdp->ximage->bits_per_pixel == 24)
++ pdp->ximage->bits_per_pixel = 32;
++
+ return True;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index c52fa81..b7fe03d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
117_handle_dri2connect_errors_when_indirect.diff
+118_fix_24bpp_software_renering.diff
Reply to: