debian/changelog | 8 +++++ debian/patches/103_fix-crash-in-i830_emit_state.dpatch | 23 +++++++++++++++++ debian/patches/series | 1 3 files changed, 32 insertions(+)
New commits: commit 998b8d31768efa907000d072660c82fd3d7059fa Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Fri Nov 28 16:01:10 2008 +0200 Add a missing commit debian/patches/103_fix-crash-in-i830_emit_state.dpatch: - Apply upstream commit to fix a crash in i830_emit_state (LP: #277709) diff --git a/debian/changelog b/debian/changelog index a78d662..b367052 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mesa (7.2-1ubuntu2) intrepid; urgency=low + + * debian/patches/103_fix-crash-in-i830_emit_state.dpatch: + - Apply upstream commit to fix a crash in i830_emit_state + (LP: #277709) + + -- Chris Coulson <[EMAIL PROTECTED]> Tue, 21 Oct 2008 17:55:10 +0100 + mesa (7.2-1ubuntu1) intrepid; urgency=low * Merge from Debian experimental. diff --git a/debian/patches/103_fix-crash-in-i830_emit_state.dpatch b/debian/patches/103_fix-crash-in-i830_emit_state.dpatch new file mode 100644 index 0000000..736cdf0 --- /dev/null +++ b/debian/patches/103_fix-crash-in-i830_emit_state.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 103_fix-crash-in-i830_emit_state.dpatch by Chris Coulson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This patch fixes a crash in i830_emit_state. +## DP: Upstream commit - 48c29b60a899877c76d643b9cd06d5277cd97b9c +## DP: Upstream bug report - https://bugs.freedesktop.org/show_bug.cgi?id=17766 +## DP: Ubuntu bug report - https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/277709 + [EMAIL PROTECTED]@ +diff -urNad mesa-7.2~/src/mesa/drivers/dri/i915/i830_vtbl.c mesa-7.2/src/mesa/drivers/dri/i915/i830_vtbl.c +--- mesa-7.2~/src/mesa/drivers/dri/i915/i830_vtbl.c 2008-08-25 15:49:40.000000000 +0100 ++++ mesa-7.2/src/mesa/drivers/dri/i915/i830_vtbl.c 2008-10-21 17:43:44.000000000 +0100 +@@ -444,7 +444,8 @@ + ret = 0; + if (dirty & I830_UPLOAD_BUFFERS) { + ret |= dri_bufmgr_check_aperture_space(state->draw_region->buffer); +- ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer); ++ if (state->depth_region) ++ ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer); + } + + for (i = 0; i < I830_TEX_UNITS; i++) diff --git a/debian/patches/series b/debian/patches/series index 617197e..a4f71e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 04_osmesa_version.diff 101_ubuntu_hidden_glname.patch 102_dont_vblank.patch +103_fix-crash-in-i830_emit_state.dpatch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]