From 339a975f8d53708ed535362fd8da019707941fce Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 19 Mar 2002 15:34:31 +0000 Subject: Update xscreensaver and xscreensaver-gnome to 4.02. * Plugged a few minor leaks in `xscreensaver' and `xscreensaver-demo'. * New hacks, `cubenetic' and `fluidballs'. * Sped up `pipes'. * Fixed sphere projection error in `glplanet'; installed a better image of earth. * Added Win2K and MacOS 1 crashes to `bsod'. * Put back previous (better) version of `forest' that was accidentially downgraded in the last release. * New version of `bumps'. * Made FPS computation in GL hacks more efficient: it will influence the results less, thus resulting in higher (but more accurate) reported frame rates. --- x11/xscreensaver/patches/patch-aa | 10 ++-- x11/xscreensaver/patches/patch-ac | 27 ++++------- x11/xscreensaver/patches/patch-ad | 98 --------------------------------------- x11/xscreensaver/patches/patch-ae | 6 +-- x11/xscreensaver/patches/patch-af | 18 ------- 5 files changed, 17 insertions(+), 142 deletions(-) delete mode 100644 x11/xscreensaver/patches/patch-ad delete mode 100644 x11/xscreensaver/patches/patch-af (limited to 'x11/xscreensaver/patches') diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 40ef4598b11..eca2ba8417e 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.16 2002/03/01 06:46:50 fredb Exp $ +$NetBSD: patch-aa,v 1.17 2002/03/19 15:34:32 wiz Exp $ ---- configure.orig Sun Feb 24 03:56:28 2002 +--- configure.orig Tue Mar 19 00:42:35 2002 +++ configure -@@ -1544,7 +1544,7 @@ +@@ -1638,7 +1638,7 @@ # implement the "install-strip" target properly (strip executables, # but do not try to strip scripts.) # @@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.16 2002/03/01 06:46:50 fredb Exp $ # random libc stuff echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -@@ -7479,7 +7479,7 @@ +@@ -7584,7 +7584,7 @@ /*) echo $ac_n "checking for XML headers""... $ac_c" 1>&6 - echo "configure:7493: checking for XML headers" >&5 + echo "configure:7598: checking for XML headers" >&5 - d=$with_xml/include + d=$with_xml/include/gnome-xml if test -d $d; then diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 3592069879e..8dad6f5b5ed 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $ +$NetBSD: patch-ac,v 1.6 2002/03/19 15:34:32 wiz Exp $ ---- driver/Makefile.in.orig Sun Feb 24 03:56:29 2002 +--- driver/Makefile.in.orig Tue Mar 19 00:42:36 2002 +++ driver/Makefile.in @@ -433,10 +433,6 @@ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ @@ -13,10 +13,12 @@ $NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $ \ echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\ -@@ -448,16 +444,6 @@ +@@ -446,16 +442,6 @@ + then true ;\ + else \ lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)" ;\ - fi ;\ - \ +- fi ;\ +- \ - echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop ;\ - \ @@ -25,17 +27,6 @@ $NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ -- fi ;\ -- \ + fi ;\ + \ if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)" ;\ -@@ -762,7 +748,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 deleted file mode 100644 index c2cc25df35a..00000000000 --- a/x11/xscreensaver/patches/patch-ad +++ /dev/null @@ -1,98 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2002/03/14 01:02:29 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 --#include -+#include - #include - #include - #include -@@ -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; -@@ -693,8 +693,17 @@ - bp->dragging = 0; - bp->interactive = 0; - -- ftime(&(bp->last_iteration)); -- memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeb)); -+ { -+# ifdef GETTIMEOFDAY_TWO_ARGS -+ struct timezone tzp; -+ gettimeofday(&bp->last_iteration, &tzp); -+# else -+ gettimeofday(&bp->last_iteration); -+# endif -+ } -+ -+ memcpy(&bp->last_morph, &(bp->last_iteration), -+ sizeof(bp->last_morph)); - /* srand((unsigned int) bp->last_iteration.time); */ - - /* load the model files */ -@@ -871,7 +880,7 @@ - long morf_msec; - float iter_angle_max; - int i; -- struct timeb current_time; -+ struct timeval current_time; - int still_morphing; - - /* Do nothing to the model if we are paused */ -@@ -880,8 +889,15 @@ - usleep(1); - return; - } -- /* ftime is winDOS compatible */ -- ftime(¤t_time); -+ -+ { -+# ifdef GETTIMEOFDAY_TWO_ARGS -+ struct timezone tzp; -+ gettimeofday(¤t_time, &tzp); -+# else -+ gettimeofday(¤t_time); -+# endif -+ } - - /* Well, ftime gives time with millisecond resolution. - * if current time is exactly equal to last iteration, -@@ -892,18 +908,20 @@ - * it would be the same - * 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(bp->last_iteration)); - - /* 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(bp->last_morph)); - start_morph(RAND(bp->m_count), 0, bp); - } - diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae index 695b03dcd93..6bc92c40440 100644 --- a/x11/xscreensaver/patches/patch-ae +++ b/x11/xscreensaver/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.3 2001/02/08 05:57:53 fredb Exp $ +$NetBSD: patch-ae,v 1.4 2002/03/19 15:34:32 wiz Exp $ ---- driver/xscreensaver.kss.orig Wed Jan 31 19:06:02 2001 -+++ driver/xscreensaver.kss Wed Feb 7 23:31:02 2001 +--- driver/xscreensaver.kss.orig Thu Feb 1 02:06:02 2001 ++++ driver/xscreensaver.kss @@ -1,4 +1,4 @@ -#!/bin/bash - +#!/bin/sh - diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af deleted file mode 100644 index 96fedfb8229..00000000000 --- a/x11/xscreensaver/patches/patch-af +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-af,v 1.4 2002/03/14 01:02:29 wiz Exp $ - ---- hacks/screenhack.h.orig Sat Jan 20 05:28:31 2001 -+++ hacks/screenhack.h -@@ -1,4 +1,4 @@ --/* xscreensaver, Copyright (c) 1992-2001 Jamie Zawinski -+/* xscreensaver, Copyright (c) 1992-2002 Jamie Zawinski - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that -@@ -102,5 +102,7 @@ - #define bzero __ERROR_use_memset_not_bzero_in_xscreensaver__ - #undef bcopy - #define bcopy __ERROR_use_memcpy_not_bcopy_in_xscreensaver__ -+#undef ftime -+#define ftime __ERROR_use_gettimeofday_not_ftime_in_xscreensaver__ - - #endif /* __SCREENHACK_H__ */ -- cgit v1.2.3