Compiz

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

  1. ubuntu.compiz-09712ubuntu2
  2. Merge into precise
Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 808
Proposed branch: lp:~timo-jyrinki/compiz/ubuntu.compiz-09712ubuntu2
Merge into: lp:~ubuntu-desktop/compiz/precise
Diff against target: 475 lines (+254/-111)
12 files modified
debian/changelog (+75/-0)
debian/compiz-plugins.install.armel (+11/-0)
debian/patches/blacklist_precise_mesa80_intel_nouveau.patch (+43/-0)
debian/patches/compiz-package-gles2.patch (+10/-9)
debian/patches/fix_1095001.patch (+86/-0)
debian/patches/force_unredirect_enabling.patch (+22/-0)
debian/patches/revert_fix_933776_955035.patch (+0/-65)
debian/patches/revert_fix_994841.patch (+0/-33)
debian/patches/series (+3/-2)
debian/patches/series.armel (+1/-0)
debian/patches/workaround_broken_drivers.patch (+2/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/compiz/ubuntu.compiz-09712ubuntu2
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+162779@code.launchpad.net

Commit message

* 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)

Description of the change

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

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Approved! and thanks for backporting the changes :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1compiz (1:0.9.7.12-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/patches/fix_1095001.patch
4 - Cherry-pick a patch from upstream to fix CPU usage (LP: #1095001)
5 * debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
6 - Rename the blacklist patch, add verbose description and allow
7 fullscreen unredirection for also Intel and Nouveau users using
8 Mesa 9.0.x (Ubuntu 12.04.2 LTS or those who have opted in to LTS-Q
9 packages). (LP: #1167321)
10
11 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 11 Apr 2013 12:05:04 +0300
12
13compiz (1:0.9.7.12-0ubuntu1) precise-proposed; urgency=low
14
15 [ Łukasz 'sil2100' Zemczak ]
16 * debian/patches/revert_fix_994841.patch,
17 debian/patches/revert_fix_933776_955035.patch
18 - Removed, upstreamed
19 * debian/watch:
20 - Changed to the correct LP tarball path
21 * debian/patches/compiz-package-gles2.patch:
22 - Updated GLES patches to properly apply to the new compiz version
23
24 [ Timo Jyrinki ]
25 * New upstream release.
26 - Compiz won't start if "unredirect fullscreen windows" is enabled
27 (LP: #980663)
28 - "Unredirect Fullscreen Windows" stay on top (unredirected) even
29 when they're not on top any more (or the output is transformed)
30 (LP: #1041047)
31 - Unredirect Fullscreen Windows sometimes fails to unredirect fullscreen
32 windows at all (LP: #1041066)
33 - "Unredirect Fullscreen Windows" stay on top (unredirected) even when
34 an RGBA window is stacked above it (LP: #1046661)
35 - scale mode is not visible if a fullscreen window is unredirected
36 (LP: #1047168)
37 - Unredirecting a fullscreen window on a secondary monitor causes that
38 monitor to flicker (LP: #1050749)
39 - "Unredirect Fullscreen Windows" makes multi-monitor rendering much
40 slower (LP: #1051885)
41 - [regression] Maximized window gets unredirected when it's not
42 fullscreen (LP: #1053902)
43 - Unredirected fullscreen windows freeze and stay on top when wall
44 sliding (Ctrl+Alt+Left/Right) (LP: #1084401)
45 - "Unredirect Fullscreen Windows" can cause significant tearing on
46 fullscreen windows (especially playing video) on some drivers
47 (LP: #1051802)
48 - HTML5 video in Firefox continues to tear (LP: #1086337)
49 - Add support for blacklisting some drivers from using unredirected
50 fullscreen windows. By default intel and nouveau on Mesa 8.0
51 are blacklisted, configurable via ccsm. Users can upgrade to
52 Mesa 9.0 around 12.04.2 time. (LP: #1089246)
53 - Unredirect fullscreen windows should be the default for optimal
54 performance (LP: #1063690)
55 * debian/patches/workaround_broken_drivers.patch:
56 - Updated to apply.
57 * debian/patches/force_unredirect_enabling.patch:
58 - Enable unredirect_fullscreen_windows unconditionally. Because of
59 gconf hurdles we can't easily migrate existing users into the
60 new default otherwise. Unredirection can be easily disabled with
61 the new unredirect_match option, by blanking it completely,
62 including removing the '(any)' part.
63 * debian/patches/compiz-package-gles2.patch:
64 - Update for the new blacklisting feature as well
65 * debian/patches/blacklist_no_xml_double_escaping.patch:
66 - Cherry-pick fix for the default string (LP: #1091103)
67
68 [ Michael Terry ]
69 * debian/patches/blacklist_no_xml_double_escaping.patch:
70 - Update to also blacklist Mesa 9.0, which precise users may have from
71 the x-updates PPA. 9.0 seems to have similar problems as 8.0 on
72 Intel hardware.
73
74 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 14 Dec 2012 10:41:24 +0200
75
1compiz (1:0.9.7.8+bzr3121-0ubuntu1) precise-proposed; urgency=low76compiz (1:0.9.7.8+bzr3121-0ubuntu1) precise-proposed; urgency=low
277
3 * New upstream stable branch snapshot.78 * New upstream stable branch snapshot.
479
=== 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 @@
1debian/tmp/usr/*/compiz/*annotate.*
2debian/tmp/usr/*/compiz/*clone.*
3debian/tmp/usr/*/compiz/*commands.*
4debian/tmp/usr/*/compiz/*copytex.*
5debian/tmp/usr/*/compiz/*dbus.*
6debian/tmp/usr/*/compiz/*imgsvg.*
7debian/tmp/usr/*/compiz/*inotify.*
8debian/tmp/usr/*/compiz/*obs.*
9debian/tmp/usr/*/compiz/*screenshot.*
10debian/tmp/usr/*/compiz/*switcher.*
11debian/tmp/usr/*/compiz/*water.*
012
=== 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 @@
1Description: Correct precise specific blacklist string
2 This patch sets the correct 12.04 LTS (precise) specific blacklist
3 string for not enabling unredirection speedup on older Mesa versions
4 when using Intel or Nouveau. It has evolved a bit.
5 .
6 Firstly it was just a cherry-pick to remove double backslashes which
7 turned out not to work well from XML -> regexp engine.
8 .
9 Secondly "9.0" was added because an user reported that Mesa 9.0 from
10 x-updates PPA wasn't enough on Intel. The full 12.04.2 stack however is
11 good.
12 .
13 Thirdly as continuation from above, the string was modified so that
14 9.0 (sharp) is still blacklisted, but 9.0.x (now in 12.04.2 LTS stack)
15 is not anymore. This takes care of the remaining PPA users while allowing
16 proper new stack users to have full gaming speed on Intel and Nouveau.
17Author: Timo Jyrinki <timo.jyrinki@canonical.com>
18Author: Michael Terry <michael.terry@canonical.com>
19=== modified file 'plugins/opengl/opengl.xml.in'
20--- a/plugins/opengl/opengl.xml.in 2012-12-12 07:24:34 +0000
21+++ b/plugins/opengl/opengl.xml.in 2012-12-17 10:39:15 +0000
22@@ -46,7 +46,7 @@
23 <option name="unredirect_driver_blacklist" type="string">
24 <_short>Unredirect Driver Blacklist</_short>
25 <_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>
26- <default>(nouveau|Intel).*Mesa 8\\.0</default>
27+ <default>(nouveau|Intel).*Mesa (8.0|9.0$)</default>
28 </option>
29 </options>
30 </plugin>
31
32=== modified file 'plugins/opengl/src/blacklist/tests/test-blacklist.cpp'
33--- a/plugins/opengl/src/blacklist/tests/test-blacklist.cpp 2012-12-12 07:24:34 +0000
34+++ b/plugins/opengl/src/blacklist/tests/test-blacklist.cpp 2012-12-17 10:40:00 +0000
35@@ -29,7 +29,7 @@
36 using namespace compiz::opengl;
37
38-static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
39+static const char *recommendedRegex = "(nouveau|Intel).*Mesa (8.0|9.0$)";
40
41 TEST(DriverBlacklist, QuantalIntelIsGood)
42 {
43 EXPECT_FALSE (blacklisted (recommendedRegex,
044
=== 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 @@
988 988
989 void changePaintModifier (unsigned int, int);989 void changePaintModifier (unsigned int, int);
990diff -Nur '--exclude=.*' '--exclude=debian' compiz-0.9.7.8/plugins/opengl/CMakeLists.txt linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt990diff -Nur '--exclude=.*' '--exclude=debian' compiz-0.9.7.8/plugins/opengl/CMakeLists.txt linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt
991--- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt 2012-04-26 08:47:01.000000000 +0200991--- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt 2012-11-12 06:59:31 +0000
992+++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt 2012-04-20 11:41:59.241600000 +0200992+++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt 2012-12-10 13:35:59 +0000
993@@ -2,7 +2,12 @@993@@ -4,8 +4,13 @@
994 994
995 include (CompizPlugin)995 add_subdirectory (src/fsregion)
996 add_subdirectory (src/blacklist)
996 997
997-find_package (OpenGL)998-find_package (OpenGL)
998-if (OPENGL_FOUND)999-if (OPENGL_FOUND)
999- compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})1000- compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
1000-endif ()1001-endif ()
1001\ Kein Zeilenumbruch am Dateiende.
1002+if (USE_GLES)1002+if (USE_GLES)
1003+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} INCDIRS ${OPENGLES2_INCLUDE_DIR})1003+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGLES2_INCLUDE_DIR})
1004+else (USE_GLES)1004+else (USE_GLES)
1005+ find_package (OpenGL)1005+ find_package (OpenGL)
1006+ if (OPENGL_FOUND)1006+ if (OPENGL_FOUND)
1007+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})1007+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
1008+ endif (OPENGL_FOUND)1008+ endif (OPENGL_FOUND)
1009+endif (USE_GLES)1009+endif (USE_GLES)
1010+1010+
@@ -5639,7 +5639,7 @@
5639 */5639 */
5640 5640
5641 #ifndef _GNU_SOURCE5641 #ifndef _GNU_SOURCE
5642@@ -30,12 +32,28 @@5642@@ -30,13 +32,29 @@
5643 #endif5643 #endif
5644 #include <errno.h>5644 #include <errno.h>
5645 5645
@@ -5649,6 +5649,7 @@
5649+#include <errno.h>5649+#include <errno.h>
5650+5650+
5651 #include "privates.h"5651 #include "privates.h"
5652 #include "blacklist/blacklist.h"
5652 5653
5653 #include <dlfcn.h>5654 #include <dlfcn.h>
5654 #include <math.h>5655 #include <math.h>
56555656
=== 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 @@
1=== modified file 'plugins/opengl/src/paint.cpp'
2--- a/plugins/opengl/src/paint.cpp 2012-12-13 07:42:28 +0000
3+++ b/plugins/opengl/src/paint.cpp 2013-01-03 03:30:42 +0000
4@@ -324,22 +324,31 @@
5 if (w->alpha ())
6 flags |= FullscreenRegion::Alpha;
7
8+ CompositeWindow *cw = CompositeWindow::get (w);
9+
10 /*
11 * Windows with alpha channels can partially occlude windows
12 * beneath them and so neither should be unredirected in that case.
13+ *
14+ * Performance note: unredirectable.evaluate is SLOW because it
15+ * involves regex matching. Too slow to do on every window for
16+ * every frame. So we only call it if a window is redirected AND
17+ * potentially needs unredirecting. This means changes to
18+ * unredirect_match while a window is unredirected already may not
19+ * take effect until it is un-fullscreened again. But that's better
20+ * than the high price of regex matching on every frame.
21 */
22 if (unredirectFS &&
23 !blacklisted &&
24- unredirectable.evaluate (w) &&
25 !(mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
26 !(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) &&
27- fs.isCoveredBy (w->region (), flags))
28+ fs.isCoveredBy (w->region (), flags) &&
29+ (!cw->redirected () || unredirectable.evaluate (w)))
30 {
31 unredirected.insert (w);
32 }
33 else
34 {
35- CompositeWindow *cw = CompositeWindow::get (w);
36 if (!cw->redirected ())
37 {
38 if (fs.allowRedirection (w->region ()))
39
40=== modified file 'plugins/opengl/src/privates.h'
41--- a/plugins/opengl/src/privates.h 2012-12-13 07:42:28 +0000
42+++ b/plugins/opengl/src/privates.h 2013-01-03 03:30:42 +0000
43@@ -131,6 +131,9 @@
44 CompSize rootPixmapSize;
45
46 const char *glVendor, *glRenderer, *glVersion;
47+
48+ mutable CompString prevRegex;
49+ mutable bool prevBlacklisted;
50 };
51
52 class PrivateGLWindow :
53
54=== modified file 'plugins/opengl/src/screen.cpp'
55--- a/plugins/opengl/src/screen.cpp 2012-12-13 07:42:28 +0000
56+++ b/plugins/opengl/src/screen.cpp 2013-01-03 03:30:42 +0000
57@@ -603,7 +603,9 @@
58 rootPixmapSize (),
59 glVendor (NULL),
60 glRenderer (NULL),
61- glVersion (NULL)
62+ glVersion (NULL),
63+ prevRegex (),
64+ prevBlacklisted (false)
65 {
66 ScreenInterface::setHandler (screen);
67 }
68@@ -1306,7 +1308,16 @@
69 bool
70 PrivateGLScreen::driverIsBlacklisted (const char *regex) const
71 {
72- return blacklisted (regex, glVendor, glRenderer, glVersion);
73+ /*
74+ * regex matching is VERY expensive, so only do it when the result might
75+ * be different to last time. The gl* variables never change value...
76+ */
77+ if (prevRegex != regex)
78+ {
79+ prevBlacklisted = blacklisted (regex, glVendor, glRenderer, glVersion);
80+ prevRegex = regex;
81+ }
82+ return prevBlacklisted;
83 }
84
85 GLTexture::BindPixmapHandle
86
087
=== 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 @@
1=== modified file 'plugins/opengl/src/paint.cpp'
2--- a/plugins/opengl/src/paint.cpp 2012-12-13 07:42:28 +0000
3+++ b/plugins/opengl/src/paint.cpp 2012-12-14 07:48:47 +0000
4@@ -224,8 +224,15 @@
5 CompWindowList pl;
6 CompWindowList::reverse_iterator rit;
7
8- unredirectFS = CompositeScreen::get (screen)->
9- getOption ("unredirect_fullscreen_windows")->value ().b ();
10+ /*
11+ * On 0.9.7 we set this always to true, since we couldn't easily migrate
12+ * the current users to the new default because of gconf problems.
13+ *
14+ * Disabling of fullscreen application unredirection can be easily
15+ * achieved by clearing out the unredirect_match option, ie. removing
16+ * also the '(any)' part and leaving that option blank.
17+ */
18+ unredirectFS = true;
19
20 // This should be const but CompMatch is not const-friendly.
21 CompMatch &unredirectable = CompositeScreen::get (screen)->
22
023
=== 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 @@
1=== modified file 'plugins/scale/src/privates.h'
2--- old/plugins/scale/src/privates.h 2012-06-21 23:10:08 +0000
3+++ new/plugins/scale/src/privates.h 2012-11-12 08:37:15 +0000
4@@ -63,8 +63,6 @@
5 void findBestSlots ();
6 bool fillInWindows ();
7 bool layoutThumbs ();
8- bool layoutThumbsAll ();
9- bool layoutThumbsSingle ();
10
11 SlotArea::vector getSlotAreas ();
12
13
14=== modified file 'plugins/scale/src/scale.cpp'
15--- old/plugins/scale/src/scale.cpp 2012-06-21 23:10:08 +0000
16+++ new/plugins/scale/src/scale.cpp 2012-11-12 08:37:15 +0000
17@@ -684,47 +684,6 @@
18 bool
19 PrivateScaleScreen::layoutThumbs ()
20 {
21- switch (type) {
22- case ScaleTypeAll:
23- return layoutThumbsAll ();
24- case ScaleTypeNormal:
25- default:
26- return layoutThumbsSingle ();
27- }
28-}
29-
30-bool
31-PrivateScaleScreen::layoutThumbsAll ()
32-{
33- windows.clear ();
34-
35- /* add windows scale list, top most window first */
36- foreach (CompWindow *w, screen->windows ())
37- {
38- SCALE_WINDOW (w);
39-
40- if (sw->priv->slot)
41- sw->priv->adjust = true;
42-
43- sw->priv->slot = NULL;
44-
45- if (!sw->priv->isScaleWin ())
46- continue;
47-
48- windows.push_back (sw);
49- }
50-
51- if (windows.empty ())
52- return false;
53-
54- slots.resize (windows.size ());
55-
56- return ScaleScreen::get (screen)->layoutSlotsAndAssignWindows ();
57-}
58-
59-bool
60-PrivateScaleScreen::layoutThumbsSingle ()
61-{
62 bool ret = false;
63 std::map <ScaleWindow *, ScaleSlot> slotWindows;
64 CompWindowList allWindows;
65
660
=== 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 @@
1=== modified file 'scripts/run-with-xvfb.sh'
2--- old/scripts/run-with-xvfb.sh 2012-06-27 09:39:08 +0000
3+++ new/scripts/run-with-xvfb.sh 2012-11-13 09:18:47 +0000
4@@ -8,19 +8,18 @@
5 exit 1
6 fi
7
8-# The script should still pass if you have a real Xserver and no Xvfb
9-if [ ! -z "$DISPLAY" ]; then
10- echo "Note: You are already running an Xserver."
11- $1
12-else
13- xvfb=`which Xvfb`
14- if [ ! -x "$xvfb" ]; then
15- echo "Error: Xvfb does not seem to be installed."
16- exit 1
17- fi
18+xvfb=`which Xvfb`
19+if [ ! -x "$xvfb" ]; then
20+ echo "Error: Xvfb does not seem to be installed."
21+ exit 1
22+fi
23
24+if [ -z "$DISPLAY" ]; then
25 Xvfb -ac -noreset -screen 0 1024x768x16 -help 2>/dev/null 1>&2
26 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`
27 { 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; }
28 DISPLAY=:$XID $1
29+else
30+ echo "Note: You are already running an Xserver."
31+ $1
32 fi
33
340
=== 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 @@
1ubuntu-config.patch1ubuntu-config.patch
2ccp_plugin.patch2ccp_plugin.patch
3workaround_broken_drivers.patch3workaround_broken_drivers.patch
4revert_fix_933776_955035.patch4force_unredirect_enabling.patch
5revert_fix_994841.patch5blacklist_precise_mesa80_intel_nouveau.patch
6fix_1095001.patch
67
=== 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 @@
1compiz-package-gles2.patch
02
=== 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 @@
2===================================================================2===================================================================
3--- compiz-0.9.7.0~bzr2995.orig/plugins/opengl/src/screen.cpp 2012-02-09 16:32:07.000000000 +01003--- compiz-0.9.7.0~bzr2995.orig/plugins/opengl/src/screen.cpp 2012-02-09 16:32:07.000000000 +0100
4+++ compiz-0.9.7.0~bzr2995/plugins/opengl/src/screen.cpp 2012-02-10 17:09:17.029015287 +01004+++ compiz-0.9.7.0~bzr2995/plugins/opengl/src/screen.cpp 2012-02-10 17:09:17.029015287 +0100
5@@ -25,6 +25,11 @@5@@ -25,7 +25,12 @@
6 * David Reveman <davidr@novell.com>6 * David Reveman <davidr@novell.com>
7 */7 */
8 8
@@ -12,6 +12,7 @@
12+#include <errno.h>12+#include <errno.h>
13+13+
14 #include "privates.h"14 #include "privates.h"
15 #include "blacklist/blacklist.h"
15 16
16 #include <dlfcn.h>17 #include <dlfcn.h>
17@@ -83,9 +88,24 @@18@@ -83,9 +88,24 @@
1819
=== 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 @@
1version=31version=3
2http://releases.compiz.org/([\d\.]+)[02468]/ compiz-(\d.*)\.tar\.gz2https://launchpad.net/compiz-core/+download .*/compiz-core-([0-9.]+)\.tar\.bz2
33

Subscribers

People subscribed via source and target branches

to all changes: