Compiz

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

  1. build-fixes-part-10-animationaddon-plugin
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin
Merge into: lp:compiz/0.9.8
Prerequisite: lp:~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:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin
Reviewer Review Type Date Requested Status
Daniel van Vugt Needs Fixing
Review via email: mp+106527@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin updated
3221. By Sam Spilsbury

Merged build-fixes-part-9-remove-cruft into build-fixes-part-10-animationaddon-plugin.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

review: Needs Fixing

Unmerged revisions

3221. By Sam Spilsbury

Merged build-fixes-part-9-remove-cruft into build-fixes-part-10-animationaddon-plugin.

3220. By Sam Spilsbury

Enable animationadddon plugin, explicitly depend on composite and opengl
in order to bring in their plugin deps and fix warnings

3219. By Sam Spilsbury

Consolidated Xig tests into main header

3218. By Sam Spilsbury

Remove useless headers

3217. By Sam Spilsbury

Put messages about libcompizconfig configuration in main results

3216. By Sam Spilsbury

There is no reason why the wrapsystem tests need an X Server

3215. By Sam Spilsbury

Set the environment in the test harness as SET_TESTS_PROPERTIES appears
to not work

3214. By Sam Spilsbury

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

Build compizconfig-python

3212. By Sam Spilsbury

Merged build-fixes-part-5-gsettings-warnings into build-fixes-part-6-remove-pyclean.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-05-20 11:11:34 +0000
3+++ CMakeLists.txt 2012-05-20 11:11:35 +0000
4@@ -157,9 +157,6 @@
5
6 find_package (Threads REQUIRED)
7
8-# Disabled until we can sort dependency issues
9-set (COMPIZ_DISABLE_PLUGIN_ANIMATIONADDON ON)
10-
11 # Add the rest of compiz
12 add_subdirectory (cmake)
13 add_subdirectory (include)
14
15=== modified file 'plugins/animation/include/animation/multi.h'
16--- plugins/animation/include/animation/multi.h 2010-08-23 04:35:07 +0000
17+++ plugins/animation/include/animation/multi.h 2012-05-20 11:11:35 +0000
18@@ -293,7 +293,7 @@
19 bool moveUpdate (int dx, int dy)
20 {
21 int count = 0;
22- bool update;
23+ bool update = false;
24 foreach (SingleAnim *a, animList)
25 {
26 setCurrAnimNumber (mAWindow, count);
27@@ -308,7 +308,7 @@
28 int dwidth, int dheight)
29 {
30 int count = 0;
31- bool update;
32+ bool update = false;
33 foreach (SingleAnim *a, animList)
34 {
35 setCurrAnimNumber (mAWindow, count);
36
37=== modified file 'plugins/animationaddon/CMakeLists.txt'
38--- plugins/animationaddon/CMakeLists.txt 2012-05-16 19:35:19 +0000
39+++ plugins/animationaddon/CMakeLists.txt 2012-05-20 11:11:35 +0000
40@@ -3,5 +3,5 @@
41 include (FindOpenGL)
42
43 if (OPENGL_GLU_FOUND)
44- #compiz_plugin (animationaddon PLUGINDEPS animation LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
45+ compiz_plugin (animationaddon PLUGINDEPS composite opengl animation LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
46 endif (OPENGL_GLU_FOUND)
47
48=== modified file 'plugins/animationaddon/src/polygon.cpp'
49--- plugins/animationaddon/src/polygon.cpp 2011-03-14 16:00:55 +0000
50+++ plugins/animationaddon/src/polygon.cpp 2012-05-20 11:11:35 +0000
51@@ -1720,6 +1720,7 @@
52 mGScreen->setTexEnvMode (GL_REPLACE);
53
54 glPopMatrix ();
55+ (GL::activeTexture) (prevActiveTexture);
56
57 if (mDoLighting)
58 {

Subscribers

People subscribed via source and target branches