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

Proposed by Timo Jyrinki on 2013-05-07
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
To merge this branch: bzr merge lp:~timo-jyrinki/compiz/ubuntu.compiz-09712ubuntu2
Reviewer Review Type Date Requested Status
Didier Roche 2013-05-07 Approve on 2013-06-12
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.
Didier Roche (didrocks) wrote :

Approved! and thanks for backporting the changes :)

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-16 17:06:56 +0000
3+++ debian/changelog 2013-05-07 13:14:15 +0000
4@@ -1,3 +1,78 @@
5+compiz (1:0.9.7.12-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/patches/fix_1095001.patch
8+ - Cherry-pick a patch from upstream to fix CPU usage (LP: #1095001)
9+ * debian/patches/blacklist_precise_mesa80_intel_nouveau.patch:
10+ - Rename the blacklist patch, add verbose description and allow
11+ fullscreen unredirection for also Intel and Nouveau users using
12+ Mesa 9.0.x (Ubuntu 12.04.2 LTS or those who have opted in to LTS-Q
13+ packages). (LP: #1167321)
14+
15+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 11 Apr 2013 12:05:04 +0300
16+
17+compiz (1:0.9.7.12-0ubuntu1) precise-proposed; urgency=low
18+
19+ [ Łukasz 'sil2100' Zemczak ]
20+ * debian/patches/revert_fix_994841.patch,
21+ debian/patches/revert_fix_933776_955035.patch
22+ - Removed, upstreamed
23+ * debian/watch:
24+ - Changed to the correct LP tarball path
25+ * debian/patches/compiz-package-gles2.patch:
26+ - Updated GLES patches to properly apply to the new compiz version
27+
28+ [ Timo Jyrinki ]
29+ * New upstream release.
30+ - Compiz won't start if "unredirect fullscreen windows" is enabled
31+ (LP: #980663)
32+ - "Unredirect Fullscreen Windows" stay on top (unredirected) even
33+ when they're not on top any more (or the output is transformed)
34+ (LP: #1041047)
35+ - Unredirect Fullscreen Windows sometimes fails to unredirect fullscreen
36+ windows at all (LP: #1041066)
37+ - "Unredirect Fullscreen Windows" stay on top (unredirected) even when
38+ an RGBA window is stacked above it (LP: #1046661)
39+ - scale mode is not visible if a fullscreen window is unredirected
40+ (LP: #1047168)
41+ - Unredirecting a fullscreen window on a secondary monitor causes that
42+ monitor to flicker (LP: #1050749)
43+ - "Unredirect Fullscreen Windows" makes multi-monitor rendering much
44+ slower (LP: #1051885)
45+ - [regression] Maximized window gets unredirected when it's not
46+ fullscreen (LP: #1053902)
47+ - Unredirected fullscreen windows freeze and stay on top when wall
48+ sliding (Ctrl+Alt+Left/Right) (LP: #1084401)
49+ - "Unredirect Fullscreen Windows" can cause significant tearing on
50+ fullscreen windows (especially playing video) on some drivers
51+ (LP: #1051802)
52+ - HTML5 video in Firefox continues to tear (LP: #1086337)
53+ - Add support for blacklisting some drivers from using unredirected
54+ fullscreen windows. By default intel and nouveau on Mesa 8.0
55+ are blacklisted, configurable via ccsm. Users can upgrade to
56+ Mesa 9.0 around 12.04.2 time. (LP: #1089246)
57+ - Unredirect fullscreen windows should be the default for optimal
58+ performance (LP: #1063690)
59+ * debian/patches/workaround_broken_drivers.patch:
60+ - Updated to apply.
61+ * debian/patches/force_unredirect_enabling.patch:
62+ - Enable unredirect_fullscreen_windows unconditionally. Because of
63+ gconf hurdles we can't easily migrate existing users into the
64+ new default otherwise. Unredirection can be easily disabled with
65+ the new unredirect_match option, by blanking it completely,
66+ including removing the '(any)' part.
67+ * debian/patches/compiz-package-gles2.patch:
68+ - Update for the new blacklisting feature as well
69+ * debian/patches/blacklist_no_xml_double_escaping.patch:
70+ - Cherry-pick fix for the default string (LP: #1091103)
71+
72+ [ Michael Terry ]
73+ * debian/patches/blacklist_no_xml_double_escaping.patch:
74+ - Update to also blacklist Mesa 9.0, which precise users may have from
75+ the x-updates PPA. 9.0 seems to have similar problems as 8.0 on
76+ Intel hardware.
77+
78+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 14 Dec 2012 10:41:24 +0200
79+
80 compiz (1:0.9.7.8+bzr3121-0ubuntu1) precise-proposed; urgency=low
81
82 * New upstream stable branch snapshot.
83
84=== modified symlink 'debian/compiz-plugins.install.armel'
85=== target was u'compiz-plugins.install.armhf'
86--- debian/compiz-plugins.install.armel 1970-01-01 00:00:00 +0000
87+++ debian/compiz-plugins.install.armel 2013-05-07 13:14:15 +0000
88@@ -0,0 +1,11 @@
89+debian/tmp/usr/*/compiz/*annotate.*
90+debian/tmp/usr/*/compiz/*clone.*
91+debian/tmp/usr/*/compiz/*commands.*
92+debian/tmp/usr/*/compiz/*copytex.*
93+debian/tmp/usr/*/compiz/*dbus.*
94+debian/tmp/usr/*/compiz/*imgsvg.*
95+debian/tmp/usr/*/compiz/*inotify.*
96+debian/tmp/usr/*/compiz/*obs.*
97+debian/tmp/usr/*/compiz/*screenshot.*
98+debian/tmp/usr/*/compiz/*switcher.*
99+debian/tmp/usr/*/compiz/*water.*
100
101=== added file 'debian/patches/blacklist_precise_mesa80_intel_nouveau.patch'
102--- debian/patches/blacklist_precise_mesa80_intel_nouveau.patch 1970-01-01 00:00:00 +0000
103+++ debian/patches/blacklist_precise_mesa80_intel_nouveau.patch 2013-05-07 13:14:15 +0000
104@@ -0,0 +1,43 @@
105+Description: Correct precise specific blacklist string
106+ This patch sets the correct 12.04 LTS (precise) specific blacklist
107+ string for not enabling unredirection speedup on older Mesa versions
108+ when using Intel or Nouveau. It has evolved a bit.
109+ .
110+ Firstly it was just a cherry-pick to remove double backslashes which
111+ turned out not to work well from XML -> regexp engine.
112+ .
113+ Secondly "9.0" was added because an user reported that Mesa 9.0 from
114+ x-updates PPA wasn't enough on Intel. The full 12.04.2 stack however is
115+ good.
116+ .
117+ Thirdly as continuation from above, the string was modified so that
118+ 9.0 (sharp) is still blacklisted, but 9.0.x (now in 12.04.2 LTS stack)
119+ is not anymore. This takes care of the remaining PPA users while allowing
120+ proper new stack users to have full gaming speed on Intel and Nouveau.
121+Author: Timo Jyrinki <timo.jyrinki@canonical.com>
122+Author: Michael Terry <michael.terry@canonical.com>
123+=== modified file 'plugins/opengl/opengl.xml.in'
124+--- a/plugins/opengl/opengl.xml.in 2012-12-12 07:24:34 +0000
125++++ b/plugins/opengl/opengl.xml.in 2012-12-17 10:39:15 +0000
126+@@ -46,7 +46,7 @@
127+ <option name="unredirect_driver_blacklist" type="string">
128+ <_short>Unredirect Driver Blacklist</_short>
129+ <_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>
130+- <default>(nouveau|Intel).*Mesa 8\\.0</default>
131++ <default>(nouveau|Intel).*Mesa (8.0|9.0$)</default>
132+ </option>
133+ </options>
134+ </plugin>
135+
136+=== modified file 'plugins/opengl/src/blacklist/tests/test-blacklist.cpp'
137+--- a/plugins/opengl/src/blacklist/tests/test-blacklist.cpp 2012-12-12 07:24:34 +0000
138++++ b/plugins/opengl/src/blacklist/tests/test-blacklist.cpp 2012-12-17 10:40:00 +0000
139+@@ -29,7 +29,7 @@
140+ using namespace compiz::opengl;
141+
142+-static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
143++static const char *recommendedRegex = "(nouveau|Intel).*Mesa (8.0|9.0$)";
144+
145+ TEST(DriverBlacklist, QuantalIntelIsGood)
146+ {
147+ EXPECT_FALSE (blacklisted (recommendedRegex,
148
149=== modified file 'debian/patches/compiz-package-gles2.patch'
150--- debian/patches/compiz-package-gles2.patch 2012-11-12 08:19:15 +0000
151+++ debian/patches/compiz-package-gles2.patch 2013-05-07 13:14:15 +0000
152@@ -988,23 +988,23 @@
153
154 void changePaintModifier (unsigned int, int);
155 diff -Nur '--exclude=.*' '--exclude=debian' compiz-0.9.7.8/plugins/opengl/CMakeLists.txt linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt
156---- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt 2012-04-26 08:47:01.000000000 +0200
157-+++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt 2012-04-20 11:41:59.241600000 +0200
158-@@ -2,7 +2,12 @@
159+--- compiz-0.9.7.8/plugins/opengl/CMakeLists.txt 2012-11-12 06:59:31 +0000
160++++ linaro-gles2-debianpatches/plugins/opengl/CMakeLists.txt 2012-12-10 13:35:59 +0000
161+@@ -4,8 +4,13 @@
162
163- include (CompizPlugin)
164+ add_subdirectory (src/fsregion)
165+ add_subdirectory (src/blacklist)
166
167 -find_package (OpenGL)
168 -if (OPENGL_FOUND)
169-- compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
170+- compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
171 -endif ()
172-\ Kein Zeilenumbruch am Dateiende.
173 +if (USE_GLES)
174-+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} INCDIRS ${OPENGLES2_INCLUDE_DIR})
175++ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGLES2_INCLUDE_DIR})
176 +else (USE_GLES)
177 + find_package (OpenGL)
178 + if (OPENGL_FOUND)
179-+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
180++ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
181 + endif (OPENGL_FOUND)
182 +endif (USE_GLES)
183 +
184@@ -5639,7 +5639,7 @@
185 */
186
187 #ifndef _GNU_SOURCE
188-@@ -30,12 +32,28 @@
189+@@ -30,13 +32,29 @@
190 #endif
191 #include <errno.h>
192
193@@ -5649,6 +5649,7 @@
194 +#include <errno.h>
195 +
196 #include "privates.h"
197+ #include "blacklist/blacklist.h"
198
199 #include <dlfcn.h>
200 #include <math.h>
201
202=== added file 'debian/patches/fix_1095001.patch'
203--- debian/patches/fix_1095001.patch 1970-01-01 00:00:00 +0000
204+++ debian/patches/fix_1095001.patch 2013-05-07 13:14:15 +0000
205@@ -0,0 +1,86 @@
206+=== modified file 'plugins/opengl/src/paint.cpp'
207+--- a/plugins/opengl/src/paint.cpp 2012-12-13 07:42:28 +0000
208++++ b/plugins/opengl/src/paint.cpp 2013-01-03 03:30:42 +0000
209+@@ -324,22 +324,31 @@
210+ if (w->alpha ())
211+ flags |= FullscreenRegion::Alpha;
212+
213++ CompositeWindow *cw = CompositeWindow::get (w);
214++
215+ /*
216+ * Windows with alpha channels can partially occlude windows
217+ * beneath them and so neither should be unredirected in that case.
218++ *
219++ * Performance note: unredirectable.evaluate is SLOW because it
220++ * involves regex matching. Too slow to do on every window for
221++ * every frame. So we only call it if a window is redirected AND
222++ * potentially needs unredirecting. This means changes to
223++ * unredirect_match while a window is unredirected already may not
224++ * take effect until it is un-fullscreened again. But that's better
225++ * than the high price of regex matching on every frame.
226+ */
227+ if (unredirectFS &&
228+ !blacklisted &&
229+- unredirectable.evaluate (w) &&
230+ !(mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
231+ !(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) &&
232+- fs.isCoveredBy (w->region (), flags))
233++ fs.isCoveredBy (w->region (), flags) &&
234++ (!cw->redirected () || unredirectable.evaluate (w)))
235+ {
236+ unredirected.insert (w);
237+ }
238+ else
239+ {
240+- CompositeWindow *cw = CompositeWindow::get (w);
241+ if (!cw->redirected ())
242+ {
243+ if (fs.allowRedirection (w->region ()))
244+
245+=== modified file 'plugins/opengl/src/privates.h'
246+--- a/plugins/opengl/src/privates.h 2012-12-13 07:42:28 +0000
247++++ b/plugins/opengl/src/privates.h 2013-01-03 03:30:42 +0000
248+@@ -131,6 +131,9 @@
249+ CompSize rootPixmapSize;
250+
251+ const char *glVendor, *glRenderer, *glVersion;
252++
253++ mutable CompString prevRegex;
254++ mutable bool prevBlacklisted;
255+ };
256+
257+ class PrivateGLWindow :
258+
259+=== modified file 'plugins/opengl/src/screen.cpp'
260+--- a/plugins/opengl/src/screen.cpp 2012-12-13 07:42:28 +0000
261++++ b/plugins/opengl/src/screen.cpp 2013-01-03 03:30:42 +0000
262+@@ -603,7 +603,9 @@
263+ rootPixmapSize (),
264+ glVendor (NULL),
265+ glRenderer (NULL),
266+- glVersion (NULL)
267++ glVersion (NULL),
268++ prevRegex (),
269++ prevBlacklisted (false)
270+ {
271+ ScreenInterface::setHandler (screen);
272+ }
273+@@ -1306,7 +1308,16 @@
274+ bool
275+ PrivateGLScreen::driverIsBlacklisted (const char *regex) const
276+ {
277+- return blacklisted (regex, glVendor, glRenderer, glVersion);
278++ /*
279++ * regex matching is VERY expensive, so only do it when the result might
280++ * be different to last time. The gl* variables never change value...
281++ */
282++ if (prevRegex != regex)
283++ {
284++ prevBlacklisted = blacklisted (regex, glVendor, glRenderer, glVersion);
285++ prevRegex = regex;
286++ }
287++ return prevBlacklisted;
288+ }
289+
290+ GLTexture::BindPixmapHandle
291+
292
293=== added file 'debian/patches/force_unredirect_enabling.patch'
294--- debian/patches/force_unredirect_enabling.patch 1970-01-01 00:00:00 +0000
295+++ debian/patches/force_unredirect_enabling.patch 2013-05-07 13:14:15 +0000
296@@ -0,0 +1,22 @@
297+=== modified file 'plugins/opengl/src/paint.cpp'
298+--- a/plugins/opengl/src/paint.cpp 2012-12-13 07:42:28 +0000
299++++ b/plugins/opengl/src/paint.cpp 2012-12-14 07:48:47 +0000
300+@@ -224,8 +224,15 @@
301+ CompWindowList pl;
302+ CompWindowList::reverse_iterator rit;
303+
304+- unredirectFS = CompositeScreen::get (screen)->
305+- getOption ("unredirect_fullscreen_windows")->value ().b ();
306++ /*
307++ * On 0.9.7 we set this always to true, since we couldn't easily migrate
308++ * the current users to the new default because of gconf problems.
309++ *
310++ * Disabling of fullscreen application unredirection can be easily
311++ * achieved by clearing out the unredirect_match option, ie. removing
312++ * also the '(any)' part and leaving that option blank.
313++ */
314++ unredirectFS = true;
315+
316+ // This should be const but CompMatch is not const-friendly.
317+ CompMatch &unredirectable = CompositeScreen::get (screen)->
318+
319
320=== removed file 'debian/patches/revert_fix_933776_955035.patch'
321--- debian/patches/revert_fix_933776_955035.patch 2012-11-12 11:57:00 +0000
322+++ debian/patches/revert_fix_933776_955035.patch 1970-01-01 00:00:00 +0000
323@@ -1,65 +0,0 @@
324-=== modified file 'plugins/scale/src/privates.h'
325---- old/plugins/scale/src/privates.h 2012-06-21 23:10:08 +0000
326-+++ new/plugins/scale/src/privates.h 2012-11-12 08:37:15 +0000
327-@@ -63,8 +63,6 @@
328- void findBestSlots ();
329- bool fillInWindows ();
330- bool layoutThumbs ();
331-- bool layoutThumbsAll ();
332-- bool layoutThumbsSingle ();
333-
334- SlotArea::vector getSlotAreas ();
335-
336-
337-=== modified file 'plugins/scale/src/scale.cpp'
338---- old/plugins/scale/src/scale.cpp 2012-06-21 23:10:08 +0000
339-+++ new/plugins/scale/src/scale.cpp 2012-11-12 08:37:15 +0000
340-@@ -684,47 +684,6 @@
341- bool
342- PrivateScaleScreen::layoutThumbs ()
343- {
344-- switch (type) {
345-- case ScaleTypeAll:
346-- return layoutThumbsAll ();
347-- case ScaleTypeNormal:
348-- default:
349-- return layoutThumbsSingle ();
350-- }
351--}
352--
353--bool
354--PrivateScaleScreen::layoutThumbsAll ()
355--{
356-- windows.clear ();
357--
358-- /* add windows scale list, top most window first */
359-- foreach (CompWindow *w, screen->windows ())
360-- {
361-- SCALE_WINDOW (w);
362--
363-- if (sw->priv->slot)
364-- sw->priv->adjust = true;
365--
366-- sw->priv->slot = NULL;
367--
368-- if (!sw->priv->isScaleWin ())
369-- continue;
370--
371-- windows.push_back (sw);
372-- }
373--
374-- if (windows.empty ())
375-- return false;
376--
377-- slots.resize (windows.size ());
378--
379-- return ScaleScreen::get (screen)->layoutSlotsAndAssignWindows ();
380--}
381--
382--bool
383--PrivateScaleScreen::layoutThumbsSingle ()
384--{
385- bool ret = false;
386- std::map <ScaleWindow *, ScaleSlot> slotWindows;
387- CompWindowList allWindows;
388-
389
390=== removed file 'debian/patches/revert_fix_994841.patch'
391--- debian/patches/revert_fix_994841.patch 2012-11-13 09:38:42 +0000
392+++ debian/patches/revert_fix_994841.patch 1970-01-01 00:00:00 +0000
393@@ -1,33 +0,0 @@
394-=== modified file 'scripts/run-with-xvfb.sh'
395---- old/scripts/run-with-xvfb.sh 2012-06-27 09:39:08 +0000
396-+++ new/scripts/run-with-xvfb.sh 2012-11-13 09:18:47 +0000
397-@@ -8,19 +8,18 @@
398- exit 1
399- fi
400-
401--# The script should still pass if you have a real Xserver and no Xvfb
402--if [ ! -z "$DISPLAY" ]; then
403-- echo "Note: You are already running an Xserver."
404-- $1
405--else
406-- xvfb=`which Xvfb`
407-- if [ ! -x "$xvfb" ]; then
408-- echo "Error: Xvfb does not seem to be installed."
409-- exit 1
410-- fi
411-+xvfb=`which Xvfb`
412-+if [ ! -x "$xvfb" ]; then
413-+ echo "Error: Xvfb does not seem to be installed."
414-+ exit 1
415-+fi
416-
417-+if [ -z "$DISPLAY" ]; then
418- Xvfb -ac -noreset -screen 0 1024x768x16 -help 2>/dev/null 1>&2
419- 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`
420- { 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; }
421- DISPLAY=:$XID $1
422-+else
423-+ echo "Note: You are already running an Xserver."
424-+ $1
425- fi
426-
427
428=== modified file 'debian/patches/series'
429--- debian/patches/series 2012-11-13 09:38:42 +0000
430+++ debian/patches/series 2013-05-07 13:14:15 +0000
431@@ -1,5 +1,6 @@
432 ubuntu-config.patch
433 ccp_plugin.patch
434 workaround_broken_drivers.patch
435-revert_fix_933776_955035.patch
436-revert_fix_994841.patch
437+force_unredirect_enabling.patch
438+blacklist_precise_mesa80_intel_nouveau.patch
439+fix_1095001.patch
440
441=== modified symlink 'debian/patches/series.armel'
442=== target was u'series.armhf'
443--- debian/patches/series.armel 1970-01-01 00:00:00 +0000
444+++ debian/patches/series.armel 2013-05-07 13:14:15 +0000
445@@ -0,0 +1,1 @@
446+compiz-package-gles2.patch
447
448=== modified file 'debian/patches/workaround_broken_drivers.patch'
449--- debian/patches/workaround_broken_drivers.patch 2012-02-10 16:36:43 +0000
450+++ debian/patches/workaround_broken_drivers.patch 2013-05-07 13:14:15 +0000
451@@ -2,7 +2,7 @@
452 ===================================================================
453 --- compiz-0.9.7.0~bzr2995.orig/plugins/opengl/src/screen.cpp 2012-02-09 16:32:07.000000000 +0100
454 +++ compiz-0.9.7.0~bzr2995/plugins/opengl/src/screen.cpp 2012-02-10 17:09:17.029015287 +0100
455-@@ -25,6 +25,11 @@
456+@@ -25,7 +25,12 @@
457 * David Reveman <davidr@novell.com>
458 */
459
460@@ -12,6 +12,7 @@
461 +#include <errno.h>
462 +
463 #include "privates.h"
464+ #include "blacklist/blacklist.h"
465
466 #include <dlfcn.h>
467 @@ -83,9 +88,24 @@
468
469=== modified file 'debian/watch'
470--- debian/watch 2009-10-20 10:34:10 +0000
471+++ debian/watch 2013-05-07 13:14:15 +0000
472@@ -1,3 +1,3 @@
473 version=3
474-http://releases.compiz.org/([\d\.]+)[02468]/ compiz-(\d.*)\.tar\.gz
475+https://launchpad.net/compiz-core/+download .*/compiz-core-([0-9.]+)\.tar\.bz2
476

Subscribers

People subscribed via source and target branches

to all changes: