[kdebase-workspace] * Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-4 - fix kde#270942 (direct rendering

[Kevin Kofler]

commit f9c6236d594f9c40386d2b9c6b0d7ad948e42203
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Apr 21 18:37:48 2011 +0200

    * Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-4
    - fix kde#270942 (direct rendering disabled on Intel graphics since mesa 7.10.1)

 ...orkspace-4.6.2-kwin-opengltest-kde#270942.patch |   14 ++++++++++++++
 kdebase-workspace.spec                             |   11 +++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/kdebase-workspace-4.6.2-kwin-opengltest-kde#270942.patch b/kdebase-workspace-4.6.2-kwin-opengltest-kde#270942.patch
new file mode 100644
index 0000000..ce2362d
--- /dev/null
+++ b/kdebase-workspace-4.6.2-kwin-opengltest-kde#270942.patch
@@ -0,0 +1,14 @@
+diff --git a/kwin/opengltest/opengltest.cpp b/kwin/opengltest/opengltest.cpp
+index d2d8f70..2a65c05 100644
+--- a/kwin/opengltest/opengltest.cpp
++++ b/kwin/opengltest/opengltest.cpp
+@@ -87,7 +87,8 @@ int main(int argc, char *argv[])
+         return 0;
+ 
+     // The Intel driver doesn't have DRI2 in the renderer string
+-    if (strstr((const char *)renderer, "GEM"))
++    // but if Intel is present DRI2 is in use.
++    if (strstr((const char *)renderer, "Intel"))
+         return 0;
+ 
+     if (strstr((const char *)renderer, "Gallium"))
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 85e5f91..40fdc7d 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.2
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.2
 
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -72,10 +72,13 @@ Patch100: kdebase-workspace-4.6.2-nvbacklight.patch
 Patch101: kdebase-workspace-4.6.1-ksysguard-add-missing-module.patch
 
 ## Fedora specific patches
-# HALsectomy
+## HAL-ectomy
 Patch200: kdebase-workspace-4.5.85-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
+## other
 Patch220: kdebase-workspace-4.6.1-nm-09-compat.patch
+# fix kde#270942 (direct rendering disabled on Intel graphics since mesa 7.10.1)
+Patch300: kdebase-workspace-4.6.2-kwin-opengltest-kde#270942.patch
 
 ## trunk patches
 
@@ -323,6 +326,7 @@ Requires: akonadi
 %if 0%{?fedora} > 14
 %patch220 -p1 -b .nm-09-compat
 %endif
+%patch300 -p1 -b .kde#270942
 
 
 %build
@@ -736,6 +740,9 @@ fi
 
 
 %changelog
+* Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-4
+- fix kde#270942 (direct rendering disabled on Intel graphics since mesa 7.10.1)
+
 * Fri Apr 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 4.6.2-3
 - fix the temperature plasmoids and ksysguard temperature sensors regression