diff -Nru kdebase-workspace-4.6.2a/debian/changelog kdebase-workspace-4.6.2a/debian/changelog --- kdebase-workspace-4.6.2a/debian/changelog 2011-04-09 21:28:31.000000000 +0000 +++ kdebase-workspace-4.6.2a/debian/changelog 2011-04-18 03:54:03.000000000 +0000 @@ -1,3 +1,10 @@ +kdebase-workspace (4:4.6.2a-0ubuntu5~edgers) natty; urgency=low + + * Add xorg-edgers-kwin.patch: Allow direct rendering if the GL renderer + string contains Intel. + + -- Robert Hooker Sun, 17 Apr 2011 23:44:42 -0400 + kdebase-workspace (4:4.6.2a-0ubuntu4) natty; urgency=low * Add kubuntu_121_kdm_halt_cmd.diff imported from upstream diff -Nru kdebase-workspace-4.6.2a/debian/patches/series kdebase-workspace-4.6.2a/debian/patches/series --- kdebase-workspace-4.6.2a/debian/patches/series 2011-04-09 21:28:31.000000000 +0000 +++ kdebase-workspace-4.6.2a/debian/patches/series 2011-04-18 03:54:03.000000000 +0000 @@ -30,3 +30,4 @@ kubuntu_119_remove_empty_librarypath_key.diff kubuntu_120_ksysguard_sensors.diff kubuntu_121_kdm_halt_cmd.diff +xorg-edgers-kwin.patch diff -Nru kdebase-workspace-4.6.2a/debian/patches/xorg-edgers-kwin.patch kdebase-workspace-4.6.2a/debian/patches/xorg-edgers-kwin.patch --- kdebase-workspace-4.6.2a/debian/patches/xorg-edgers-kwin.patch 1970-01-01 00:00:00.000000000 +0000 +++ kdebase-workspace-4.6.2a/debian/patches/xorg-edgers-kwin.patch 2011-04-18 03:54:03.000000000 +0000 @@ -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"))