Merge lp://staging/~bregma/compiz/lp-269904-trusty into lp://staging/compiz/0.9.11

Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3871
Merged at revision: 3871
Proposed branch: lp://staging/~bregma/compiz/lp-269904-trusty
Merge into: lp://staging/compiz/0.9.11
Diff against target: 819 lines (+622/-5)
8 files modified
debian/changelog (+24/-0)
debian/patches/100_workaround_virtualbox_hang.patch (+4/-4)
plugins/opengl/include/opengl/opengl.h (+64/-0)
plugins/opengl/include/opengl/xtoglsync.h (+99/-0)
plugins/opengl/opengl.xml.in (+5/-0)
plugins/opengl/src/privates.h (+13/-0)
plugins/opengl/src/screen.cpp (+219/-1)
plugins/opengl/src/xtoglsync.cpp (+194/-0)
To merge this branch: bzr merge lp://staging/~bregma/compiz/lp-269904-trusty
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Christopher Townsend (community) Approve
Review via email: mp+245866@code.staging.launchpad.net

Commit message

Use the GL_EXT_x11_sync_object OpenGL extension to synchronize updates with X11 to avoid unrefreshed parts of the screen on Nvidia hardware.

Description of the change

Use the GL_EXT_x11_sync_object OpenGL extension to synchronize updates with X11 to avoid unrefreshed parts of the screen on Nvidia hardware.

Cherry-picked for backport from COmpiz 0.9.12.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

HOW COULD THIS POSSIBLY HAVE A CONFLICT IN debian/changelog?????

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3870. By Stephen M. Webb

Use the GL_EXT_x11_sync_object OpenGL extension to synchronize updates with X11 to avoid unrefreshed parts of the screen on Nvidia hardware.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

C'mon Jenkins, you can do better than that.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Changelog version should be 1:0.9.11.3-0ubuntu2 instead of 1:0.9.12.3-0ubuntu2.

review: Needs Fixing
3871. By Stephen M. Webb

debian/changelog: fixed Ubuntu package versaion

Revision history for this message
Christopher Townsend (townsend) wrote :

Ok, looks good now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

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