debian/changelog | 10 ++---
debian/patches/107_enable_all_radeon_fbconfigs.patch | 34 -------------------
debian/patches/series | 3 -
3 files changed, 5 insertions(+), 42 deletions(-)
New commits:
commit 0b3e122d4fb66e4aa3bab765dd0aa171471b7488
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Apr 17 11:53:45 2009 -0700
Revert last change by mario so we can get the mesa fix to
drop patch 103 out ASAP.
diff --git a/debian/changelog b/debian/changelog
index f572595..0824c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,10 @@
-mesa (7.4-0ubuntu4) jaunty; urgency=low
+mesa (7.4-0ubuntu3) jaunty; urgency=low
* Disable 103_bump_965_texture_limit.diff. This is suspected to cause X
freeze issues.
- (LP: #359392, Reopen: 146298)
-
- -- Bryce Harrington <br...@ubuntu.com> Fri, 17 Apr 2009 10:33:21 -0700
-
-mesa (7.4-0ubuntu3) jaunty; urgency=low
-
- * Add 107_enable_all_radeon_fbconfigs.patch. Resolves X errors causing fonts
- and most QT3 widgets from being shown. These regressions were caused by
- changes in behavior for Xorg server 1.5. This patch is based on a similar
- patch that was applied to swrast previously, 104_swrast_fbconfigs.patch.
- (LP: #341898)
+ (LP: 359392, Reopen: 146298)
- -- Mario Limonciello <supe...@ubuntu.com> Thu, 16 Apr 2009 23:24:34 -0500
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 17 Apr 2009 11:48:50 -0700
mesa (7.4-0ubuntu2) jaunty; urgency=low
diff --git a/debian/patches/107_enable_all_radeon_fbconfigs.patch
b/debian/patches/107_enable_all_radeon_fbconfigs.patch
deleted file mode 100644
index d726c35..0000000
--- a/debian/patches/107_enable_all_radeon_fbconfigs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c
b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index ff65e6b..791daec 100644
---- a/src/mesa/drivers/dri/radeon/radeon_screen.c
-+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
-@@ -1159,6 +1159,8 @@ static void radeonDestroyContext(__DRIcontextPrivate *
driContextPriv)
- static const __DRIconfig **
- radeonInitScreen(__DRIscreenPrivate *psp)
- {
-+ const __DRIconfig **configs8, **configs16, **configs24, **configs32;
-+
- #if !RADEON_COMMON
- static const char *driver_name = "Radeon";
- static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 };
-@@ -1206,11 +1208,15 @@ radeonInitScreen(__DRIscreenPrivate *psp)
- if (!radeonInitDriver(psp))
- return NULL;
-
-- return radeonFillInModes( psp,
-- dri_priv->bpp,
-- (dri_priv->bpp == 16) ? 16 : 24,
-- (dri_priv->bpp == 16) ? 0 : 8,
-- (dri_priv->backOffset != dri_priv->depthOffset) );
-+ configs8 = radeonFillInModes(psp, 8, 8, 0, (dri_priv->backOffset !=
dri_priv->depthOffset));
-+ configs16 = radeonFillInModes(psp, 16, 16, 0, (dri_priv->backOffset !=
dri_priv->depthOffset));
-+ configs24 = radeonFillInModes(psp, 24, 24, 8, (dri_priv->backOffset !=
dri_priv->depthOffset));
-+ configs32 = radeonFillInModes(psp, 32, 24, 8, (dri_priv->backOffset !=
dri_priv->depthOffset));
-+
-+ configs16 = driConcatConfigs(configs8, configs16);
-+ configs24 = driConcatConfigs(configs16, configs24);
-+
-+ return driConcatConfigs(configs24, configs32);
- }
-
-
diff --git a/debian/patches/series b/debian/patches/series
index ff094a7..9e646e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
#103_bump_965_texture_limit.diff
104_fix_dri2_ext_tfp.diff
105_glXWaitX_segfaults.patch
-107_enable_all_radeon_fbconfigs.patch
commit f9f0f9a9a8d44cf34ea903bea6a1427fb24a551c
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Apr 17 10:35:38 2009 -0700
Disable patch 103
diff --git a/debian/changelog b/debian/changelog
index e48399d..f572595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.4-0ubuntu4) jaunty; urgency=low
+
+ * Disable 103_bump_965_texture_limit.diff. This is suspected to cause X
+ freeze issues.
+ (LP: #359392, Reopen: 146298)
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 17 Apr 2009 10:33:21 -0700
+
mesa (7.4-0ubuntu3) jaunty; urgency=low
* Add 107_enable_all_radeon_fbconfigs.patch. Resolves X errors causing fonts
diff --git a/debian/patches/series b/debian/patches/series
index 03f0018..ff094a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@
04_osmesa_version.diff
101_ubuntu_hidden_glname.patch
102_dont_vblank.diff
-103_bump_965_texture_limit.diff
+#103_bump_965_texture_limit.diff
104_fix_dri2_ext_tfp.diff
105_glXWaitX_segfaults.patch
107_enable_all_radeon_fbconfigs.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
