Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1127866 into lp://qastaging/compiz/0.9.9

Proposed by Sam Spilsbury
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3609
Merged at revision: 3609
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.fix_1127866
Merge into: lp://qastaging/compiz/0.9.9
Diff against target: 272 lines (+207/-6)
7 files modified
debian/changelog (+10/-0)
debian/compiz-plugins-default.install (+1/-0)
debian/compiz-plugins.install (+0/-1)
debian/patches/100_workaround_virtualbox_hang.patch (+176/-0)
debian/patches/series (+1/-0)
debian/profile_upgrades/com.canonical.unity.unity.03.upgrade (+2/-0)
plugins/opengl/DRIVERS (+17/-5)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1127866
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+148927@code.qastaging.launchpad.net

Commit message

Workaround hangs in glXBindTexImageEXT - we need a server grab for the
external pixmap case, but we can just revert to using copytex if using
VirtualBox for now.

(LP: #1127866)

Description of the change

Workaround hangs in glXBindTexImageEXT - we need a server grab for the
external pixmap case, but we can just revert to using copytex if using
VirtualBox for now.

(LP: #1127866)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

That's ok for now, let's wait the proper patch to go in upstream before reverting this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches