mesa: Changes to 'debian-experimental'
debian/changelog | 8 ++++++--
debian/control | 2 +-
debian/patches/01_disable-intel-classic-warn.diff | 14 ++++++++++++++
debian/patches/series | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 84bb8fc6958dc4c61c5a2684724cc6bd06377b5c
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 24 14:28:28 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index cb8c9f5..9adcd91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.2-1) UNRELEASED; urgency=low
+mesa (7.2-1) experimental; urgency=low
[ Brice Goglin ]
* Fix grammar and punctuation in glxinfo(1), thanks Sam Hocevar,
@@ -12,7 +12,7 @@ mesa (7.2-1) UNRELEASED; urgency=low
* Remove the build-dep on dri2proto, DRI2 support has been removed.
* intel: don't warn about TTM init failure.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 23 Sep 2008 16:08:48 +0300
+ -- Julien Cristau <jcristau@debian.org> Wed, 24 Sep 2008 14:28:21 +0200
mesa (7.1-1) experimental; urgency=low
commit 872cb1a0dd16304cc5a0cecc642cc6c6d3781d44
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 24 14:25:30 2008 +0200
intel: don't warn about TTM init failure.
diff --git a/debian/changelog b/debian/changelog
index ea1bf79..cb8c9f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mesa (7.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove the build-dep on dri2proto, DRI2 support has been removed.
+ * intel: don't warn about TTM init failure.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 23 Sep 2008 16:08:48 +0300
diff --git a/debian/patches/01_disable-intel-classic-warn.diff b/debian/patches/01_disable-intel-classic-warn.diff
new file mode 100644
index 0000000..0725ffe
--- /dev/null
+++ b/debian/patches/01_disable-intel-classic-warn.diff
@@ -0,0 +1,14 @@
+Index: mesa/src/mesa/drivers/dri/intel/intel_context.c
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/intel/intel_context.c
++++ mesa/src/mesa/drivers/dri/intel/intel_context.c
+@@ -490,9 +490,6 @@
+ if (intel->bufmgr == NULL) {
+ if (ttm_disable) {
+ fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
+- } else {
+- fprintf(stderr, "Failed to initialize TTM buffer manager. "
+- "Falling back to classic.\n");
+ }
+
+ if (intelScreen->tex.size == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 86f17dc..f7ae615 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_disable-intel-classic-warn.diff
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
04_osmesa_version.diff
commit ee80a3a623bc9d0f9ea01a3c1e03204300f44097
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 24 12:55:15 2008 +0200
Remove the build-dep on dri2proto, DRI2 support has been removed.
diff --git a/debian/changelog b/debian/changelog
index b5e1f27..ea1bf79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ mesa (7.2-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch 04_osmesa_version.diff
+ [ Julien Cristau ]
+ * Remove the build-dep on dri2proto, DRI2 support has been removed.
+
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 23 Sep 2008 16:08:48 +0300
mesa (7.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 80f7198..bfec2bf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.or
Standards-Version: 3.7.3
Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.3.1) [!hurd-i386], libx11-dev, xutils-dev,
- x11proto-gl-dev (>= 1.4.8), x11proto-dri2-dev, libxxf86vm-dev,
+ x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev,
libxdamage-dev, libxext-dev, autoconf, automake
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Reply to: