debian/changelog | 7 +++++
debian/patches/111_fix_mesa_ref_fb_call_syntax.patch | 25 -------------------
debian/patches/series | 1
3 files changed, 7 insertions(+), 26 deletions(-)
New commits:
commit a05531b1bba3dcd3bc975776e7ec92fbc96410d0
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed Jun 24 17:09:01 2009 -0700
Removing 111; it fixed a build issue we didn't actually see.
diff --git a/debian/changelog b/debian/changelog
index 3a55f93..712c0b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.4.1-1ubuntu5) karmic; urgency=low
+
+ * Drop 111_fix_mesa_ref_fb_call_syntax.patch: Testing showed that 110
+ alone is sufficient to fix the issue.
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 24 Jun 2009 17:07:33 -0700
+
mesa (7.4.1-1ubuntu4) karmic; urgency=low
* Add 110_null_ptr_during_screen_tear_down.patch and
diff --git a/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch
b/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch
deleted file mode 100644
index 95e87c2..0000000
--- a/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4b8cd0b0ad48c3b0129451924f7461ffcbbc8597 Mon Sep 17 00:00:00 2001
-From: Brian Paul <bri...@vmware.com>
-Date: Mon, 22 Jun 2009 17:23:13 +0000
-Subject: intel: call _mesa_unreference_framebuffer() in intelDestroyBuffer()
-
-This was a call to _mesa_reference_framebuffer(ptr, NULL) but the NULL
-pointer is incorrect in Mesa 7.4.x.
-
-Fixes a failed assertion during screen tear-down.
----
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
-index 59fa54f..8d2a3a7 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -409,7 +409,7 @@ intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
- }
- }
-
-- _mesa_reference_framebuffer((GLframebuffer
**)(&(driDrawPriv->driverPrivate)), NULL);
-+ _mesa_unreference_framebuffer((GLframebuffer
**)(&(driDrawPriv->driverPrivate)));
- }
-
-
---
-cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 676e92d..f183d67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@
108_destroy_intel_fb.patch
109_release_direct_rendering_resources.patch
110_null_ptr_during_screen_tear_down.patch
-111_fix_mesa_ref_fb_call_syntax.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
