mesa: Changes to 'ubuntu'
debian/changelog | 6 ++----
debian/patches/102_dont_vblank.patch | 13 +++++++++++++
debian/patches/series | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit fd884c9820a4d2a57f197a5f84538c952047a7d4
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 9 21:54:40 2008 +0200
Update the changelog for release.
diff --git a/debian/changelog b/debian/changelog
index e3f0ada..3540574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) UNRELEASED; urgency=low
+mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) jaunty; urgency=low
* Merge from debian-experimental git branch.
* 103_fix-crash-in-i830_emit_state.dpatch: deleted, included
upstream.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 02:22:15 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 21:54:28 +0200
mesa (7.2+git20081209.a0d5c3cf-1) UNRELEASED; urgency=low
commit 140616f8c28beae67b3f9caad6dc68cb29165953
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 9 21:45:34 2008 +0200
the vblank patch is still needed
diff --git a/debian/changelog b/debian/changelog
index af384d9..e3f0ada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) UNRELEASED; urgency=low
* Merge from debian-experimental git branch.
- * 102_dont_vblank.patch: deleted, this workaround is not needed
- anymore.
* 103_fix-crash-in-i830_emit_state.dpatch: deleted, included
upstream.
diff --git a/debian/patches/102_dont_vblank.patch b/debian/patches/102_dont_vblank.patch
new file mode 100644
index 0000000..99000f2
--- /dev/null
+++ b/debian/patches/102_dont_vblank.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 5233e58..5dded4b 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] =
+ DRI_CONF_BEGIN
+ DRI_CONF_SECTION_PERFORMANCE
+ DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
+- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC)
++ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
+ /* Options correspond to DRI_CONF_BO_REUSE_DISABLED,
+ * DRI_CONF_BO_REUSE_ALL
+ */
diff --git a/debian/patches/series b/debian/patches/series
index bdefe59..f0e7c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
03_optional-progs-and-install.patch
04_osmesa_version.diff
101_ubuntu_hidden_glname.patch
+102_dont_vblank.patch
Reply to: