diff -Nru compiz-plugins-extra-0.9.5.94/3d/VERSION compiz-plugins-extra-0.9.7.0~bzr9/3d/VERSION --- compiz-plugins-extra-0.9.5.94/3d/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/3d/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/addhelper/VERSION compiz-plugins-extra-0.9.7.0~bzr9/addhelper/VERSION --- compiz-plugins-extra-0.9.5.94/addhelper/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/addhelper/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/animationaddon/VERSION compiz-plugins-extra-0.9.7.0~bzr9/animationaddon/VERSION --- compiz-plugins-extra-0.9.5.94/animationaddon/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/animationaddon/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/bench/src/bench.cpp compiz-plugins-extra-0.9.7.0~bzr9/bench/src/bench.cpp --- compiz-plugins-extra-0.9.5.94/bench/src/bench.cpp 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/bench/src/bench.cpp 2012-02-10 13:24:07.000000000 +0000 @@ -7,6 +7,9 @@ * Copyright : (C) 2006 by Dennis Kasprzyk * E-mail : onestone@beryl-project.org * + * New frame rate measurement algorithm: + * Copyright (c) 2011 Daniel van Vugt + * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,75 +25,121 @@ #include "bench.h" +using namespace compiz::core; + COMPIZ_PLUGIN_20090315 (bench, BenchPluginVTable) +#define TEX_WIDTH 512 +#define TEX_HEIGHT 256 + void BenchScreen::preparePaint (int msSinceLastPaint) { - float nRrVal; - float ratio = 0.05; - int timediff; - struct timeval now; - gettimeofday (&now, 0); - timediff = TIMEVALDIFF (&now, &mLastRedraw); - - nRrVal = MIN (1.1, - (float) cScreen->optimalRedrawTime () / (float) timediff); - - mRrVal = (mRrVal * (1.0 - ratio) ) + (nRrVal * ratio); - - mFps = (mFps * (1.0 - ratio) ) + - (1000000.0 / TIMEVALDIFFU (&now, &mLastRedraw) * ratio); - + int timediff = TIMEVALDIFFU (&now, &mLastRedraw); + mSample[mFrames % MAX_SAMPLES] = timediff; + timediff /= 1000; + mFrames++; mLastRedraw = now; if (optionGetOutputConsole () && mActive) { - mFrames++; - mCtime += timediff; - - if (mCtime > optionGetConsoleUpdateTime () * 1000) + int dTime = timer::timeval_diff (&now, &mLastPrint); + if (dTime > optionGetConsoleUpdateTime () * 1000) { - printf ("[BENCH] : %.0f frames in %.1f seconds = %.3f FPS\n", - mFrames, mCtime / 1000.0, - mFrames / (mCtime / 1000.0) ); - mFrames = 0; - mCtime = 0; + int dFrames = mFrames - mLastPrintFrames; + mLastPrintFrames = mFrames; + g_print ("[BENCH] : %d frames in %d.%01d seconds = %d.%03d FPS\n", + dFrames, dTime / 1000, (dTime % 1000) / 100, + dFrames * 1000 / dTime, ((dFrames * 1000) % dTime) / 10); + mLastPrint = now; } } - cScreen->preparePaint ((mAlpha > 0.0) ? timediff : msSinceLastPaint); - if (mActive) + { mAlpha += timediff / 1000.0; + if (mAlpha >= 1.0f) + { + mAlpha = 1.0f; + /* + * If we're only creating "fake" damage to update the benchmark + * and no other damage is pending, then do it progressively + * less often so the framerate can steadily decrease toward zero. + */ + if (mFakedDamage) + mTimer.setTimes (mTimer.minTime () * 2); + else + { + /* + * Piggyback on damage events other than our own, so the + * benchmark updates at least as often as the rest + * of the screen. + */ + damageSelf (); + if (mTimer.minTime () != MIN_MS_PER_UPDATE) + mTimer.setTimes (MIN_MS_PER_UPDATE); + } + } + } else { if (mAlpha <= 0.0) { cScreen->preparePaintSetEnabled (this, false); - cScreen->donePaintSetEnabled (this, false); gScreen->glPaintOutputSetEnabled (this, false); + mTimer.stop (); } mAlpha -= timediff / 1000.0; + if (mAlpha < 0.0f) + mAlpha = 0.0f; } - mAlpha = MIN (1.0, MAX (0.0, mAlpha) ); + mFakedDamage = false; + + cScreen->preparePaint (msSinceLastPaint); } -void -BenchScreen::donePaint () +float +BenchScreen::averageFramerate () const +/* + * Returns the average frame rate of the last SECONDS_PER_AVERAGE seconds. + * This calculation is accurate no matter how often/seldom the screen + * gets painted. No timers required. Calculus rocks :) + */ { - if (mAlpha > 0.0) + const int usPerAverage = SECONDS_PER_AVERAGE * 1000000; + int i = (mFrames + MAX_SAMPLES - 1) % MAX_SAMPLES; + int lastSample = 0; + int timeSum = 0; + int count = 0; + int maxCount = MIN (MAX_SAMPLES, mFrames); + + while (timeSum < usPerAverage && count < maxCount) + { + lastSample = mSample[i]; + timeSum += lastSample; + i = (i + MAX_SAMPLES - 1) % MAX_SAMPLES; + count++; + } + + float fps = 0.0f; + if (timeSum < usPerAverage) + { + if (timeSum > 0) + fps = (float)(count * 1000000) / timeSum; + } + else { - cScreen->damageScreen (); - glFlush(); - XSync (::screen->dpy (), false); + fps = (float)(count - 1); + if (lastSample > 0) + fps += (float)(usPerAverage - (timeSum - lastSample)) / lastSample; + fps /= SECONDS_PER_AVERAGE; } - cScreen->donePaint (); + return fps; } bool @@ -124,7 +173,9 @@ glColor4f (1.0, 1.0, 1.0, mAlpha); glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTranslatef (optionGetPositionX (), optionGetPositionY (), 0); + mRect.setX (optionGetPositionX ()); + mRect.setY (optionGetPositionY ()); + glTranslatef (mRect.x (), mRect.y (), 0); glEnable (GL_TEXTURE_2D); glBindTexture (GL_TEXTURE_2D, mBackTex); @@ -133,11 +184,11 @@ glTexCoord2f (0, 0); glVertex2f (0, 0); glTexCoord2f (0, 1); - glVertex2f (0, 256); + glVertex2f (0, TEX_HEIGHT); glTexCoord2f (1, 1); - glVertex2f (512, 256); + glVertex2f (TEX_WIDTH, TEX_HEIGHT); glTexCoord2f (1, 0); - glVertex2f (512, 0); + glVertex2f (TEX_WIDTH, 0); glEnd(); glBindTexture (GL_TEXTURE_2D, 0); @@ -145,15 +196,24 @@ glTranslatef (53, 83, 0); - float rrVal = MIN (1.0, MAX (0.0, mRrVal) ); + float avgFps = averageFramerate (); + float rrVal = avgFps * cScreen->optimalRedrawTime () / 1000.0; + /* + * rrVal is slightly inaccurate and can be off by a couple of FPS. + * This means the graph for a 60 FPS config goes up to 62.5 FPS. + * This is because cScreen->optimalRedrawTime only has millisec precision + * and can't be avoided without improving the precision of the composite + * plugin. + */ + rrVal = MIN (1.0, MAX (0.0, rrVal) ); if (rrVal < 0.5) { glBegin (GL_QUADS); - glColor4f (1.0, 0.0, 0.0, mAlpha); + glColor4f (0.0, 1.0, 0.0, mAlpha); glVertex2f (0.0, 0.0); glVertex2f (0.0, 25.0); - glColor4f (1.0, rrVal * 2.0, 0.0, mAlpha); + glColor4f (rrVal * 2.0, 1.0, 0.0, mAlpha); glVertex2f (330.0 * rrVal, 25.0); glVertex2f (330.0 * rrVal, 0.0); glEnd(); @@ -161,7 +221,7 @@ else { glBegin (GL_QUADS); - glColor4f (1.0, 0.0, 0.0, mAlpha); + glColor4f (0.0, 1.0, 0.0, mAlpha); glVertex2f (0.0, 0.0); glVertex2f (0.0, 25.0); glColor4f (1.0, 1.0, 0.0, mAlpha); @@ -173,7 +233,7 @@ glColor4f (1.0, 1.0, 0.0, mAlpha); glVertex2f (165.0, 0.0); glVertex2f (165.0, 25.0); - glColor4f (1.0 - ( (rrVal - 0.5) * 2.0), 1.0, 0.0, mAlpha); + glColor4f (1.0, 1.0 - ( (rrVal - 0.5) * 2.0), 0.0, mAlpha); glVertex2f (165.0 + 330.0 * (rrVal - 0.5), 25.0); glVertex2f (165.0 + 330.0 * (rrVal - 0.5), 0.0); glEnd(); @@ -182,72 +242,26 @@ glColor4f (0.0, 0.0, 0.0, mAlpha); glCallList (mDList); glTranslatef (72, 45, 0); - - float red; - - if (mFps > 30.0) - red = 0.0; - else - red = 1.0; - - if (mFps <= 30.0 && mFps > 20.0) - red = 1.0 - ( (mFps - 20.0) / 10.0); - - glColor4f (red, 0.0, 0.0, mAlpha); glEnable (GL_TEXTURE_2D); isSet = false; - fps = (mFps * 100.0); + fps = (avgFps * 100.0); fps = MIN (999999, fps); - if (fps >= 100000) + for (unsigned int pos = 100000; pos >= 1; pos /= 10) { - glBindTexture (GL_TEXTURE_2D, mNumTex[fps / 100000]); - glCallList (mDList + 1); - isSet = true; - } - - fps %= 100000; - - glTranslatef (12, 0, 0); - - if (fps >= 10000 || isSet) - { - glBindTexture (GL_TEXTURE_2D, mNumTex[fps / 10000]); - glCallList (mDList + 1); - isSet = true; - } - - fps %= 10000; - - glTranslatef (12, 0, 0); - - if (fps >= 1000 || isSet) - { - glBindTexture (GL_TEXTURE_2D, mNumTex[fps / 1000]); - glCallList (mDList + 1); + if (fps >= pos || isSet || pos <= 100) + { + unsigned int digit = fps / pos; + glBindTexture (GL_TEXTURE_2D, mNumTex[digit]); + glCallList (mDList + 1); + isSet = true; + fps %= pos; + } + glTranslatef ((pos == 100) ? 19 : 12, 0, 0); } - fps %= 1000; - - glTranslatef (12, 0, 0); - - glBindTexture (GL_TEXTURE_2D, mNumTex[fps / 100]); - glCallList (mDList + 1); - fps %= 100; - - glTranslatef (19, 0, 0); - - glBindTexture (GL_TEXTURE_2D, mNumTex[fps / 10]); - glCallList (mDList + 1); - fps %= 10; - - glTranslatef (12, 0, 0); - - glBindTexture (GL_TEXTURE_2D, mNumTex[fps]); - glCallList (mDList + 1); - glBindTexture (GL_TEXTURE_2D, 0); glDisable (GL_TEXTURE_2D); @@ -275,7 +289,6 @@ BenchScreen::postLoad () { cScreen->preparePaintSetEnabled (this, mActive); - cScreen->donePaintSetEnabled (this, mActive); gScreen->glPaintOutputSetEnabled (this, mActive); } @@ -284,11 +297,10 @@ PluginStateWriter (this, screen->root ()), cScreen (CompositeScreen::get (screen)), gScreen (GLScreen::get (screen)), - mRrVal (0), - mFps (0), mAlpha (0), - mCtime (0), + mFakedDamage (false), mFrames (0), + mLastPrintFrames (0), mActive (false), mOldLimiterMode ((CompositeFPSLimiterMode) BenchOptions::FpsLimiterModeDefaultLimiter) @@ -302,6 +314,10 @@ CompositeScreenInterface::setHandler (cScreen, false); GLScreenInterface::setHandler (gScreen, false); + mRect.setGeometry (optionGetPositionX (), optionGetPositionY (), + TEX_WIDTH, TEX_HEIGHT); + mTimer.setCallback (boost::bind (&BenchScreen::timedOut, this)); + glGenTextures (10, mNumTex); glGenTextures (1, &mBackTex); @@ -333,7 +349,7 @@ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glTexImage2D (GL_TEXTURE_2D, 0, 4, 512, 256, 0, GL_RGBA, + glTexImage2D (GL_TEXTURE_2D, 0, 4, TEX_WIDTH, TEX_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, image_data); GLERR; @@ -402,6 +418,21 @@ glDeleteTextures (1, &mBackTex); } +void +BenchScreen::damageSelf () +{ + CompRegion self (mRect); + cScreen->damageRegion (self); +} + +bool +BenchScreen::timedOut () +{ + mFakedDamage = (cScreen->damageMask () == 0); + damageSelf (); + return true; +} + bool BenchScreen::initiate (CompOption::Vector &options) { @@ -424,20 +455,24 @@ optionGetFpsLimiterMode ()); cScreen->preparePaintSetEnabled (this, true); - cScreen->donePaintSetEnabled (this, true); gScreen->glPaintOutputSetEnabled (this, true); + + for (int t = 0; t < MAX_SAMPLES; t++) + mSample[t] = 0; } else { // Restore FPS limiter mode cScreen->setFPSLimiterMode (mOldLimiterMode); + mTimer.stop (); } + mTimer.start (1000 / FADE_FPS); - cScreen->damageScreen (); - mCtime = 0; mFrames = 0; + mLastPrintFrames = 0; gettimeofday (&mLastRedraw, 0); + mLastPrint = mLastRedraw; return false; } diff -Nru compiz-plugins-extra-0.9.5.94/bench/src/bench.h compiz-plugins-extra-0.9.7.0~bzr9/bench/src/bench.h --- compiz-plugins-extra-0.9.5.94/bench/src/bench.h 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/bench/src/bench.h 2012-02-10 13:24:07.000000000 +0000 @@ -7,6 +7,9 @@ * Copyright : (C) 2006 by Dennis Kasprzyk * E-mail : onestone@beryl-project.org * + * New frame rate measurement algorithm: + * Copyright (c) 2011 Daniel van Vugt + * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,6 +24,7 @@ **/ #include +#include #include #include @@ -32,14 +36,6 @@ #include "bench_tex.h" #include "bench_options.h" -/* -#define TIMEVALDIFF(tv1, tv2) \ - (((tv1)->tv_sec == (tv2)->tv_sec || (tv1)->tv_usec >= (tv2)->tv_usec) ? \ - ((((tv1)->tv_sec - (tv2)->tv_sec) * 1000000) + \ - ((tv1)->tv_usec - (tv2)->tv_usec)) / 1000 : \ - ((((tv1)->tv_sec - 1 - (tv2)->tv_sec) * 1000000) + \ - (1000000 + (tv1)->tv_usec - (tv2)->tv_usec)) / 1000) -*/ #define TIMEVALDIFFU(tv1, tv2) \ (((tv1)->tv_sec == (tv2)->tv_sec || (tv1)->tv_usec >= (tv2)->tv_usec) ? \ ((((tv1)->tv_sec - (tv2)->tv_sec) * 1000000) + \ @@ -71,14 +67,26 @@ GLScreen *gScreen; GLuint mDList; - float mRrVal; - float mFps; float mAlpha; - struct timeval mLastRedraw; + enum { + MAX_FPS = 500, + FADE_FPS = 50, + SECONDS_PER_AVERAGE = 2, + MAX_SAMPLES = MAX_FPS * SECONDS_PER_AVERAGE, + MIN_MS_PER_UPDATE = 1000 + }; + + bool mFakedDamage; + CompRect mRect; + CompTimer mTimer; + + int mSample[MAX_SAMPLES]; + int mFrames; + int mLastPrintFrames; - float mCtime; - float mFrames; + struct timeval mLastPrint; + struct timeval mLastRedraw; GLuint mNumTex[10]; GLuint mBackTex; @@ -87,6 +95,9 @@ CompositeFPSLimiterMode mOldLimiterMode; + void damageSelf (); + bool timedOut (); + float averageFramerate () const; void postLoad (); template @@ -100,7 +111,6 @@ void limiterModeChanged (CompOption *opt); void preparePaint (int msSinceLastPaint); - void donePaint (); bool glPaintOutput (const GLScreenPaintAttrib &, const GLMatrix &, const CompRegion &, diff -Nru compiz-plugins-extra-0.9.5.94/bench/VERSION compiz-plugins-extra-0.9.7.0~bzr9/bench/VERSION --- compiz-plugins-extra-0.9.5.94/bench/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/bench/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/bicubic/VERSION compiz-plugins-extra-0.9.7.0~bzr9/bicubic/VERSION --- compiz-plugins-extra-0.9.5.94/bicubic/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/bicubic/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/crashhandler/VERSION compiz-plugins-extra-0.9.7.0~bzr9/crashhandler/VERSION --- compiz-plugins-extra-0.9.5.94/crashhandler/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/crashhandler/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/cubeaddon/src/cubeaddon.cpp compiz-plugins-extra-0.9.7.0~bzr9/cubeaddon/src/cubeaddon.cpp --- compiz-plugins-extra-0.9.5.94/cubeaddon/src/cubeaddon.cpp 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/cubeaddon/src/cubeaddon.cpp 2012-02-10 13:24:07.000000000 +0000 @@ -1144,15 +1144,15 @@ pTransform.reset (); pTransform.rotate (xRotate, 0.0f, 1.0f, 0.0f); - pTransform.rotate (vRotate, cosf (xRotate * DEG2RAD), - 0.0f, sinf (xRotate * DEG2RAD)); + pTransform.rotate (vRotate, cosf (xRotate * (M_PI / 180.0f)), + 0.0f, sinf (xRotate * (M_PI / 180.0f))); point = pTransform * point; pTransform.reset (); pTransform.rotate (xRotate2, 0.0f, 1.0f, 0.0f); - pTransform.rotate (vRotate, cosf (xRotate2 * DEG2RAD), - 0.0f, sinf (xRotate2 * DEG2RAD)); + pTransform.rotate (vRotate, cosf (xRotate2 * (M_PI / 180.0f)), + 0.0f, sinf (xRotate2 * (M_PI / 180.0f))); point2 = pTransform * point2; @@ -1182,7 +1182,7 @@ rYTrans = -mCapFill[1] - 0.5; } else if (optionGetDeformation () == DeformationSphere && - vRotate > atan (cDist * 2) / DEG2RAD) + vRotate > atan (cDist * 2) / (M_PI / 180.0f)) { mYTrans = sqrt (0.5 + cDist2) - 0.5; rYTrans = -sqrt (0.5 + cDist2) - 0.5; diff -Nru compiz-plugins-extra-0.9.5.94/cubeaddon/VERSION compiz-plugins-extra-0.9.7.0~bzr9/cubeaddon/VERSION --- compiz-plugins-extra-0.9.5.94/cubeaddon/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/cubeaddon/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/debian/changelog compiz-plugins-extra-0.9.7.0~bzr9/debian/changelog --- compiz-plugins-extra-0.9.5.94/debian/changelog 2011-09-12 06:12:47.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/debian/changelog 2012-02-13 14:31:30.000000000 +0000 @@ -1,3 +1,20 @@ +compiz-plugins-extra (0.9.7.0~bzr9-0ubuntu1) precise; urgency=low + + * New upstream snapshot + - Benchmark plugin severely affects its own results, making it + inaccurate. (LP: #898548) + - Plugins fail to build due to missing (renamed) TIMEVALDIFF (LP: #915236) + - Some plugins no longer build due to undefined DEG2RAD (LP: #918554) + - Merge (overwrite?) lp:compiz-*-plugin back into + lp:compiz-plugins-{main,extra} (LP: #923572) + * debian/control: + - build-dep on latest compiz-dev and compiz-plugins-main-dev for + ABI break + * debian/rules: + - pick the new abiversion file + + -- Didier Roche Mon, 13 Feb 2012 15:31:20 +0100 + compiz-plugins-extra (0.9.5.94-0ubuntu1) oneiric; urgency=low * New upstream release diff -Nru compiz-plugins-extra-0.9.5.94/debian/control compiz-plugins-extra-0.9.7.0~bzr9/debian/control --- compiz-plugins-extra-0.9.5.94/debian/control 2011-09-12 06:12:47.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/debian/control 2012-02-13 14:31:30.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50), cmake, pkg-config, - compiz-dev (>= 1:0.9.5.94+bzr2803-0ubuntu1~), + compiz-dev (>= 1:0.9.7.0~), librsvg2-dev, libcairo2-dev, libsm-dev, @@ -17,7 +17,7 @@ xsltproc, libxslt1-dev, libglu1-mesa-dev, - compiz-plugins-main-dev (>= 0.9.5.0-0ubuntu2), + compiz-plugins-main-dev (>= 1:0.9.7.0~), gconf2, libboost1.46-dev, libboost-serialization1.46-dev, diff -Nru compiz-plugins-extra-0.9.5.94/debian/rules compiz-plugins-extra-0.9.7.0~bzr9/debian/rules --- compiz-plugins-extra-0.9.5.94/debian/rules 2011-09-12 06:12:47.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/debian/rules 2012-02-13 14:31:30.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/core.h ) +CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h ) override_dh_auto_configure: dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE diff -Nru compiz-plugins-extra-0.9.5.94/extrawm/VERSION compiz-plugins-extra-0.9.7.0~bzr9/extrawm/VERSION --- compiz-plugins-extra-0.9.5.94/extrawm/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/extrawm/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/fadedesktop/VERSION compiz-plugins-extra-0.9.7.0~bzr9/fadedesktop/VERSION --- compiz-plugins-extra-0.9.5.94/fadedesktop/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/fadedesktop/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/firepaint/VERSION compiz-plugins-extra-0.9.7.0~bzr9/firepaint/VERSION --- compiz-plugins-extra-0.9.5.94/firepaint/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/firepaint/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/gears/VERSION compiz-plugins-extra-0.9.7.0~bzr9/gears/VERSION --- compiz-plugins-extra-0.9.5.94/gears/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/gears/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/group/VERSION compiz-plugins-extra-0.9.7.0~bzr9/group/VERSION --- compiz-plugins-extra-0.9.5.94/group/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/group/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/loginout/VERSION compiz-plugins-extra-0.9.7.0~bzr9/loginout/VERSION --- compiz-plugins-extra-0.9.5.94/loginout/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/loginout/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/maximumize/VERSION compiz-plugins-extra-0.9.7.0~bzr9/maximumize/VERSION --- compiz-plugins-extra-0.9.5.94/maximumize/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/maximumize/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/mblur/VERSION compiz-plugins-extra-0.9.7.0~bzr9/mblur/VERSION --- compiz-plugins-extra-0.9.5.94/mblur/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/mblur/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/NEWS compiz-plugins-extra-0.9.7.0~bzr9/NEWS --- compiz-plugins-extra-0.9.5.94/NEWS 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/NEWS 2012-02-10 13:24:07.000000000 +0000 @@ -1,3 +1,21 @@ +Release 0.9.7.0 (2012-XX-YY Sam Spilsbury ) +================================================================ + +Bug fixes (https://launchpad.net/compiz-plugins-extra/+milestone/0.9.7.0) + + 898548 - Benchmark plugin severely affects its own results, making it + inaccurate. + 915236 - Plugins fail to build due to missing (renamed) TIMEVALDIFF + 918554 - Some plugins no longer build due to undefined DEG2RAD + 923572 - Merge (overwrite?) lp:compiz-*-plugin back into + lp:compiz-plugins-{main,extra} + + +Release 0.9.2.1 (2010-11-06 Sam Spilsbury ) +======================================================================== +Bugfix release. + + Release 0.9.2 (2010-10-24 Sam Spilsbury ) ============================================================== Development Release. @@ -6,6 +24,3 @@ Move all cube cap image drawing into the cubeaddon plugin -Release 0.9.2.1 (2010-11-06 Sam Spilsbury ) -======================================================================== -Bugfix release. diff -Nru compiz-plugins-extra-0.9.5.94/notification/src/notification.cpp compiz-plugins-extra-0.9.7.0~bzr9/notification/src/notification.cpp --- compiz-plugins-extra-0.9.5.94/notification/src/notification.cpp 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/notification/src/notification.cpp 2012-02-10 13:24:07.000000000 +0000 @@ -26,6 +26,13 @@ COMPIZ_PLUGIN_20090315 (notification, NotificationPluginVTable); +/* libnotify 0.7 introduced proper NOTIFY_CHECK_VERSION macro */ +#ifdef NOTIFY_CHECK_VERSION +#if NOTIFY_CHECK_VERSION(0,6,1) +#define HAVE_LIBNOTIFY_0_6_1 +#endif +#endif + void NotificationScreen::logMessage (const char *component, CompLogLevel level, diff -Nru compiz-plugins-extra-0.9.5.94/reflex/VERSION compiz-plugins-extra-0.9.7.0~bzr9/reflex/VERSION --- compiz-plugins-extra-0.9.5.94/reflex/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/reflex/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/scalefilter/VERSION compiz-plugins-extra-0.9.7.0~bzr9/scalefilter/VERSION --- compiz-plugins-extra-0.9.5.94/scalefilter/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/scalefilter/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/shelf/VERSION compiz-plugins-extra-0.9.7.0~bzr9/shelf/VERSION --- compiz-plugins-extra-0.9.5.94/shelf/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/shelf/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/showdesktop/VERSION compiz-plugins-extra-0.9.7.0~bzr9/showdesktop/VERSION --- compiz-plugins-extra-0.9.5.94/showdesktop/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/showdesktop/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/showmouse/VERSION compiz-plugins-extra-0.9.7.0~bzr9/showmouse/VERSION --- compiz-plugins-extra-0.9.5.94/showmouse/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/showmouse/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/splash/VERSION compiz-plugins-extra-0.9.7.0~bzr9/splash/VERSION --- compiz-plugins-extra-0.9.5.94/splash/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/splash/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/trailfocus/VERSION compiz-plugins-extra-0.9.7.0~bzr9/trailfocus/VERSION --- compiz-plugins-extra-0.9.5.94/trailfocus/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/trailfocus/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94 diff -Nru compiz-plugins-extra-0.9.5.94/VERSION compiz-plugins-extra-0.9.7.0~bzr9/VERSION --- compiz-plugins-extra-0.9.5.94/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.94 +0.9.7.0 diff -Nru compiz-plugins-extra-0.9.5.94/widget/VERSION compiz-plugins-extra-0.9.7.0~bzr9/widget/VERSION --- compiz-plugins-extra-0.9.5.94/widget/VERSION 2011-09-02 17:40:52.000000000 +0000 +++ compiz-plugins-extra-0.9.7.0~bzr9/widget/VERSION 2012-02-10 13:24:07.000000000 +0000 @@ -1 +1 @@ -0.9.5.0 +0.9.5.94