diff options
| author | kristerw <kristerw@pkgsrc.org> | 2005-07-17 17:39:57 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2005-07-17 17:39:57 +0000 |
| commit | b162fa49bbbf3d5bbef4ba8e22175b181e5f49a6 (patch) | |
| tree | 59c4f442efb6794b90fd1e2b397995df4e5eec94 /x11 | |
| parent | 7c0b1d2fb7b716688f1d915d4ba89f6c06b4183f (diff) | |
| download | pkgsrc-b162fa49bbbf3d5bbef4ba8e22175b181e5f49a6.tar.gz | |
Fix C99-isms.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/distinfo | 3 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ai | 60 |
2 files changed, 62 insertions, 1 deletions
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index cceb6f08cd8..d1c8c7c96a5 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -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-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 SHA1 (patch-ah) = 0140ee63471e050b9f5962e8cda24ea1e047c21b +SHA1 (patch-ai) = 16ed0c23367c79c04d2d89ffcbb260575b0d1e9f diff --git a/x11/xscreensaver/patches/patch-ai b/x11/xscreensaver/patches/patch-ai new file mode 100644 index 00000000000..c0782734865 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ai @@ -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; |