Hello community,
here is the log from the commit of package compiz-plugins-extra for openSUSE:Factory
checked in at Mon Apr 19 11:26:06 CEST 2010.
--------
--- compiz-plugins-extra/compiz-plugins-extra.changes 2009-11-23 10:48:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz-plugins-extra/compiz-plugins-extra.changes 2010-04-19 10:32:19.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Mar 30 13:53:51 UTC 2010 - dimstar@opensuse.org
+
+- Update to version 0.8.6
+ + bug fix release
+ + Keep version in sync with compiz.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compiz-plugins-extra-0.8.4.tar.bz2
New:
----
compiz-plugins-extra-0.8.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz-plugins-extra.spec ++++++
--- /var/tmp/diff_new_pack.9uW9pp/_old 2010-04-19 11:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.9uW9pp/_new 2010-04-19 11:25:53.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package compiz-plugins-extra (Version 0.8.4)
+# spec file for package compiz-plugins-extra (Version 0.8.6)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,7 @@
%if %suse_version <= 1021
BuildRequires: gconf2-rpm-macros
%endif
-Version: 0.8.4
+Version: 0.8.6
Release: 1
License: GPLv2+
Summary: Compiz-Fusion community extra plugins
++++++ compiz-plugins-extra-0.8.4.tar.bz2 -> compiz-plugins-extra-0.8.6.tar.bz2 ++++++
++++ 23985 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/VERSION new/compiz-plugins-extra-0.8.6/VERSION
--- old/compiz-plugins-extra-0.8.4/VERSION 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/VERSION 2010-03-29 16:09:18.000000000 +0200
@@ -1 +1 @@
-VERSION=0.8.4
+VERSION=0.8.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/config.h.in new/compiz-plugins-extra-0.8.6/config.h.in
--- old/compiz-plugins-extra-0.8.4/config.h.in 2009-10-14 03:08:01.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/config.h.in 2010-03-29 16:09:59.000000000 +0200
@@ -76,6 +76,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/missing new/compiz-plugins-extra-0.8.6/missing
--- old/compiz-plugins-extra-0.8.4/missing 2009-10-14 03:08:01.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/missing 2010-03-29 16:10:00.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/po/Makefile.in.in new/compiz-plugins-extra-0.8.6/po/Makefile.in.in
--- old/compiz-plugins-extra-0.8.4/po/Makefile.in.in 2009-10-14 03:08:05.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/po/Makefile.in.in 2010-03-29 16:10:04.000000000 +0200
@@ -56,7 +56,7 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
@@ -129,7 +129,7 @@
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/po/pt.po new/compiz-plugins-extra-0.8.6/po/pt.po
--- old/compiz-plugins-extra-0.8.4/po/pt.po 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/po/pt.po 2010-03-29 16:09:18.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: pt_PT\n"
"Report-Msgid-Bugs-To: http://bugs.opencompositing.org\n"
"POT-Creation-Date: 2009-02-06 07:09+0100\n"
-"PO-Revision-Date: 2009-02-20 15:07+0100\n"
+"PO-Revision-Date: 2009-12-14 15:31+0100\n"
"Last-Translator: Nicolau Gonçalves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/src/animationaddon/animationaddon.c new/compiz-plugins-extra-0.8.6/src/animationaddon/animationaddon.c
--- old/compiz-plugins-extra-0.8.4/src/animationaddon/animationaddon.c 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/src/animationaddon/animationaddon.c 2010-03-29 16:09:18.000000000 +0200
@@ -585,6 +585,7 @@
static void animFiniWindow(CompPlugin * p, CompWindow * w)
{
+ ANIMADDON_SCREEN (w->screen);
ANIMADDON_WINDOW (w);
// We need to interrupt and clean up the animation currently being played
@@ -607,6 +608,7 @@
}
free(aw);
+ w->base.privates[as->windowPrivateIndex].ptr = NULL;
}
static CompBool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/src/animationaddon/beamup.c new/compiz-plugins-extra-0.8.6/src/animationaddon/beamup.c
--- old/compiz-plugins-extra-0.8.4/src/animationaddon/beamup.c 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/src/animationaddon/beamup.c 2010-03-29 16:09:18.000000000 +0200
@@ -49,28 +49,22 @@
if (!aw->eng.numPs)
{
- aw->eng.ps = calloc(2, sizeof(ParticleSystem));
+ aw->eng.ps = calloc(1, sizeof(ParticleSystem));
if (!aw->eng.ps)
{
ad->animBaseFunctions->postAnimationCleanup (w);
return FALSE;
}
- aw->eng.numPs = 2;
+ aw->eng.numPs = 1;
}
int particles = WIN_W(w);
- initParticles(particles / 10, &aw->eng.ps[0]);
- initParticles(particles, &aw->eng.ps[1]);
- aw->eng.ps[1].slowdown = animGetF (w, ANIMADDON_SCREEN_OPTION_BEAMUP_SLOWDOWN);
- aw->eng.ps[1].darken = 0.5;
- aw->eng.ps[1].blendMode = GL_ONE;
-
- aw->eng.ps[0].slowdown =
- animGetF (w, ANIMADDON_SCREEN_OPTION_BEAMUP_SLOWDOWN) / 2.0;
- aw->eng.ps[0].darken = 0.0;
- aw->eng.ps[0].blendMode = GL_ONE_MINUS_SRC_ALPHA;
+ initParticles(particles, &aw->eng.ps[0]);
+ aw->eng.ps[0].slowdown = animGetF (w, ANIMADDON_SCREEN_OPTION_BEAMUP_SLOWDOWN);
+ aw->eng.ps[0].darken = 0.5;
+ aw->eng.ps[0].blendMode = GL_ONE;
if (!aw->eng.ps[0].tex)
glGenTextures(1, &aw->eng.ps[0].tex);
@@ -83,17 +77,6 @@
GL_RGBA, GL_UNSIGNED_BYTE, fireTex);
glBindTexture(GL_TEXTURE_2D, 0);
- if (!aw->eng.ps[1].tex)
- glGenTextures(1, &aw->eng.ps[1].tex);
- glBindTexture(GL_TEXTURE_2D, aw->eng.ps[1].tex);
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0,
- GL_RGBA, GL_UNSIGNED_BYTE, fireTex);
- glBindTexture(GL_TEXTURE_2D, 0);
-
return TRUE;
}
@@ -129,6 +112,10 @@
float partw = 2.5 * animGetF (w, ANIMADDON_SCREEN_OPTION_BEAMUP_SIZE);
+ // Limit max number of new particles created simultaneously
+ if (max_new > ps->numParticles)
+ max_new = ps->numParticles;
+
Particle *part = ps->particles;
int i;
for (i = 0; i < ps->numParticles && max_new > 0; i++, part++)
@@ -229,7 +216,7 @@
if (aw->com->animRemainingTime > 0 && aw->eng.numPs)
{
- fxBeamUpGenNewBeam(w, &aw->eng.ps[1],
+ fxBeamUpGenNewBeam(w, &aw->eng.ps[0],
WIN_X(w), WIN_Y(w) + (WIN_H(w) / 2), WIN_W(w),
creating ?
(1 - new / 2) * WIN_H(w) :
@@ -238,7 +225,7 @@
}
if (aw->com->animRemainingTime <= 0 && aw->eng.numPs
- && (aw->eng.ps[0].active || aw->eng.ps[1].active))
+ && aw->eng.ps[0].active)
aw->com->animRemainingTime = 0.001f;
if (!aw->eng.numPs || !aw->eng.ps)
@@ -254,19 +241,16 @@
return;
}
- aw->eng.ps[0].x = WIN_X(w);
- aw->eng.ps[0].y = WIN_Y(w);
-
if (aw->com->animRemainingTime > 0)
{
- int nParticles = aw->eng.ps[1].numParticles;
- Particle *part = aw->eng.ps[1].particles;
+ int nParticles = aw->eng.ps[0].numParticles;
+ Particle *part = aw->eng.ps[0].particles;
int i;
for (i = 0; i < nParticles; i++, part++)
part->xg = (part->x < part->xo) ? 1.0 : -1.0;
}
- aw->eng.ps[1].x = WIN_X(w);
- aw->eng.ps[1].y = WIN_Y(w);
+ aw->eng.ps[0].x = WIN_X(w);
+ aw->eng.ps[0].y = WIN_Y(w);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/src/animationaddon/burn.c new/compiz-plugins-extra-0.8.6/src/animationaddon/burn.c
--- old/compiz-plugins-extra-0.8.4/src/animationaddon/burn.c 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/src/animationaddon/burn.c 2010-03-29 16:09:18.000000000 +0200
@@ -134,6 +134,10 @@
float partw = animGetF (w, ANIMADDON_SCREEN_OPTION_FIRE_SIZE);
float parth = partw * 1.5;
+ // Limit max number of new particles created simultaneously
+ if (max_new > ps->numParticles / 5)
+ max_new = ps->numParticles / 5;
+
Particle *part = ps->particles;
int i;
for (i = 0; i < ps->numParticles && max_new > 0; i++, part++)
@@ -226,6 +230,10 @@
float partSize = animGetF (w, ANIMADDON_SCREEN_OPTION_FIRE_SIZE) * size * 5;
float sizeNeg = -size;
+ // Limit max number of new particles created simultaneously
+ if (max_new > ps->numParticles)
+ max_new = ps->numParticles;
+
Particle *part = ps->particles;
int i;
for (i = 0; i < ps->numParticles && max_new > 0; i++, part++)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/src/animationaddon/particle.c new/compiz-plugins-extra-0.8.6/src/animationaddon/particle.c
--- old/compiz-plugins-extra-0.8.4/src/animationaddon/particle.c 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/src/animationaddon/particle.c 2010-03-29 16:09:18.000000000 +0200
@@ -40,7 +40,7 @@
{
if (ps->particles)
free(ps->particles);
- ps->particles = calloc(numParticles, sizeof(Particle));
+ ps->particles = (Particle *) malloc (numParticles * sizeof (Particle));
ps->tex = 0;
ps->numParticles = numParticles;
ps->slowdown = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/compiz-plugins-extra-0.8.4/src/animationaddon/polygon.c new/compiz-plugins-extra-0.8.6/src/animationaddon/polygon.c
--- old/compiz-plugins-extra-0.8.4/src/animationaddon/polygon.c 2009-10-14 03:06:07.000000000 +0200
+++ new/compiz-plugins-extra-0.8.6/src/animationaddon/polygon.c 2010-03-29 16:09:18.000000000 +0200
@@ -2093,8 +2093,13 @@
CompWindow *w;
for (w = s->windows; w; w = w->next)
{
+ if (w->destroyed)
+ continue;
+
ANIMADDON_WINDOW (w);
- if (aw->com->animRemainingTime > 0 &&
+
+ if (aw && aw->com &&
+ aw->com->animRemainingTime > 0 &&
aw->eng.polygonSet &&
aw->eng.polygonSet->doDepthTest)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org