Compiz

Merge lp://qastaging/~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin into lp://qastaging/compiz/0.9.8

Proposed by Sam Spilsbury on 2012-05-20

Status:	Superseded
Proposed branch:	lp://qastaging/~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin
Merge into:	lp://qastaging/compiz/0.9.8
Prerequisite:	lp://qastaging/~compiz-team/compiz/build-fixes-part-9-remove-cruft
Diff against target:	58 lines (+4/-6) 4 files modified CMakeLists.txt (+0/-3) plugins/animation/include/animation/multi.h (+2/-2) plugins/animationaddon/CMakeLists.txt (+1/-1) plugins/animationaddon/src/polygon.cpp (+1/-0)
To merge this branch:	bzr merge lp://qastaging/~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2012-05-20	Needs Fixing on 2012-05-21
Review via email: mp+106527@code.qastaging.launchpad.net

This branch makes the animationaddon plugin explicitly depend on composite and opengl, so that their include directories are pulled in correctly

Fix warnings (initialize variables).

Also fixes a warning about an unused variable because the active texture wasn't being reset to the saved one.

3221. By Sam Spilsbury on 2012-05-20: Merged build-fixes-part-9-remove-cruft into build-fixes-part-10-animationaddon-plugin.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-05-21:

Again, please remove code changes not related to build fixes.

review: Needs Fixing

3221. By Sam Spilsbury on 2012-05-20: Merged build-fixes-part-9-remove-cruft into build-fixes-part-10-animationaddon-plugin.
3220. By Sam Spilsbury on 2012-05-20: Enable animationadddon plugin, explicitly depend on composite and opengl
in order to bring in their plugin deps and fix warnings
3219. By Sam Spilsbury on 2012-05-20: Consolidated Xig tests into main header
3218. By Sam Spilsbury on 2012-05-20: Remove useless headers
3217. By Sam Spilsbury on 2012-05-20: Put messages about libcompizconfig configuration in main results
3216. By Sam Spilsbury on 2012-05-20: There is no reason why the wrapsystem tests need an X Server
3215. By Sam Spilsbury on 2012-05-20: Set the environment in the test harness as SET_TESTS_PROPERTIES appears
to not work
3214. By Sam Spilsbury on 2012-05-20: Fix useless uninstall rule and add code to allow the compizconfig-python
tests to be run without compizconfig actually being installed ... CTest
doesn't quite get it yet though
3213. By Sam Spilsbury on 2012-05-19: Build compizconfig-python
3212. By Sam Spilsbury on 2012-05-19: Merged build-fixes-part-5-gsettings-warnings into build-fixes-part-6-remove-pyclean.