Merge lp:~timo-jyrinki/compiz/ubuntu.compiz-09712ubuntu2 into lp:~ubuntu-desktop/compiz/precise

[Timo Jyrinki]

* debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
      - Rename the blacklist patch, add verbose description and allow
        fullscreen unredirection for also Intel and Nouveau users using
        Mesa 9.0.x (Ubuntu 12.04.2 LTS or those who have opted in to LTS-Q
        packages). (LP: #1167321)
    * debian/patches/fix_1095001.patch
      - Cherry-pick a patch from upstream to fix CPU usage (LP: #1095001)

For didrocks. Only the last two commits are new since newest precise release.

[Didier Roche-Tolomelli (didrocks)]

Approved! and thanks for backporting the changes :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-16 17:06:56 +0000
+++ debian/changelog	2013-05-07 13:14:15 +0000
@@ -1,3 +1,78 @@
+compiz (1:0.9.7.12-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/fix_1095001.patch
+    - Cherry-pick a patch from upstream to fix CPU usage (LP: #1095001)
+  * debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
+    - Rename the blacklist patch, add verbose description and allow 
+      fullscreen unredirection for also Intel and Nouveau users using 
+      Mesa 9.0.x (Ubuntu 12.04.2 LTS or those who have opted in to LTS-Q
+      packages). (LP: #1167321)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 11 Apr 2013 12:05:04 +0300
+
+compiz (1:0.9.7.12-0ubuntu1) precise-proposed; urgency=low
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * debian/patches/revert_fix_994841.patch, 
+    debian/patches/revert_fix_933776_955035.patch
+    - Removed, upstreamed
+  * debian/watch:
+    - Changed to the correct LP tarball path
+  * debian/patches/compiz-package-gles2.patch:
+    - Updated GLES patches to properly apply to the new compiz version
+
+  [ Timo Jyrinki ]
+  * New upstream release.
+    - Compiz won't start if "unredirect fullscreen windows" is enabled 
+      (LP: #980663)
+    - "Unredirect Fullscreen Windows" stay on top (unredirected) even 
+      when they're not on top any more (or the output is transformed) 
+      (LP: #1041047)
+    - Unredirect Fullscreen Windows sometimes fails to unredirect fullscreen 
+      windows at all (LP: #1041066)
+    - "Unredirect Fullscreen Windows" stay on top (unredirected) even when 
+      an RGBA window is stacked above it (LP: #1046661)
+    - scale mode is not visible if a fullscreen window is unredirected 
+      (LP: #1047168)
+    - Unredirecting a fullscreen window on a secondary monitor causes that
+      monitor to flicker (LP: #1050749)
+    - "Unredirect Fullscreen Windows" makes multi-monitor rendering much 
+      slower (LP: #1051885)
+    - [regression] Maximized window gets unredirected when it's not 
+      fullscreen (LP: #1053902)
+    - Unredirected fullscreen windows freeze and stay on top when wall 
+      sliding (Ctrl+Alt+Left/Right) (LP: #1084401)
+    - "Unredirect Fullscreen Windows" can cause significant tearing on 
+      fullscreen windows (especially playing video) on some drivers
+      (LP: #1051802)
+    - HTML5 video in Firefox continues to tear (LP: #1086337)
+    - Add support for blacklisting some drivers from using unredirected 
+      fullscreen windows. By default intel and nouveau on Mesa 8.0 
+      are blacklisted, configurable via ccsm. Users can upgrade to 
+      Mesa 9.0 around 12.04.2 time. (LP: #1089246)
+    - Unredirect fullscreen windows should be the default for optimal 
+      performance (LP: #1063690)
+  * debian/patches/workaround_broken_drivers.patch:
+    - Updated to apply.
+  * debian/patches/force_unredirect_enabling.patch:
+    - Enable unredirect_fullscreen_windows unconditionally. Because of 
+      gconf hurdles we can't easily migrate existing users into the 
+      new default otherwise. Unredirection can be easily disabled with 
+      the new unredirect_match option, by blanking it completely, 
+      including removing the '(any)' part.
+  * debian/patches/compiz-package-gles2.patch:
+    - Update for the new blacklisting feature as well
+  * debian/patches/blacklist_no_xml_double_escaping.patch:
+    - Cherry-pick fix for the default string (LP: #1091103)
+
+  [ Michael Terry ]
+  * debian/patches/blacklist_no_xml_double_escaping.patch:
+    - Update to also blacklist Mesa 9.0, which precise users may have from
+      the x-updates PPA.  9.0 seems to have similar problems as 8.0 on
+      Intel hardware.
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 14 Dec 2012 10:41:24 +0200
+
 compiz (1:0.9.7.8+bzr3121-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream stable branch snapshot.

=== modified symlink 'debian/compiz-plugins.install.armel'
=== target was u'compiz-plugins.install.armhf'
--- debian/compiz-plugins.install.armel	1970-01-01 00:00:00 +0000
+++ debian/compiz-plugins.install.armel	2013-05-07 13:14:15 +0000
@@ -0,0 +1,11 @@
+debian/tmp/usr/*/compiz/*annotate.*
+debian/tmp/usr/*/compiz/*clone.*
+debian/tmp/usr/*/compiz/*commands.*
+debian/tmp/usr/*/compiz/*copytex.*
+debian/tmp/usr/*/compiz/*dbus.*
+debian/tmp/usr/*/compiz/*imgsvg.*
+debian/tmp/usr/*/compiz/*inotify.*
+debian/tmp/usr/*/compiz/*obs.*
+debian/tmp/usr/*/compiz/*screenshot.*
+debian/tmp/usr/*/compiz/*switcher.*
+debian/tmp/usr/*/compiz/*water.*

=== added file 'debian/patches/blacklist_precise_mesa80_intel_nouveau.patch'
--- debian/patches/blacklist_precise_mesa80_intel_nouveau.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/blacklist_precise_mesa80_intel_nouveau.patch	2013-05-07 13:14:15 +0000
@@ -0,0 +1,43 @@
+Description: Correct precise specific blacklist string
+ This patch sets the correct 12.04 LTS (precise) specific blacklist 
+ string for not enabling unredirection speedup on older Mesa versions 
+ when using Intel or Nouveau. It has evolved a bit.
+ .
+ Firstly it was just a cherry-pick to remove double backslashes which 
+ turned out not to work well from XML -> regexp engine.
+ .
+ Secondly "9.0" was added because an user reported that Mesa 9.0 from 
+ x-updates PPA wasn't enough on Intel. The full 12.04.2 stack however is 
+ good.
+ .
+ Thirdly as continuation from above, the string was modified so that 
+ 9.0 (sharp) is still blacklisted, but 9.0.x (now in 12.04.2 LTS stack) 
+ is not anymore. This takes care of the remaining PPA users while allowing 
+ proper new stack users to have full gaming speed on Intel and Nouveau.
+Author: Timo Jyrinki <[e-mail]>
+Author: Michael Terry <[e-mail]>
+=== modified file 'plugins/opengl/opengl.xml.in'
+--- a/plugins/opengl/opengl.xml.in	2012-12-12 07:24:34 +0000
++++ b/plugins/opengl/opengl.xml.in	2012-12-17 10:39:15 +0000
+@@ -46,7 +46,7 @@
+ 	    <option name="unredirect_driver_blacklist" type="string">
+ 		<_short>Unredirect Driver Blacklist</_short>
+ 		<_long>If non-empty, specifies a POSIX (extended) regular expression to match against the OpenGL driver strings (newline separated): "GL_VENDOR\nGL_RENDERER\nGL_VERSION". If the regular expression matches a substring of that concatenation then no windows will ever be unredirected while using that particular graphics driver.</_long>
+-		<default>(nouveau|Intel).*Mesa 8\\.0</default>
++		<default>(nouveau|Intel).*Mesa (8.0|9.0$)</default>
+ 	    </option>
+ 	</options>
+     </plugin>
+
+=== modified file 'plugins/opengl/src/blacklist/tests/test-blacklist.cpp'
+--- a/plugins/opengl/src/blacklist/tests/test-blacklist.cpp	2012-12-12 07:24:34 +0000
++++ b/plugins/opengl/src/blacklist/tests/test-blacklist.cpp	2012-12-17 10:40:00 +0000
+@@ -29,7 +29,7 @@
+ using namespace compiz::opengl;
+ 
+-static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
++static const char *recommendedRegex = "(nouveau|Intel).*Mesa (8.0|9.0$)";
+ 
+ TEST(DriverBlacklist, QuantalIntelIsGood)
+ {
+     EXPECT_FALSE (blacklisted (recommendedRegex,

=== modified file 'debian/patches/compiz-package-gles2.patch'
--- debian/patches/compiz-package-gles2.patch	2012-11-12 08:19:15 +0000
+++ debian/patches/compiz-package-gles2.patch	2013-05-07 13:14:15 +0000
@@ -988,23 +988,23 @@
  
  	void changePaintModifier (unsigned int, int);
 diff -Nur '--exclude=.*' '--exclude=debian' compiz-0.9.7.8/plugins/opengl/CMakeLists.txt linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt
---- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt	2012-04-26 08:47:01.000000000 +0200
-+++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt	2012-04-20 11:41:59.241600000 +0200
-@@ -2,7 +2,12 @@
+--- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt	2012-11-12 06:59:31 +0000
++++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt	2012-12-10 13:35:59 +0000
+@@ -4,8 +4,13 @@
  
- include (CompizPlugin)
+ add_subdirectory (src/fsregion)
+ add_subdirectory (src/blacklist)
  
 -find_package (OpenGL)
 -if (OPENGL_FOUND)
--    compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+-    compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
 -endif ()
-\ Kein Zeilenumbruch am Dateiende.
 +if (USE_GLES)
-+    compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} INCDIRS ${OPENGLES2_INCLUDE_DIR})
++    compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGLES2_INCLUDE_DIR})
 +else (USE_GLES)
 +    find_package (OpenGL)
 +    if (OPENGL_FOUND)
-+	compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
++        compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
 +    endif (OPENGL_FOUND)
 +endif (USE_GLES)
 +
@@ -5639,7 +5639,7 @@
   */
  
  #ifndef _GNU_SOURCE
-@@ -30,12 +32,28 @@
+@@ -30,13 +32,29 @@
  #endif
  #include <errno.h>
  
@@ -5649,6 +5649,7 @@
 +#include <errno.h>
 +
  #include "privates.h"
+ #include "blacklist/blacklist.h"
  
  #include <dlfcn.h>
  #include <math.h>

=== added file 'debian/patches/fix_1095001.patch'
--- debian/patches/fix_1095001.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_1095001.patch	2013-05-07 13:14:15 +0000
@@ -0,0 +1,86 @@
+=== modified file 'plugins/opengl/src/paint.cpp'
+--- a/plugins/opengl/src/paint.cpp	2012-12-13 07:42:28 +0000
++++ b/plugins/opengl/src/paint.cpp	2013-01-03 03:30:42 +0000
+@@ -324,22 +324,31 @@
+ 	    if (w->alpha ())
+ 		flags |= FullscreenRegion::Alpha;
+ 	    
++	    CompositeWindow *cw = CompositeWindow::get (w);
++
+ 	    /*
+ 	     * Windows with alpha channels can partially occlude windows
+ 	     * beneath them and so neither should be unredirected in that case.
++	     *
++	     * Performance note:  unredirectable.evaluate is SLOW because it
++	     * involves regex matching. Too slow to do on every window for
++	     * every frame. So we only call it if a window is redirected AND
++	     * potentially needs unredirecting. This means changes to
++	     * unredirect_match while a window is unredirected already may not
++	     * take effect until it is un-fullscreened again. But that's better
++	     * than the high price of regex matching on every frame.
+ 	     */
+ 	    if (unredirectFS &&
+ 		!blacklisted &&
+-		unredirectable.evaluate (w) &&
+ 		!(mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
+ 		!(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) &&
+-		fs.isCoveredBy (w->region (), flags))
++		fs.isCoveredBy (w->region (), flags) &&
++		(!cw->redirected () || unredirectable.evaluate (w)))
+ 	    {
+ 		unredirected.insert (w);
+ 	    }
+ 	    else
+ 	    {
+-		CompositeWindow *cw = CompositeWindow::get (w);
+ 		if (!cw->redirected ())
+ 		{
+ 		    if (fs.allowRedirection (w->region ()))
+
+=== modified file 'plugins/opengl/src/privates.h'
+--- a/plugins/opengl/src/privates.h	2012-12-13 07:42:28 +0000
++++ b/plugins/opengl/src/privates.h	2013-01-03 03:30:42 +0000
+@@ -131,6 +131,9 @@
+ 	CompSize rootPixmapSize;
+ 
+ 	const char *glVendor, *glRenderer, *glVersion;
++
++	mutable CompString prevRegex;
++	mutable bool       prevBlacklisted;
+ };
+ 
+ class PrivateGLWindow :
+
+=== modified file 'plugins/opengl/src/screen.cpp'
+--- a/plugins/opengl/src/screen.cpp	2012-12-13 07:42:28 +0000
++++ b/plugins/opengl/src/screen.cpp	2013-01-03 03:30:42 +0000
+@@ -603,7 +603,9 @@
+     rootPixmapSize (),
+     glVendor (NULL),
+     glRenderer (NULL),
+-    glVersion (NULL)
++    glVersion (NULL),
++    prevRegex (),
++    prevBlacklisted (false)
+ {
+     ScreenInterface::setHandler (screen);
+ }
+@@ -1306,7 +1308,16 @@
+ bool
+ PrivateGLScreen::driverIsBlacklisted (const char *regex) const
+ {
+-    return blacklisted (regex, glVendor, glRenderer, glVersion);
++    /*
++     * regex matching is VERY expensive, so only do it when the result might
++     * be different to last time. The gl* variables never change value...
++     */
++    if (prevRegex != regex)
++    {
++	prevBlacklisted = blacklisted (regex, glVendor, glRenderer, glVersion);
++	prevRegex = regex;
++    }
++    return prevBlacklisted;
+ }
+ 
+ GLTexture::BindPixmapHandle
+

=== added file 'debian/patches/force_unredirect_enabling.patch'
--- debian/patches/force_unredirect_enabling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/force_unredirect_enabling.patch	2013-05-07 13:14:15 +0000
@@ -0,0 +1,22 @@
+=== modified file 'plugins/opengl/src/paint.cpp'
+--- a/plugins/opengl/src/paint.cpp	2012-12-13 07:42:28 +0000
++++ b/plugins/opengl/src/paint.cpp	2012-12-14 07:48:47 +0000
+@@ -224,8 +224,15 @@
+     CompWindowList                   pl;
+     CompWindowList::reverse_iterator rit;
+ 
+-    unredirectFS = CompositeScreen::get (screen)->
+-	getOption ("unredirect_fullscreen_windows")->value ().b ();
++    /*
++     * On 0.9.7 we set this always to true, since we couldn't easily migrate 
++     * the current users to the new default because of gconf problems.
++     *
++     * Disabling of fullscreen application unredirection can be easily 
++     * achieved by clearing out the unredirect_match option, ie. removing 
++     * also the '(any)' part and leaving that option blank.
++     */
++    unredirectFS = true;
+ 
+     // This should be const but CompMatch is not const-friendly.
+     CompMatch &unredirectable = CompositeScreen::get (screen)->
+

=== removed file 'debian/patches/revert_fix_933776_955035.patch'
--- debian/patches/revert_fix_933776_955035.patch	2012-11-12 11:57:00 +0000
+++ debian/patches/revert_fix_933776_955035.patch	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-=== modified file 'plugins/scale/src/privates.h'
---- old/plugins/scale/src/privates.h	2012-06-21 23:10:08 +0000
-+++ new/plugins/scale/src/privates.h	2012-11-12 08:37:15 +0000
-@@ -63,8 +63,6 @@
- 	void findBestSlots ();
- 	bool fillInWindows ();
- 	bool layoutThumbs ();
--	bool layoutThumbsAll ();
--	bool layoutThumbsSingle ();
- 
- 	SlotArea::vector getSlotAreas ();
- 
-
-=== modified file 'plugins/scale/src/scale.cpp'
---- old/plugins/scale/src/scale.cpp	2012-06-21 23:10:08 +0000
-+++ new/plugins/scale/src/scale.cpp	2012-11-12 08:37:15 +0000
-@@ -684,47 +684,6 @@
- bool
- PrivateScaleScreen::layoutThumbs ()
- {
--    switch (type) {
--	case ScaleTypeAll:
--	    return layoutThumbsAll ();
--	case ScaleTypeNormal:
--	default:
--	    return layoutThumbsSingle ();
--    }
--}
--
--bool
--PrivateScaleScreen::layoutThumbsAll ()
--{
--    windows.clear ();
--
--    /* add windows scale list, top most window first */
--    foreach (CompWindow *w, screen->windows ())
--    {
--	SCALE_WINDOW (w);
--
--	if (sw->priv->slot)
--	    sw->priv->adjust = true;
--
--	sw->priv->slot = NULL;
--
--	if (!sw->priv->isScaleWin ())
--            continue;
--
--	windows.push_back (sw);
--    }
--
--    if (windows.empty ())
--	return false;
--
--    slots.resize (windows.size ());
--
--    return ScaleScreen::get (screen)->layoutSlotsAndAssignWindows ();
--}
--
--bool
--PrivateScaleScreen::layoutThumbsSingle ()
--{
-     bool ret = false;
-     std::map <ScaleWindow *, ScaleSlot> slotWindows;
-     CompWindowList          allWindows;
-

=== removed file 'debian/patches/revert_fix_994841.patch'
--- debian/patches/revert_fix_994841.patch	2012-11-13 09:38:42 +0000
+++ debian/patches/revert_fix_994841.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-=== modified file 'scripts/run-with-xvfb.sh'
---- old/scripts/run-with-xvfb.sh	2012-06-27 09:39:08 +0000
-+++ new/scripts/run-with-xvfb.sh	2012-11-13 09:18:47 +0000
-@@ -8,19 +8,18 @@
-     exit 1
- fi
- 
--# The script should still pass if you have a real Xserver and no Xvfb
--if [ ! -z "$DISPLAY" ]; then
--    echo "Note: You are already running an Xserver."
--    $1
--else
--    xvfb=`which Xvfb`
--    if [ ! -x "$xvfb" ]; then
--        echo "Error: Xvfb does not seem to be installed."
--        exit 1
--    fi
-+xvfb=`which Xvfb`
-+if [ ! -x "$xvfb" ]; then
-+    echo "Error: Xvfb does not seem to be installed."
-+    exit 1
-+fi
- 
-+if [ -z "$DISPLAY" ]; then
-     Xvfb -ac -noreset -screen 0 1024x768x16 -help 2>/dev/null 1>&2
-     XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; echo "No Display ports available, quit."; exit 1`
-     { Xvfb -ac -noreset -screen 0 1024x768x16 :$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; }
-     DISPLAY=:$XID $1
-+else
-+    echo "Note: You are already running an Xserver."
-+    $1
- fi
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-13 09:38:42 +0000
+++ debian/patches/series	2013-05-07 13:14:15 +0000
@@ -1,5 +1,6 @@
 ubuntu-config.patch
 ccp_plugin.patch
 workaround_broken_drivers.patch
-revert_fix_933776_955035.patch
-revert_fix_994841.patch
+force_unredirect_enabling.patch
+blacklist_precise_mesa80_intel_nouveau.patch
+fix_1095001.patch

=== modified symlink 'debian/patches/series.armel'
=== target was u'series.armhf'
--- debian/patches/series.armel	1970-01-01 00:00:00 +0000
+++ debian/patches/series.armel	2013-05-07 13:14:15 +0000
@@ -0,0 +1,1 @@
+compiz-package-gles2.patch

=== modified file 'debian/patches/workaround_broken_drivers.patch'
--- debian/patches/workaround_broken_drivers.patch	2012-02-10 16:36:43 +0000
+++ debian/patches/workaround_broken_drivers.patch	2013-05-07 13:14:15 +0000
@@ -2,7 +2,7 @@
 ===================================================================
 --- compiz-0.9.7.0~bzr2995.orig/plugins/opengl/src/screen.cpp	2012-02-09 16:32:07.000000000 +0100
 +++ compiz-0.9.7.0~bzr2995/plugins/opengl/src/screen.cpp	2012-02-10 17:09:17.029015287 +0100
-@@ -25,6 +25,11 @@
+@@ -25,7 +25,12 @@
   *          David Reveman <[e-mail]>
   */
  
@@ -12,6 +12,7 @@
 +#include <errno.h>
 +
  #include "privates.h"
+ #include "blacklist/blacklist.h"
  
  #include <dlfcn.h>
 @@ -83,9 +88,24 @@

=== modified file 'debian/watch'
--- debian/watch	2009-10-20 10:34:10 +0000
+++ debian/watch	2013-05-07 13:14:15 +0000
@@ -1,3 +1,3 @@
 version=3
-http://releases.compiz.org/([\d\.]+)[02468]/ compiz-(\d.*)\.tar\.gz
+https://launchpad.net/compiz-core/+download .*/compiz-core-([0-9.]+)\.tar\.bz2