From 343e848d3d09755578f8c026bd59f41ad76b442b80a00b5a965851458f08a296 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 20 May 2011 12:23:37 +0000
Subject: [PATCH] Accepting request 70726 from home:namtrac:branches:X11:XOrg

Add intel-add-gem-string.patch. This reverts http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=b0a7492aebeb4517346f0da2362d6991a7385b59
because it breaks kwin, see http://blog.martin-graesslin.com/blog/2011/04/why-blur-does-not-work-in-kubuntu-natty-with-intel/

OBS-URL: https://build.opensuse.org/request/show/70726
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=152
---
 Mesa.changes               |  6 ++++++
 Mesa.spec                  |  2 ++
 intel-add-gem-string.patch | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 intel-add-gem-string.patch

diff --git a/Mesa.changes b/Mesa.changes
index 366645e..9b45083 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 19 18:10:53 UTC 2011 - idoenmez@novell.com
+
+- Add intel-add-gem-string.patch: Add back "GEM" string to Intel
+  driver's version output to fix OpenGL effects in kwin.
+
 -------------------------------------------------------------------
 Fri May  6 16:46:21 UTC 2011 - mhopf@novell.com
 
diff --git a/Mesa.spec b/Mesa.spec
index fa04420..f6dbed7 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -52,6 +52,7 @@ Source4:        manual-pages.tar.bz2
 Source5:        drirc
 # add update path for dri drivers
 Patch1:         dri_driver_dir.diff
+Patch2:         intel-add-gem-string.patch
 # to be upstreamed
 Patch8:         egl-buildfix.diff
 Patch9:         Mesa_indirect_old_xserver_compatibility.diff
@@ -144,6 +145,7 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
 # remove some docs
 rm -rf docs/README.{VMS,WIN32,OS2}
 %patch1
+%patch2
 sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
 sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
 %patch8
diff --git a/intel-add-gem-string.patch b/intel-add-gem-string.patch
new file mode 100644
index 0000000..4cd3fee
--- /dev/null
+++ b/intel-add-gem-string.patch
@@ -0,0 +1,24 @@
+Reverts http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=b0a7492aebeb4517346f0da2362d6991a7385b59
+because it breaks kwin, see http://blog.martin-graesslin.com/blog/2011/04/why-blur-does-not-work-in-kubuntu-natty-with-intel/
+
+
+--- src/mesa/drivers/dri/intel/intel_context.c	2011-03-01 22:35:03.000000000 +0100
++++ src/mesa/drivers/dri/intel/intel_context.c	2011-04-20 11:03:25.982000309 +0200
+@@ -61,6 +61,8 @@
+ int INTEL_DEBUG = (0);
+ #endif
+ 
++#define DRIVER_DATE "20100330 DEVELOPMENT"
++#define DRIVER_DATE_GEM "GEM " DRIVER_DATE
+ 
+ static const GLubyte *
+ intelGetString(struct gl_context * ctx, GLenum name)
+@@ -178,7 +180,7 @@
+          break;
+       }
+ 
+-      (void) driGetRendererString(buffer, chipset, "", 0);
++      (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0);
+       return (GLubyte *) buffer;
+ 
+    default: