Merge lp:~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms into lp:ubuntu/quantal/compiz
Status: | Rejected |
---|---|
Rejected by: | Martin Pitt |
Proposed branch: | lp:~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms |
Merge into: | lp:ubuntu/quantal/compiz |
Diff against target: |
29 lines (+10/-1) 2 files modified
debian/changelog (+9/-0) plugins/opengl/src/vertexbuffer.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt (community) | Needs Resubmitting | ||
Ubuntu branches | Pending | ||
Review via email: mp+130709@code.launchpad.net |
Description of the change
I fixed an annoying segfault (probably due to a typo) in plugins/
The fix was trivial (found "program" where it clearly should have been "tmpProgram").
Unmerged revisions
- 3320. By NabilStendardo
-
* Fixed segfault in plugins/
opengl/ src/vertexbuffe r.cpp.
- It concerns third-party plugins using the compiz opengl API.
- The crash occurs during rendering after shaders are added using GLWindow.addShaders and
after a Uniform is manually added to the vertex buffer. - 3319. By Didier Roche-Tolomelli
-
releasing version 1:0.9.8.
4+bzr3407- 0ubuntu1 - 3318. By Timo Jyrinki
-
* New upstream snapshot.
- Cherry-picked fixes in Ubuntu merged to development branch
- Disable failing tests due to distro patch (LP: #1058577)
- Fix leakage of destroyed_pixmaps_ table, containing pointers to freed
decor_t's which could result in a freed GHashTable being passed into
g_hash_table_remove and causing a crash. (LP: #1060171)
Thanks Nabil. Please propose to branch "lp:compiz" instead.
And no changes to debian/changelog for now thanks.