Merge lp:~sil2100/compiz/0.9.8_fix_ftbfs_arm into lp:compiz/0.9.8

Proposed by Łukasz Zemczak on 2013-01-10
Status: Merged
Approved by: Sam Spilsbury on 2013-01-10
Approved revision: 3432
Merged at revision: 3432
Proposed branch: lp:~sil2100/compiz/0.9.8_fix_ftbfs_arm
Merge into: lp:compiz/0.9.8
Diff against target: 19 lines (+2/-1)
1 file modified
plugins/text/src/text.cpp (+2/-1)
To merge this branch: bzr merge lp:~sil2100/compiz/0.9.8_fix_ftbfs_arm
Reviewer Review Type Date Requested Status
Sam Spilsbury 2013-01-10 Approve on 2013-01-10
Review via email: mp+142714@code.launchpad.net

Commit message

Fix FTBFS for ARM because of an unused variable.

Description of the change

- Problem:

FTBFS because of an unused variable.

- Fix:

Move the unused variable to the path where GLES is not used.

- Tests:

N/A

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

Resubmitted the patch to the correct branch.

Sam Spilsbury (smspillaz) wrote :

Yep, thats fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/text/src/text.cpp'
2--- plugins/text/src/text.cpp 2012-11-27 03:51:57 +0000
3+++ plugins/text/src/text.cpp 2013-01-10 15:40:27 +0000
4@@ -492,7 +492,6 @@
5 float y,
6 float alpha) const
7 {
8- GLboolean wasBlend;
9 GLint oldBlendSrc, oldBlendDst;
10 GLushort colorData[4];
11 GLfloat textureData[8];
12@@ -509,6 +508,8 @@
13 glGetIntegerv (GL_BLEND_SRC_ALPHA, &oldBlendSrcAlpha);
14 glGetIntegerv (GL_BLEND_DST_ALPHA, &oldBlendDstAlpha);
15 #else
16+ GLboolean wasBlend;
17+
18 glGetIntegerv (GL_BLEND_SRC, &oldBlendSrc);
19 glGetIntegerv (GL_BLEND_DST, &oldBlendDst);
20

Subscribers

People subscribed via source and target branches