diff options
Diffstat (limited to 'x11/xscreensaver/patches')
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 25 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ab | 6 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 13 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ad | 87 |
4 files changed, 106 insertions, 25 deletions
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index fd1bafdc7fd..6bf2f540251 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.14 2002/02/09 21:12:57 wiz Exp $ +$NetBSD: patch-aa,v 1.15 2002/02/24 21:42:56 wiz Exp $ ---- configure.orig Wed Jan 2 09:15:22 2002 +--- configure.orig Sun Feb 24 10:56:28 2002 +++ configure -@@ -1536,7 +1536,7 @@ +@@ -1544,7 +1544,7 @@ # implement the "install-strip" target properly (strip executables, # but do not try to strip scripts.) # @@ -11,22 +11,3 @@ $NetBSD: patch-aa,v 1.14 2002/02/09 21:12:57 wiz Exp $ # random libc stuff echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -@@ -3790,15 +3790,15 @@ - # there must be a better way than this... - if test -z "`echo $with_configdir | sed 's@^/.*@@'`" ; then - # absolute path -- CONFIGDIR=$with_configdir -+ HACK_CONF_DIR=$with_configdir - else - # relative path -- CONFIGDIR="\${exec_prefix}$with_configdir" -+ HACK_CONF_DIR="\${exec_prefix}$with_configdir" - fi - fi - - # canonicalize slashes. --CONFIGDIR=`echo "${CONFIGDIR}" | sed 's@/$@@;s@//*@/@g'` -+HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` - - - diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab index 82c96efcd9e..80f1d30490d 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2001/05/18 13:26:23 abs Exp $ +$NetBSD: patch-ab,v 1.9 2002/02/24 21:42:56 wiz Exp $ ---- hacks/Makefile.in.orig Fri May 18 13:27:34 2001 +--- hacks/Makefile.in.orig Sun Feb 24 10:56:29 2002 +++ hacks/Makefile.in -@@ -363,6 +363,12 @@ +@@ -428,6 +428,12 @@ .c.o: $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac new file mode 100644 index 00000000000..a82714d583e --- /dev/null +++ b/x11/xscreensaver/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2002/02/24 21:42:56 wiz Exp $ + +--- driver/Makefile.in.orig Sun Feb 24 18:19:18 2002 ++++ driver/Makefile.in +@@ -762,7 +762,7 @@ + + + xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ +- $(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@ ++ cp -p @PREFERRED_DEMO_PROGRAM@ $@ + + xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) + $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad new file mode 100644 index 00000000000..e1e10872cf3 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ad @@ -0,0 +1,87 @@ +$NetBSD: patch-ad,v 1.5 2002/02/24 21:42:57 wiz Exp $ + +--- hacks/glx/glsnake.c.orig Thu Feb 14 13:06:38 2002 ++++ hacks/glx/glsnake.c +@@ -65,7 +65,7 @@ + #ifdef USE_GL /* whole file */ + + #include <GL/glu.h> +-#include <sys/timeb.h> ++#include <sys/time.h> + #include <string.h> + #include <unistd.h> + #include <stdio.h> +@@ -98,8 +98,8 @@ + int is_legal; + int last_turn; + int selected; +- struct timeb last_iteration; +- struct timeb last_morph; ++ struct timeval last_iteration; ++ struct timeval last_morph; + int morphing; + nodeang_t node[24]; + GLfloat roty; +@@ -660,6 +660,7 @@ + #define RANDSIGN() ((random() & 1) ? 1 : -1) + + void glsnake_init(ModeInfo *mi) { ++ struct timezone localtimezone; + glsnake_configuration * bp; + int wire = MI_IS_WIREFRAME(mi); + +@@ -693,8 +694,8 @@ + bp->dragging = 0; + bp->interactive = 0; + +- ftime(&(bp->last_iteration)); +- memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeb)); ++ gettimeofday(&(bp->last_iteration), &localtimezone); ++ memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeval)); + /* srand((unsigned int) bp->last_iteration.time); */ + + /* load the model files */ +@@ -871,7 +872,8 @@ + long morf_msec; + float iter_angle_max; + int i; +- struct timeb current_time; ++ struct timeval current_time; ++ struct timezone localtimezone; + int still_morphing; + + /* Do nothing to the model if we are paused */ +@@ -881,7 +883,7 @@ + return; + } + /* ftime is winDOS compatible */ +- ftime(¤t_time); ++ gettimeofday(¤t_time, &localtimezone); + + /* <spiv> Well, ftime gives time with millisecond resolution. + * <Jaq> if current time is exactly equal to last iteration, +@@ -892,18 +894,18 @@ + * it would be the same + * <spiv> b) The code will divide by zero + */ +- iter_msec = (long) current_time.millitm - bp->last_iteration.millitm + +- ((long) current_time.time - bp->last_iteration.time) * 1000L; ++ iter_msec = ((long) current_time.tv_usec - bp->last_iteration.tv_usec)/1000L + ++ ((long) current_time.tv_sec - bp->last_iteration.tv_sec) * 1000L; + if (iter_msec) { + /* save the current time */ +- memcpy(&(bp->last_iteration), ¤t_time, sizeof(struct timeb)); ++ memcpy(&(bp->last_iteration), ¤t_time, sizeof(struct timeval)); + + /* work out if we have to switch models */ +- morf_msec = bp->last_iteration.millitm - bp->last_morph.millitm + +- ((long) (bp->last_iteration.time - bp->last_morph.time) * 1000L); ++ morf_msec = (bp->last_iteration.tv_usec - bp->last_morph.tv_usec)/1000L + ++ ((long) (bp->last_iteration.tv_sec - bp->last_morph.tv_sec) * 1000L); + + if ((morf_msec > statictime) && !bp->interactive) { +- memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeb)); ++ memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeval)); + start_morph(RAND(bp->m_count), 0, bp); + } + |