* Don't do compositing when using the OpenGL software renderer

(NixOS/121).

svn path=/nixpkgs/branches/x-updates/; revision=26281
This commit is contained in:
Eelco Dolstra 2011-03-11 16:40:59 +00:00
parent cc3d1e1c09
commit eff916e9d9
2 changed files with 24 additions and 0 deletions

View file

@ -15,6 +15,13 @@ kde.package {
strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate
pciutils bluez networkmanager ];
patches =
[ # Don't do compositing with the software GLX driver, since it's
# completely broken (corrupt output, server crashes, etc.).
# (NixOS/121)
./no-software-compositing.patch
];
meta = {
description = "KDE base platform-specific components";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";

View file

@ -0,0 +1,17 @@
diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp
--- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp 2010-06-24 18:28:18.000000000 +0200
+++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp 2011-03-11 16:33:07.296566718 +0100
@@ -314,9 +314,10 @@
//else if( mDriver == "radeon" )
// {
// }
- //else if( mDriver == "software" )
- // {
- // }
+ else if( mDriver == "software" )
+ {
+ mRecommendCompositing = false;
+ }
}