Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1056645 into lp://qastaging/compiz/0.9.8

compiz.fix_1056645
Merge into 0.9.8

Proposed by Sam Spilsbury on 2012-09-26

Status:

Merged

Approved by:

Daniel van Vugt on 2012-09-26

Approved revision:

3396

Merged at revision:

3397

Proposed branch:

lp://qastaging/~compiz-team/compiz/compiz.fix_1056645

Merge into:

lp://qastaging/compiz/0.9.8

Diff against target:

53 lines (+15/-5)

1 file modified

plugins/opengl/src/screen.cpp (+15/-5)

To merge this branch:

bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1056645

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Needs Fixing on 2012-09-26
Daniel van Vugt		2012-09-26	Approve on 2012-09-26
Review via email: mp+126399@code.qastaging.launchpad.net

Commit message

Fix build error: "'swapInterval' is not a member of 'GL'" on USE_GLES
(LP: #1056645)

Description of the change

Fix FTBFS

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-09-26:

FAILED: Continuous integration, rev:3395
http://jenkins.qa.ubuntu.com/job/compiz-ci/128/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/128/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-09-26:

/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp: In function ‘void GL::waitForVideoSync()’:
/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp:1722:21: error: too few arguments to function ‘void GL::fastSwapInterval(Display*, int)’
/home/dan/bzr/compiz/tmp.645/plugins/opengl/src/screen.cpp:1694:1: note: declared here