mesa: Changes to 'ubuntu'
debian/changelog | 14 ++++++++++++++
debian/patches/102_dont_vblank.patch | 13 +++++++++++++
debian/patches/series | 1 +
debian/rules | 2 ++
4 files changed, 30 insertions(+)
New commits:
commit 24c4270e13c0f3aa0c4ae19bdcb98ada799dbc95
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 16 13:08:13 2008 +0300
Prepare the changelog for upload, and add a bug closer.
diff --git a/debian/changelog b/debian/changelog
index 724305a..9b9bfac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (7.1-1ubuntu3) UNRELEASED; urgency=low
+mesa (7.1-1ubuntu3) intrepid; urgency=low
- * debian/rules: Build i915 and i965 DRI drivers on lpia.
+ * debian/rules: Build i915 and i965 DRI drivers on lpia. (LP: #270106)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 13:05:56 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 13:07:02 +0300
mesa (7.1-1ubuntu2) intrepid; urgency=low
commit d31984743c26bf1bfdc7e019c2199b04fd1d2b5a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 16 13:06:30 2008 +0300
build i965 as well on lpia.
diff --git a/debian/changelog b/debian/changelog
index 13f25ae..724305a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
mesa (7.1-1ubuntu3) UNRELEASED; urgency=low
- * debian/rules: Build i915_dri.so and only that on lpia.
+ * debian/rules: Build i915 and i965 DRI drivers on lpia.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 15 Sep 2008 13:32:34 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 13:05:56 +0300
mesa (7.1-1ubuntu2) intrepid; urgency=low
diff --git a/debian/rules b/debian/rules
index 23c462d..73d937e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
else ifeq ($(DEB_HOST_ARCH), sparc)
DRI_DRIVERS += ffb
else ifeq ($(DEB_HOST_ARCH), lpia)
- DRI_DRIVERS = i915
+ DRI_DRIVERS = i915 i965
endif
confflags-dri = \
commit 5002b375a1ae2626bdd14d3e6710946cba3e1f2e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Sep 15 16:05:39 2008 +0300
Build i915_dri.so and only that on lpia.
diff --git a/debian/changelog b/debian/changelog
index c78d586..13f25ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.1-1ubuntu3) UNRELEASED; urgency=low
+
+ * debian/rules: Build i915_dri.so and only that on lpia.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 15 Sep 2008 13:32:34 +0300
+
mesa (7.1-1ubuntu2) intrepid; urgency=low
* 102_dont_vblank.patch
diff --git a/debian/rules b/debian/rules
index dbfd14d..23c462d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,8 @@ else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
DRI_DRIVERS += i915 i965 sis unichrome
else ifeq ($(DEB_HOST_ARCH), sparc)
DRI_DRIVERS += ffb
+else ifeq ($(DEB_HOST_ARCH), lpia)
+ DRI_DRIVERS = i915
endif
confflags-dri = \
commit 4f2e014fcd7c6fa58172c768f843e678c1332ea0
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 11:25:41 2008 +0300
102_dont_vblank.patch
Revert the commit which defaults to vblank on intel. It breaks
DPMS with compiz, resulting in a hang. (LP: 262605)
diff --git a/debian/changelog b/debian/changelog
index ef69161..c78d586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.1-1ubuntu2) intrepid; urgency=low
+
+ * 102_dont_vblank.patch
+ - Revert the commit which defaults to vblank on intel. It breaks
+ DPMS with compiz, resulting in a hang. (LP: 262605)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 12 Sep 2008 11:25:01 +0300
+
mesa (7.1-1ubuntu1) intrepid; urgency=low
* Merge from debian experimental, remaining changes:
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: