From 240a2bc962b1a2cca97391320d43f0141184567c6347bf8aac80f5b49c2362ad Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 9 Jul 2008 00:43:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=37

---
 Mesa.changes             |  6 ++++++
 Mesa.spec                |  7 ++++++-
 disable_ttm_warning.diff | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 disable_ttm_warning.diff

diff --git a/Mesa.changes b/Mesa.changes
index c681938..4657457 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul  8 22:51:32 CEST 2008 - sndirsch@suse.de
+
+- disable_ttm_warning.diff
+  * disables confusing warning, that TTM cannot be initialized 
+
 -------------------------------------------------------------------
 Fri Jul  4 22:15:48 CEST 2008 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 5554039..8bd461b 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -20,7 +20,7 @@ Provides:       xorg-x11-Mesa
 Obsoletes:      xorg-x11-Mesa
 AutoReqProv:    on
 Version:        7.1
-Release:        1
+Release:        2
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
 Source:         MesaLib-6befdca.tar.bz2
 Source1:        MesaDemos-%{version}-rc1.tar.bz2
@@ -30,6 +30,7 @@ Source4:        manual-pages.tar.bz2
 Patch1:         dri_driver_dir.diff
 Patch2:         MesaLib-6befdca.diff
 Patch6:         link-shared.diff
+Patch7:         disable_ttm_warning.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -118,6 +119,7 @@ sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
 ### FIXME
 #%patch6
 %endif
+%patch7 -p1
 
 %build
 
@@ -241,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libOSMesa.a
 
 %changelog
+* Wed Jul 09 2008 sndirsch@suse.de
+- disable_ttm_warning.diff
+  * disables confusing warning, that TTM cannot be initialized
 * Sat Jul 05 2008 sndirsch@suse.de
 - udpated to Mesa 7.1-pre
 * Tue Apr 15 2008 sndirsch@suse.de
diff --git a/disable_ttm_warning.diff b/disable_ttm_warning.diff
new file mode 100644
index 0000000..a2d3a56
--- /dev/null
+++ b/disable_ttm_warning.diff
@@ -0,0 +1,14 @@
+diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
+index f8ea646..e7d6091 100644
+--- a/src/mesa/drivers/dri/intel/intel_context.c
++++ b/src/mesa/drivers/dri/intel/intel_context.c
+@@ -487,9 +487,6 @@ intel_init_bufmgr(struct intel_context *intel)
+    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) {