pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xscreensaver Fix C99-isms.
details: https://anonhg.NetBSD.org/pkgsrc/rev/cfd14c0e4ee0
branches: trunk
changeset: 496953:cfd14c0e4ee0
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Sun Jul 17 17:39:57 2005 +0000
description:
Fix C99-isms.
diffstat:
x11/xscreensaver/distinfo | 3 +-
x11/xscreensaver/patches/patch-ai | 60 +++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletions(-)
diffs (78 lines):
diff -r 45c8fc38af83 -r cfd14c0e4ee0 x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Sun Jul 17 16:29:56 2005 +0000
+++ b/x11/xscreensaver/distinfo Sun Jul 17 17:39:57 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2005/07/12 09:43:06 wiz Exp $
+$NetBSD: distinfo,v 1.45 2005/07/17 17:39:57 kristerw Exp $
SHA1 (xscreensaver-4.22.tar.gz) = f40db41ef221f7ed42c39e77007ce05b4f846306
RMD160 (xscreensaver-4.22.tar.gz) = bf93e368d5e6f98ba383a908708a59f1a428aece
@@ -11,3 +11,4 @@
SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
SHA1 (patch-ah) = 0140ee63471e050b9f5962e8cda24ea1e047c21b
+SHA1 (patch-ai) = 16ed0c23367c79c04d2d89ffcbb260575b0d1e9f
diff -r 45c8fc38af83 -r cfd14c0e4ee0 x11/xscreensaver/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver/patches/patch-ai Sun Jul 17 17:39:57 2005 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-ai,v 1.1 2005/07/17 17:39:57 kristerw Exp $
+
+--- hacks/glx/antmaze.c.orig Sun Jul 17 19:21:59 2005
++++ hacks/glx/antmaze.c Sun Jul 17 19:28:25 2005
+@@ -975,6 +975,7 @@
+
+ /* fade out */
+ if(fadeoutspeed < -0.00001) {
++ GLfloat df[4];
+
+ if(fadeout <= 0.0) {
+ /* switch boards: rebuild old board, increment current */
+@@ -985,20 +986,27 @@
+
+ fadeout += fadeoutspeed;
+
+- GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
++ df[0] = 0.8*fadeout;
++ df[1] = 0.8*fadeout;
++ df[2] = 0.8*fadeout;
++ df[3] = 1.0;
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
+ glLightfv(GL_LIGHT1, GL_DIFFUSE, df);
+ }
+
+ /* fade in */
+ if(fadeoutspeed > 0.0001) {
++ GLfloat df[4];
+ fadeout += fadeoutspeed;
+ if(fadeout >= 1.0) {
+ fadeout = 1.0;
+ fadeoutspeed = 0.0;
+ entroducing = 12;
+ }
+- GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
++ df[0] = 0.8*fadeout;
++ df[1] = 0.8*fadeout;
++ df[2] = 0.8*fadeout;
++ df[3] = 1.0;
+ glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
+ glLightfv(GL_LIGHT1, GL_DIFFUSE, df);
+ }
+@@ -1159,7 +1167,7 @@
+ /* difference */
+ double dx = antpath[i][part[i]][0] - antposition[i][0];
+ double dz = - antpath[i][part[i]][1] + antposition[i][1];
+- double theta, ideal;
++ double theta, ideal, dt;
+
+ if(dz > EPSILON)
+ theta = atan(dz/dx);
+@@ -1171,7 +1179,7 @@
+ ideal += Pi;
+
+ /* compute correction */
+- double dt = sign(ideal) * min(fabs(ideal), PI/90.0);
++ dt = sign(ideal) * min(fabs(ideal), PI/90.0);
+ antdirection[i] += dt;
+ if(antdirection[i] > 2.0*PI)
+ antdirection[i] = 0.0;
Home |
Main Index |
Thread Index |
Old Index