head 1.26; access; symbols pkgsrc-2021Q4:1.25.0.14 pkgsrc-2021Q4-base:1.25 pkgsrc-2021Q3:1.25.0.12 pkgsrc-2021Q3-base:1.25 pkgsrc-2021Q2:1.25.0.10 pkgsrc-2021Q2-base:1.25 pkgsrc-2021Q1:1.25.0.8 pkgsrc-2021Q1-base:1.25 pkgsrc-2020Q4:1.25.0.6 pkgsrc-2020Q4-base:1.25 pkgsrc-2020Q3:1.25.0.4 pkgsrc-2020Q3-base:1.25 pkgsrc-2020Q2:1.25.0.2 pkgsrc-2020Q2-base:1.25 pkgsrc-2020Q1:1.24.0.2 pkgsrc-2020Q1-base:1.24 pkgsrc-2019Q4:1.24.0.24 pkgsrc-2019Q4-base:1.24 pkgsrc-2019Q3:1.24.0.20 pkgsrc-2019Q3-base:1.24 pkgsrc-2019Q2:1.24.0.18 pkgsrc-2019Q2-base:1.24 pkgsrc-2019Q1:1.24.0.16 pkgsrc-2019Q1-base:1.24 pkgsrc-2018Q4:1.24.0.14 pkgsrc-2018Q4-base:1.24 pkgsrc-2018Q3:1.24.0.12 pkgsrc-2018Q3-base:1.24 pkgsrc-2018Q2:1.24.0.10 pkgsrc-2018Q2-base:1.24 pkgsrc-2018Q1:1.24.0.8 pkgsrc-2018Q1-base:1.24 pkgsrc-2017Q4:1.24.0.6 pkgsrc-2017Q4-base:1.24 pkgsrc-2017Q3:1.24.0.4 pkgsrc-2017Q3-base:1.24 pkgsrc-2017Q2:1.23.0.24 pkgsrc-2017Q2-base:1.23 pkgsrc-2017Q1:1.23.0.22 pkgsrc-2017Q1-base:1.23 pkgsrc-2016Q4:1.23.0.20 pkgsrc-2016Q4-base:1.23 pkgsrc-2016Q3:1.23.0.18 pkgsrc-2016Q3-base:1.23 pkgsrc-2016Q2:1.23.0.16 pkgsrc-2016Q2-base:1.23 pkgsrc-2016Q1:1.23.0.14 pkgsrc-2016Q1-base:1.23 pkgsrc-2015Q4:1.23.0.12 pkgsrc-2015Q4-base:1.23 pkgsrc-2015Q3:1.23.0.10 pkgsrc-2015Q3-base:1.23 pkgsrc-2015Q2:1.23.0.8 pkgsrc-2015Q2-base:1.23 pkgsrc-2015Q1:1.23.0.6 pkgsrc-2015Q1-base:1.23 pkgsrc-2014Q4:1.23.0.4 pkgsrc-2014Q4-base:1.23 pkgsrc-2014Q3:1.23.0.2 pkgsrc-2014Q3-base:1.23 pkgsrc-2014Q2:1.22.0.30 pkgsrc-2014Q2-base:1.22 pkgsrc-2014Q1:1.22.0.28 pkgsrc-2014Q1-base:1.22 pkgsrc-2013Q4:1.22.0.26 pkgsrc-2013Q4-base:1.22 pkgsrc-2013Q3:1.22.0.24 pkgsrc-2013Q3-base:1.22 pkgsrc-2013Q2:1.22.0.22 pkgsrc-2013Q2-base:1.22 pkgsrc-2013Q1:1.22.0.20 pkgsrc-2013Q1-base:1.22 pkgsrc-2012Q4:1.22.0.18 pkgsrc-2012Q4-base:1.22 pkgsrc-2012Q3:1.22.0.16 pkgsrc-2012Q3-base:1.22 pkgsrc-2012Q2:1.22.0.14 pkgsrc-2012Q2-base:1.22 pkgsrc-2012Q1:1.22.0.12 pkgsrc-2012Q1-base:1.22 pkgsrc-2011Q4:1.22.0.10 pkgsrc-2011Q4-base:1.22 pkgsrc-2011Q3:1.22.0.8 pkgsrc-2011Q3-base:1.22 pkgsrc-2011Q2:1.22.0.6 pkgsrc-2011Q2-base:1.22 pkgsrc-2011Q1:1.22.0.4 pkgsrc-2011Q1-base:1.22 pkgsrc-2010Q4:1.22.0.2 pkgsrc-2010Q4-base:1.22 pkgsrc-2010Q3:1.21.0.26 pkgsrc-2010Q3-base:1.21 pkgsrc-2010Q2:1.21.0.24 pkgsrc-2010Q2-base:1.21 pkgsrc-2010Q1:1.21.0.22 pkgsrc-2010Q1-base:1.21 pkgsrc-2009Q4:1.21.0.20 pkgsrc-2009Q4-base:1.21 pkgsrc-2009Q3:1.21.0.18 pkgsrc-2009Q3-base:1.21 pkgsrc-2009Q2:1.21.0.16 pkgsrc-2009Q2-base:1.21 pkgsrc-2009Q1:1.21.0.14 pkgsrc-2009Q1-base:1.21 pkgsrc-2008Q4:1.21.0.12 pkgsrc-2008Q4-base:1.21 pkgsrc-2008Q3:1.21.0.10 pkgsrc-2008Q3-base:1.21 cube-native-xorg:1.21.0.8 cube-native-xorg-base:1.21 pkgsrc-2008Q2:1.21.0.6 pkgsrc-2008Q2-base:1.21 cwrapper:1.21.0.4 pkgsrc-2008Q1:1.21.0.2 pkgsrc-2008Q1-base:1.21 pkgsrc-2007Q4:1.20.0.12 pkgsrc-2007Q4-base:1.20 pkgsrc-2007Q3:1.20.0.10 pkgsrc-2007Q3-base:1.20 pkgsrc-2007Q2:1.20.0.8 pkgsrc-2007Q2-base:1.20 pkgsrc-2007Q1:1.20.0.6 pkgsrc-2007Q1-base:1.20 pkgsrc-2006Q4:1.20.0.4 pkgsrc-2006Q4-base:1.20 pkgsrc-2006Q3:1.20.0.2 pkgsrc-2006Q3-base:1.20 pkgsrc-2006Q2:1.19.0.8 pkgsrc-2006Q2-base:1.19 pkgsrc-2006Q1:1.19.0.6 pkgsrc-2006Q1-base:1.19 pkgsrc-2005Q4:1.19.0.4 pkgsrc-2005Q4-base:1.19 pkgsrc-2005Q3:1.19.0.2 pkgsrc-2005Q3-base:1.19 pkgsrc-2005Q2:1.16.0.2 pkgsrc-2005Q2-base:1.16 pkgsrc-2005Q1:1.13.0.4 pkgsrc-2005Q1-base:1.13 pkgsrc-2004Q4:1.13.0.2 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.12.0.4 pkgsrc-2004Q3-base:1.12 pkgsrc-2004Q2:1.12.0.2 pkgsrc-2004Q2-base:1.12 pkgsrc-2004Q1:1.11.0.2 pkgsrc-2004Q1-base:1.11 pkgsrc-2003Q4:1.10.0.2 pkgsrc-2003Q4-base:1.10 netbsd-1-6-1:1.8.0.2 netbsd-1-6-1-base:1.8 buildlink2-base:1.7 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.26 date 2022.02.17.15.46.52; author wiz; state dead; branches; next 1.25; commitid pWIGSSCR4Z0WdZsD; 1.25 date 2020.04.03.20.49.16; author wiz; state Exp; branches; next 1.24; commitid 052pHRDcCVbQUY2C; 1.24 date 2017.08.16.07.33.39; author wiz; state Exp; branches; next 1.23; commitid muj4q2sUUzQ3pp3A; 1.23 date 2014.08.12.15.57.14; author hauke; state Exp; branches; next 1.22; commitid SRR1rCpVlrLnx5Mx; 1.22 date 2010.11.29.18.04.35; author drochner; state Exp; branches; next 1.21; 1.21 date 2008.03.10.12.37.12; author drochner; state Exp; branches; next 1.20; 1.20 date 2006.07.18.18.40.36; author wiz; state Exp; branches; next 1.19; 1.19 date 2005.09.18.23.26.01; author wiz; state Exp; branches; next 1.18; 1.18 date 2005.09.18.21.31.21; author jlam; state Exp; branches; next 1.17; 1.17 date 2005.06.28.10.03.14; author wiz; state Exp; branches; next 1.16; 1.16 date 2005.04.21.15.01.43; author wiz; state Exp; branches; next 1.15; 1.15 date 2005.04.04.09.14.45; author wiz; state Exp; branches; next 1.14; 1.14 date 2005.03.24.13.55.42; author wiz; state Exp; branches; next 1.13; 1.13 date 2004.09.27.14.19.44; author wiz; state Exp; branches; next 1.12; 1.12 date 2004.05.11.13.34.20; author wiz; state Exp; branches; next 1.11; 1.11 date 2003.12.13.19.22.13; author jmmv; state Exp; branches; next 1.10; 1.10 date 2003.11.14.15.25.16; author fredb; state Exp; branches; next 1.9; 1.9 date 2003.11.14.15.05.09; author fredb; state Exp; branches; next 1.8; 1.8 date 2002.10.28.22.37.11; author wiz; state Exp; branches; next 1.7; 1.7 date 2002.03.19.15.34.32; author wiz; state dead; branches; next 1.6; 1.6 date 2002.03.14.01.02.29; author wiz; state Exp; branches; next 1.5; 1.5 date 2002.02.24.21.42.57; author wiz; state Exp; branches; next 1.4; 1.4 date 2001.02.08.05.57.53; author fredb; state dead; branches; next 1.3; 1.3 date 2000.07.10.19.45.05; author tron; state Exp; branches; next 1.2; 1.2 date 2000.02.01.00.50.48; author wiz; state Exp; branches; next 1.1; 1.1 date 99.07.23.16.01.28; author frueauf; state Exp; branches; next ; desc @@ 1.26 log @xscreensaver: update to 6.02. Merge xscreensaver-demo into this package. 6.02 11-Oct-2021 New hacks, marbling and binaryhorizon. atlantis behaviors are more random and lifelike. headroom is now Mask Headroom. X11: fontglide skips fonts that can't display ASCII. X11: Use asterisks in the password dialog if the system fonts don't have bullets in them. X11: “Disable Screen Saver” was behaving like “Blank Screen Only”. Android: These hacks work now: antinspect, barcode, energystream, fliptext, fontglide, glsnake, raverhoop, starwars, unicrud. 6.01 09-Jun-2021 X11: Properly disable the server's built-in screen saver. X11: The passwdTimeout option was being ignored. X11: The display of the unlock thermometer was weird. X11: Fixed password entry on old-school multi-screen setups (:0.1). X11: Worked around a KDE 5 compositor bug that caused the desktop to momentarily become visible when cycling. X11: Fixed possible high CPU usage in xscreensaver-systemd. X11: Fixed some spurious warnings in xscreensaver-text. X11: Warn when Wayland is in use, since it makes both screen saving and locking impossible. 6.00 01-Apr-2021 X11: Major refactor of the xscreensaver daemon for improved security, dividing it into three programs: xscreensaver, xscreensaver-gfx and xscreensaver-auth. X11: Dropped support for systems older than X11R7 (2009). X11: Renamed xscreensaver-demo to xscreensaver-settings. X11: Unlock dialog has user-selectable color schemes. X11: Everything uses XFreeType for fonts now. X11: Install a few custom fonts needed by some savers. X11: Fading works on systems without gamma (e.g. Raspberry Pi). X11: Use EGL instead of GLX when available. X11: xscreensaver-systemd now detects when a video player has inhibited screen blanking and then exits without uninhibiting. Improved GLSL and GLES3 support: Phong shading in etruscanvenus, hypertorus, klein, projectiveplane,`romanboy' and sphereeversion. Updates to cubicgrid. macOS: Added a Random XScreenSaver screen saver, which implements cycle mode, among other things. iOS: Also added cycle mode. @ text @$NetBSD: patch-ad,v 1.25 2020/04/03 20:49:16 wiz Exp $ Do not unconditionally install xscreensaver-demo nor GNOME files. --- driver/Makefile.in.orig 2020-03-21 01:40:19.000000000 +0000 +++ driver/Makefile.in @@@@ -233,7 +233,7 @@@@ SCRIPTS = $(SCRIPTS_1) @@SCRIPTS_OSX@@ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ xscreensaver.h prefs.h remote.h exec.h \ demo-Gtk-conf.h auth.h mlstring.h types.h -MEN_1 = xscreensaver.man xscreensaver-demo.man \ +MEN_1 = xscreensaver.man \ xscreensaver-command.man \ xscreensaver-text.man \ xscreensaver-getimage.man \ @@@@ -265,7 +265,7 @@@@ all: $(EXES) $(EXES2) tests: $(TEST_EXES) install: install-program install-ad install-scripts \ - install-gnome install-man install-xml install-pam + install-gnome install-man install-xml uninstall: uninstall-program uninstall-ad \ uninstall-gnome uninstall-man uninstall-xml @@@@ -300,7 +300,7 @@@@ install-program: $(EXES) fi ; \ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver - @@for exe in xscreensaver-command xscreensaver-demo \ + @@for exe in xscreensaver-command \ xscreensaver-getimage @@EXES_OSX@@ @@EXES_SYSTEMD@@ ; do \ echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ @@@@ -499,7 +499,7 @@@@ install-pam: xscreensaver.pam # screensaver-properties.desktop # into /usr/share/applications/ -install-gnome:: screensaver-properties.desktop +xxxinstall-gnome:: screensaver-properties.desktop @@if [ "$(GTK_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ @ 1.25 log @xscreensaver*: update to 5.44 New hacks, New hacks, Gibson, EtruscanVenus and Scooter. BSOD supports Tivo and Nintendo. New color options in RomanBoy, ProjectivePlane, Hypertorus and Klein. "Use random screen saver" works again on macOS 10.15. iOS supports dark mode. Image loading works again on iOS 13. Fixed rotation on iOS 13 (Apple incompatibly breaks rotation every two years as a matter of policy). Performance tweaks for Eruption, Fireworkx, Halftone, Halo, Moire2 and RD-Bomb. Various bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.24 2017/08/16 07:33:39 wiz Exp $ @ 1.24 log @Updated xscreensaver to 5.37. Most patches merged upstream. 5.37 05-Jul-2017 New hack, vigilance. Added Mac Software Update and VMware to bsod. OSX: Grabbing the desktop works again. OSX: Pinch to zoom. Android: Both Daydreams and Live Wallpapers are implemented. Updated webcollage for recent changes. Various bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.23 2014/08/12 15:57:14 hauke Exp $ d5 1 a5 1 --- driver/Makefile.in.orig 2017-07-05 17:52:56.000000000 +0000 d7 1 a7 1 @@@@ -226,7 +226,7 @@@@ SCRIPTS = $(SCRIPTS_1) @@SCRIPTS_OSX@@ d16 1 a16 1 @@@@ -257,7 +257,7 @@@@ all: $(EXES) $(EXES2) d25 1 a25 1 @@@@ -292,7 +292,7 @@@@ install-program: $(EXES) d31 1 a31 1 xscreensaver-getimage @@EXES_OSX@@ ; do \ d34 1 a34 1 @@@@ -491,7 +491,7 @@@@ install-pam: xscreensaver.pam @ 1.23 log @Update x11/xscreensaver to 5.29. From the changelog: 5.29 * Downgraded to Xcode 5.0.2 to make it possible to build savers that will still run on 10.6 and 10.7. Sigh. * Updated `webcollage' for recent changes. 5.28 * Fixed some compilation problems and intermittent crashes. * Turned off the OSX 10.6 enable_gc hack. It didn't work. 5.27 * New hacks, `tessellimage' and `projectiveplane'. * Added support for pthreads, because Dave Odell is a madman. * Updated `webcollage' for recent changes. * Minor iOS tweaks to the `analogtv' hacks. * X11: Don't assume Suspend = 0 implies "No DPMS". * Minor updates to `boxed' and `klein'. * Fixed possible crash in `apple2', `noseguy', `xmatrix', `shadebobs'. * Fixed possible crash in OSX preferences. * OSX Performance improvements. * Plugged some leaks. 5.26 * More auto-updater tweaks. 5.25 * Try harder to bypass Quarrantine and Gatekeeper in OSX installer. * Some files were missing from the tarball. 5.24 * Added "Automatically check for updates" option on OSX. * Updated feed-loading for recent Flickr changes. * Updated `webcollage' for recent Google changes. * Added Instagram and Bing as `webcollage' image sources. * Updated to latest autoconf. * Bug fixes. 5.23 * New hack, `geodesic'. * iOS and OSX: huge XCopyArea performance improvements. * More heuristics for using RSS feeds as image sources. * Improved Wikipedia parser. * Updated `webcollage' for recent Flickr changes. * Added Android to `bsod'. * OSX: Added a real installer. * iOS and OSX: fixed a font-metrics bug. * iOS: Fixed aspect ratio bug in non-rotating apps when launched in landscape mode. * Made `quasicrystal' work on weak graphics cards. * iOS: fixed `ifs'. * Better compression on icons, plists and XML files: smaller distribution and installation footprint. * Reverted that DEACTIVATE change. Bad idea. * `Phosphor' now supports amber as well as green. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 --- driver/Makefile.in.orig 2014-06-08 21:43:53.000000000 +0000 a6 9 @@@@ -205,7 +205,7 @@@@ PDF2JPEG_LIBS = -framework Cocoa SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @@SAVER_LIBS@@ \ $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ - $(PASSWD_LIBS) + $(PASSWD_LIBS) $(INTL_LIBS) CMD_LIBS = $(LIBS) $(X_LIBS) \ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) d30 1 a30 1 + @@for exe in xscreensaver-command \ @ 1.22 log @update to 5.12 changes: -New molecule in molecule -glhanoi now supports an arbitrary number of poles -Turned on ``New Login'' button by default -Added support for XInput-style alternate input devices -OSX-specific fixes @ text @d3 1 a3 1 --- driver/Makefile.in.orig 2010-09-15 10:10:53.000000000 +0000 d5 1 a5 1 @@@@ -207,7 +207,7 @@@@ PDF2JPEG_LIBS = -framework Cocoa d14 2 a15 1 @@@@ -229,7 +229,7 @@@@ HDRS = XScreenSaver_ad.h XScreenSaver_X a16 1 demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \ d23 1 a23 1 @@@@ -260,7 +260,7 @@@@ all: $(EXES) $(EXES2) d32 1 a32 1 @@@@ -295,7 +295,7 @@@@ install-program: $(EXES) d41 1 a41 1 @@@@ -494,7 +494,7 @@@@ install-pam: @ 1.21 log @update xscreensaver to 5.05 changes: -added, updated and improved hacks -bugfixes -Reworked PAM code to support fingerprint readers, etc. -Minor tweaks for compilation on MacOS 10.5.0 @ text @d3 1 a3 1 --- driver/Makefile.in.orig 2008-03-02 06:34:46.000000000 +0100 d5 10 a14 1 @@@@ -227,7 +227,7 @@@@ HDRS = XScreenSaver_ad.h XScreenSaver_X d23 1 a23 1 @@@@ -258,7 +258,7 @@@@ all: $(EXES) $(EXES2) d32 1 a32 1 @@@@ -293,7 +293,7 @@@@ install-program: $(EXES) d41 1 a41 1 @@@@ -492,7 +492,7 @@@@ install-pam: @ 1.20 log @Update to 5.00: Changes since 4.24: * Ported to MacOS X! (10.4.0 or newer) * API change: instead of providing a single screenhack() function that does not return, screen savers using the screenhack.h framework must now provide "init" and "draw one frame" functions instead. All bundled savers have been updated; third-party patches will need work. * All image-loading happens asynchronously. * xscreensaver-getimage-file caches the contents of the image directory for a few hours, so consecutive runs won't have to re-list the whole directory tree. * New hacks, `topblock' and `glschool'. * Removed `xteevee' (superceded by `xanalogtv'). * Added variable-sized puzzle pieces to `jigsaw'. * Changes to the defaults and command-line options of many hacks to make the .xml files more consistent. * Reap zombies in `glslideshow' and `carousel'. * `sonar' works without setuid on OSX (dgram icmp). * `xmatrix -mode pipe' displays the text of a subprocess. * `endgame' has higher resolution chess-piece models. * `webcollage' takes a -directory option to get images from a local directory. Changes since 4.23: * New versions of `cube21', `glsnake', `celtic'. * Backed out a DPMS-related patch that cause desktop flickering with some X servers. * Fixed startup crash in getgroups() when running setuid. * Default to not displaying stderr on the saver window. * Fixed bad free() in "Documentation" button. * Don't try to run hacks that aren't installed. * Minor fixes to various XML config files and man pages. Changes since 4.22: * New hacks, `glhanoi', `cube21', `timetunnel', `juggler3d', and `celtic'. * New versions of `tangram', `webcollage', `hypertorus', `polytopes', and `ripples'. * `sonar' is now quiet about unresolvable hosts. * Minor corrections to BASIC code in `apple2'. * Don't install `ant' by default, since there is some Java tool of that name, which was causing confusion. And also it's boring. * Made screen grabbing work again on MacOS 10.4.2. * No longer prints bogus warnings about ClientMessages intended for the window manager. * Ignore unprintable characters in passwd entry field. * Fixed yet another cross-host-display image-loading endian problem. * `xscreensaver-command -watch' and `-time' now work on 64-bit machines. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $ d3 1 a3 1 --- driver/Makefile.in.orig 2006-05-23 23:01:35.000000000 +0000 d5 1 a5 1 @@@@ -226,7 +226,7 @@@@ HDRS = XScreenSaver_ad.h XScreenSaver_X d8 1 a8 1 demo-Gtk-conf.h d14 1 a14 1 @@@@ -257,7 +257,7 @@@@ all: $(EXES) $(EXES2) d23 1 a23 1 @@@@ -292,7 +292,7 @@@@ install-program: $(EXES) d32 1 a32 1 @@@@ -489,7 +489,7 @@@@ install-pam: a40 18 @@@@ -521,7 +521,7 @@@@ install-gnome:: $(LOGO) # ../utils/images/screensaver-*.png # into /usr/share/xscreensaver/glade/ install-gnome:: - @@if [ "$(GTK_GLADEDIR)" != "" ]; then \ + @@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@@@ -538,7 +538,7 @@@@ install-gnome:: # xscreensaver-demo.glade2 # into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 - @@if [ "$(GTK_GLADEDIR)" != "" ]; then \ + @@if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @ 1.19 log @Remove USE_PKGLOCALEDIR-introduced chunk. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.18 2005/09/18 21:31:21 jlam Exp $ d3 1 a3 1 --- driver/Makefile.in.orig 2005-06-23 01:02:23.000000000 +0000 d5 2 a6 2 @@@@ -222,7 +222,7 @@@@ HDRS = XScreenSaver_ad.h XScreenSaver_X xscreensaver.h prefs.h remote.h \ d14 1 a14 1 @@@@ -253,7 +253,7 @@@@ all: $(EXES) $(EXES2) d23 1 a23 1 @@@@ -288,7 +288,7 @@@@ install-program: $(EXES) d32 1 a32 1 @@@@ -482,7 +482,7 @@@@ install-pam: d41 1 a41 1 @@@@ -514,7 +514,7 @@@@ install-gnome:: $(LOGO) d50 1 a50 1 @@@@ -531,7 +531,7 @@@@ install-gnome:: @ 1.18 log @Add "pam" PKG_OPTION to x11/xscreensaver. Addresses part of PR pkg/31338. Bump the PKGREVISION of x11/xscreensaver to 2. @ text @d1 1 a1 1 $NetBSD$ a4 9 @@@@ -15,7 +15,7 @@@@ prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ bindir = @@bindir@@ datadir = @@datadir@@ -localedir = $(datadir)/locale +localedir = /usr/pkg/share/locale mandir = @@mandir@@ libexecdir = @@libexecdir@@ mansuffix = 1 @ 1.17 log @Update to 4.22: Changes since 4.21: * Fixed a bug in the new mouse-motion code that caused the screen to never blank on multi-head non-Xinerama systems. Oops. * New hacks, `interaggregate', `antmaze', `tangram', and `crackberg'. * Minor tweaks to `fiberlamp', `ifs', `slidescreen', `zoom', `sonar', `fireworkx', `whirlwindwarp', `bubble3d', and `rd-bomb'. * Added motion blur to `blinkbox'. * `bsod' now includes Longhorn's "RSOD", and OS/2. * Fixed `-wireframe' usage in most hacks and man pages. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ d3 1 a3 1 --- driver/Makefile.in.orig 2005-06-23 03:02:23.000000000 +0200 d5 9 d23 9 @ 1.16 log @Install xscreensaver-demo man page with xscreensaver-demo package, not with xscreeensaver package. Bump PKGREVISION for both. Patch from Kouichirou Hiratsuka. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.15 2005/04/04 09:14:45 wiz Exp $ d3 3 a5 3 --- driver/Makefile.in.orig 2005-03-21 16:18:18.000000000 +0900 +++ driver/Makefile.in 2005-04-20 17:28:14.000000000 +0900 @@@@ -222,7 +222,7 @@@@ d14 1 a14 1 @@@@ -288,7 +288,7 @@@@ d23 1 a23 1 @@@@ -464,7 +464,7 @@@@ d32 1 a32 1 @@@@ -496,7 +496,7 @@@@ d41 1 a41 1 @@@@ -513,7 +513,7 @@@@ @ 1.15 log @Avoid installing files to /xscreensaver. Patch from Kouichirou Hiratsuka (thanks!). If you installed xscreensaver after 4.21, ``rm -r /xscreensaver''. Sorry. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.14 2005/03/24 13:55:42 wiz Exp $ d4 10 a13 1 +++ driver/Makefile.in 2005-04-03 20:09:35.000000000 +0900 @ 1.14 log @Update to 4.21: Changes since 4.20: * New hack: `fliptext'. * Changed default configure installation directories: /usr/bin/ for xscreensaver, etc.; /usr/libexec/xscreensaver/ for hacks; /usr/share/xscreensaver/config/ for xml files. * All the text-manipulating screen savers can have their text source configured via `xscreensaver-demo' now. * xscreensaver.spec now builds three RPMs: base (no hacks); extras (2d hacks); and gl-extras. * Added `-program' and `-front' option to `gltext'. * Added `-shells' to `molecule'. * Fixed text-alpha glitch in `carousel'. * New `pacman': the ghosts can be killed now. * Fixed a bug in screen-grabbing GL hacks where images would be tiled instead of scaled on machines that can't do large textures. * `webcollage' can hit Flickr now. * New (rewritten) implementation of `ifs'. * The unlock dialog can be made to have a "New Login" button that will run `gdmflexiserver'. Experimental! * Fixed non-ASCII display bug in `starwars'. * Configure finds a default for imageDirectory. * "xscreensaver-command -lock" now works even if in "screensaver disabled" mode. * If a bad password is typed while CapsLock is on, the unlock dialog says "CapsLock?" instead of "Sorry". * Mouse motion only counts as activity if the mouse moved more than 10 pixels (so the screen won't unblank every time you bump your desk.) * New mode option "random-same": if you have multiple monitors, this will run the *same* randomly chosen hack on each screen, instead of different ones on each. Changes since 4.19: * New hacks, `fiberlamp', `boing', `boxfit', and `carousel'. * Rewrote `glslideshow' again: should be faster now. * Sped up loading of images in GL programs. * `starwars' uses texture-mapped fonts now. * New `bsod' modes: tru64, hppa, and nvidia. * Updates to `webcollage', `juggle', `pinion', `fireworkx', `sonar', `extrusion', `substrate', and `pong'. Changes since 4.18: * New hacks, `substrate', `intermomentary', `fireworkx', and `pinion'. * New version of `flow'. * Made /proc/interrupts work again on Linux 2.6. * Made `analogtv' not hog the CPU. * Made analogtv-based hacks work properly on PPC/ARM. * Fixed a bad memory leak in `piecewise'. * Minor updates to `sonar', `molecule', `glmatrix', `galaxy', and `webcollage'. * Removed support for GTK 1.x (everyone uses 2.x now.) @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.13 2004/09/27 14:19:44 wiz Exp $ d3 3 a5 3 --- driver/Makefile.in.orig 2005-03-21 08:18:18.000000000 +0100 +++ driver/Makefile.in @@@@ -288,7 +288,7 @@@@ install-program: $(EXES) d14 1 a14 1 @@@@ -464,7 +464,7 @@@@ install-pam: d23 18 @ 1.13 log @Update xscreensaver to 4.18: 4.18 14-Aug-2004 * Oops, pay no attention to the man behind the curtain. 4.17 14-Aug-2004 * New hacks, anemotaxis and memscroller. * Fixed a bad bug that caused vidwhacker to never die. * Fixed normals and lighting in polyhedra. * Don't reuse the window when changing hacks (to work around bugs in some GL implementations.) * Made xscreensaver-getimage-file skip thumbnail-sized images. * Fixed endian problem in barcode on non-x86. * Updates to webcollage, apple2, fuzzyflakes, atunnel, and pacman. * Timing tweaks to bubble3d, bouncingcow, engine, gltext, lavalite, molecule, spotlight, sballs, boxed, blinkbox, and circuit. * Configure updates for Fedora core 2 / xorg 6.7.0. * Compile without warnings under gcc 3.3.3. * I give up: don't blank or lock the screen if we can't get a keyboard grab. In that case, both choices are bad. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- driver/Makefile.in.orig 2004-08-15 00:22:38.000000000 +0200 d5 1 a5 1 @@@@ -292,7 +292,7 @@@@ install-program: $(EXES) d14 1 a14 3 @@@@ -467,7 +467,7 @@@@ install-pam: fi ; \ fi d16 2 d20 3 a22 49 @@lost="" ;\ if [ "$(GNOME_DATADIR)" != "" ]; then \ \ @@@@ -475,10 +475,6 @@@@ install-gnome:: screensaver-properties.d echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ fi ;\ - if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ - fi ;\ if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ @@@@ -499,16 +495,6 @@@@ install-gnome:: screensaver-properties.d fi ;\ \ echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ - \ - if $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ - then true ;\ - else \ - lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ - fi ;\ - \ - echo $(INSTALL_DATA) screensaver-properties.desktop \ $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ \ if $(INSTALL_DATA) screensaver-properties.desktop \ @@@@ -542,7 +528,7 @@@@ install-gnome:: screensaver-properties.d fi ;\ fi -install-gnome:: screensaver-properties-capplet +xxxinstall-gnome:: screensaver-properties-capplet @@if [ "$(GNOME_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ @@@@ -641,8 +627,6 @@@@ uninstall-gnome:: f=screensaver-properties.desktop ;\ echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ echo rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ @ 1.12 log @Update to 4.15: * New hacks, `wormhole', `mismunch', `noof', and `pacman'. * `phosphor' and `apple2' include vt100 emulators now: this means you can do "phosphor -program top", or can use either program as an xterm replacement: "apple2 -text -fast -program 'xemacs -nw'". * `analogtv' (and related) fill the screen better. * The '-gradient' option works in `atlantis' now. * Minor updates to `blinkbox', `queens', `endgame', `glmatrix', `mirrorblob', `blocktube', and `molecule'. * Integrated SuSE's "external passwd helper" support. * Marginally better /tmp handling in various programs. * Updated config defaults for xplanet 1.0.3. * Portability fixes. @ text @d3 1 a3 1 --- driver/Makefile.in.orig 2004-02-27 02:37:56.000000000 +0100 d5 1 a5 1 @@@@ -290,7 +290,7 @@@@ install-program: $(EXES) d14 1 a14 1 @@@@ -465,7 +465,7 @@@@ install-pam: d23 1 a23 1 @@@@ -473,10 +473,6 @@@@ install-gnome:: screensaver-properties.d d34 1 a34 1 @@@@ -497,16 +493,6 @@@@ install-gnome:: screensaver-properties.d d51 1 a51 1 @@@@ -540,7 +526,7 @@@@ install-gnome:: screensaver-properties.d d60 1 a60 1 @@@@ -639,8 +625,6 @@@@ uninstall-gnome:: @ 1.11 log @Update to 4.14. While here, change xscreensaver to not install the xscreensaver-demo program (which requires GTK). This is done to allow xscreensaver coexist with xscreensaver-gnome, and to avoid a dependancy on GTK when installing kdeartwork3. Changes since 4.13: * New hacks, `fontglide', `apple2', `xanalogtv', `pong', `gleidescope', `mirrorblob', and `blinkbox'. * New version of `glsnake' (with many more models.) * Another Windows crash in `bsod'; also HVX/GCOS6/TPS6. * New version of `endgame'. * Screen grabbing works on MacOS X. * Various minor fixes. Ok'ed by wiz@@. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $ d3 1 a3 1 --- driver/Makefile.in.orig 2003-10-25 09:47:19.000000000 +0200 d5 1 a5 1 @@@@ -287,7 +287,7 @@@@ install-program: $(EXES) d14 1 a14 1 @@@@ -462,7 +462,7 @@@@ install-pam: d23 1 a23 1 @@@@ -470,10 +470,6 @@@@ install-gnome:: screensaver-properties.d d34 1 a34 1 @@@@ -494,16 +490,6 @@@@ install-gnome:: screensaver-properties.d d51 1 a51 1 @@@@ -537,7 +523,7 @@@@ install-gnome:: screensaver-properties.d d60 1 a60 1 @@@@ -636,8 +622,6 @@@@ uninstall-gnome:: @ 1.10 log @Excise "mkpatches" vs. USE_PKGLOCALEDIR fallout (caught by Thomas Klausner). @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.9 2003/11/14 15:05:09 fredb Exp $ d3 1 a3 1 --- driver/Makefile.in.orig 2003-09-07 19:00:00.000000000 -0500 d5 10 a14 1 @@@@ -456,7 +456,7 @@@@ install-pam: d23 1 a23 1 @@@@ -464,10 +464,6 @@@@ install-gnome:: screensaver-properties.d d34 1 a34 1 @@@@ -488,16 +484,6 @@@@ install-gnome:: screensaver-properties.d d51 1 a51 1 @@@@ -531,7 +517,7 @@@@ install-gnome:: screensaver-properties.d d60 1 a60 1 @@@@ -630,8 +616,6 @@@@ uninstall-gnome:: @ 1.9 log @Make the gnome1 control-center applet work again: - The demo now needs --crapplet to run properly in the control-center (undoubtedly, short for "control-center applet"). ;-) - There's no need to haphazardly install the gnome2 applet into the gnome1 directories, as the package gnome2 control-center will presumably use the directories designated for it. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.8 2002/10/28 22:37:11 wiz Exp $ a4 18 @@@@ -16,7 +16,7 @@@@ exec_prefix = @@exec_prefix@@ bindir = @@bindir@@ #datadir = @@datadir@@ datadir = $(GNOME_DATADIR) -localedir = $(datadir)/locale +localedir = /usr/X11R6/share/locale mandir = @@mandir@@ mansuffix = 1 manNdir = $(mandir)/man$(mansuffix) @@@@ -39,7 +39,7 @@@@ CC = @@CC@@ CFLAGS = @@CFLAGS@@ LDFLAGS = @@LDFLAGS@@ DEFS = @@DEFS@@ -INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" +INTL_DEFS = -DLOCALEDIR="\"/usr/X11R6/share/locale\"" SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@@HACKDIR@@"' GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GLADE_DATADIR)"' CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' @ 1.8 log @Update to 4.06. Changes since 4.05: * New hack, `glblur' (disabled by default, since it requires fast OpenGL texture support.) * New hack, `halftone'. * Updates to `endgame', `queens', `bumps', `glplanet', `engine', and `circuit'. * New version of `menger' that uses far fewer polygons. * Fixed minor bug in `critical' that could cause some bogus X servers to crash. * Better labels in `molecule': the labels now appear to be attached to the atoms, instead of floating in front of the whole scene. * Fixed bug that could rarely cause GL hacks to fail to double-buffer (causing intermittent flickering.) * Fixed a relative-URL-parsing bug in `webcollage'. * Fixed a bug that (sometimes) caused the window manager close box to kill `xscreensaver-demo' with a crash instead of a graceful exit. * Updated xscreensaver.pam to the Red Hat 7.3 way. * More Gnome2-related configure crap. * Updated to latest `config.guess' and `config.sub'. * Fixed occasional core dump in `distort'. * Added a Linux fsck failure and kernel panic to `bsod'. * Added MacOS X kernel panic to `bsod'. * Fixed a bug in `bsod' (all bsod bugs are ironic.) * Fixed a bug that caused `xscreensaver-gl-helper' to print a nonsense visual ID with some versions of `printf': this could cause GL programs to display incorrectly (e.g., flickery.) Changes since 4.04: * More `configure' tweaks to try and get things working on systems that both Gtk 1.x and 2.x installed. * New hack, `endgame'. * Minor updates to `gltext'. Changes since 4.03: * Support for GTK 2.x / GNOME 2.x. * The `configure' script will now use `pkg-config' if you have it, in preference to `gtk-config', etc. * New hacks, `lavalite', `queens', and `anemone'. * Minor updates to `spheremonics', `gltext', `xmatrix'. * You can use the mouse to manually spin most of the GL hacks now (when they are displaying in a window.) * Fixed a bug in `webcollage' (due to recent Alta Vista url changes) that was causing it to try and load incorrect image URLs. * Made `xscreensaver-getimage' use gdk_pixbuf if it is available: this means that those hacks that load images will no longer rely on "xv", "xloadimage", etc. This will close a race condition that could sometimes cause your desktop background to be changed; and also makes it possible for those programs to operate on image files when running in windowed mode. * `webcollage' can now be used in conjunction with `driftnet' to display images snooped from your local ethernet instead of obtained from search engines. * Added man pages for all the hacks that didn't have them. Changes since 4.02: * New hack, `spheremonics'. * Minor updates to `webcollage', `cage', `moebius', `morph3d', `boxed', `circuit', and `helix'. * `pulsar' and `extrusion' can now load texture JPEGs. * `rubik' now does non-square cubes. * `fluidballs' now does various sizes of balls. * `menger' and `sierpinski3d' now also show polygon counts in -fps mode. * `molecule' displays real subscripts in the formulae. * GTK internationalization/localization support. * Better detection of the various versions of libxml. * Upgraded to autoconf 2.53 (from 2.13.) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- driver/Makefile.in.orig Fri Oct 25 23:20:06 2002 d5 19 a23 1 @@@@ -452,7 +452,7 @@@@ install-pam: d32 29 a60 1 @@@@ -527,7 +527,7 @@@@ install-gnome:: screensaver-properties.d d69 9 @ 1.7 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2002/03/14 01:02:29 wiz Exp $ d3 20 a22 96 --- 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); } @ 1.6 log @Use marginally different "official" diffs for glsnake compilation problem provided by Jamie Zawinski. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update xscreensaver to 4.01. Changes since 4.00: * New hacks: `twang', `glsnake', `boxed', `sballs', and `glforestfire'. * New hacks `apollonian', `euler2d', `juggle', `polyominoes' and `thornbird', from xlockmore. * Merged recent xlockmore changes into `ant', `braid', `demon', `discrete', `drift', `fadeplot', `forest', `grav', `hopalong', `ifs', `laser', `lightning', `lisa', `lissie', `loop', `mountain', `penrose', `rotor', `sierpinski', `slip', `sphere', `spiral', `strange', and `vines'. * Fixed the `gltext' bug that sometimes caused horizontal lines to vanish again. This time for sure. * Sped up `webcollage' by adding a C helper program to replace the PPM pipeline. It also pastes images semi-transparently now. * Added support for the gdk_pixbuf library: if this lib is available, then `blitspin', `xflame', and `flag' can load GIF, JPEG, and PNG images in addition to XPM and XBM. [not enabled in pkg] * Fixed a rare race condition where the desktop-grabbing hacks could sometimes leave the screen wedged, if the user moved the mouse exactly when they were grabbing the screen image (it would un-wedge the next time the saver timed out or was activated.) * Fixed incorrect colors in the screen-grabbing GL hacks (`gflux' and `flipscreen3d'.) * Made SIGHUP restart the daemon process (though using `xscreensaver-command -restart' is still the preferred way.) * Tweaks to `xspirograph'. * Minor configure and portability tweaks. @ text @d25 1 a25 9 @@@@ -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 @@@@ d31 11 a41 2 + gettimeofday(&(bp->last_iteration), &localtimezone); + memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeval)); d45 1 a45 1 @@@@ -871,7 +872,8 @@@@ a50 1 + struct timezone localtimezone; d54 2 a55 1 @@@@ -881,7 +883,7 @@@@ d58 1 a58 1 /* ftime is winDOS compatible */ d60 9 a68 1 + gettimeofday(¤t_time, &localtimezone); d72 1 a72 1 @@@@ -892,18 +894,18 @@@@ d83 2 a84 1 + memcpy(&(bp->last_iteration), ¤t_time, sizeof(struct timeval)); d94 2 a95 1 + memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeval)); @ 1.4 log @Update to 3.28 -- new "hacks", bug fixes, configure updates for XFree86-4 and *BSD (allows to simplify the package somewhat), and revamped Screensaver Options: xscreensaver now lets you configure your DPMS settings. More detail on the web page -- http://www.jwz.org/xscreensaver/changelog.html [The README in the package currently only goes to 3.27.] @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2000/07/10 19:45:05 tron Exp $ d3 4 a6 5 --- hacks/webcollage.orig Thu Dec 9 12:47:14 1999 +++ hacks/webcollage Mon Jan 31 02:10:28 2000 @@@@ -91,7 +91,7 @@@@ my $urls_only_p = 0; my $delay = 0; d8 79 a86 2 -my $wordlist = "/usr/dict/words"; +my $wordlist = "/usr/share/dict/words"; a87 2 if (!-r $wordlist) { $wordlist = "/usr/share/lib/dict/words"; # irix @ 1.3 log @Remove unnecessary "./" from pathnames in patch file. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2000/02/01 00:50:48 wiz Exp $ @ 1.2 log @update xscreensaver to 3.22. Changes since 3.21: * Fixed some bugs in xscreensaver-demo. * Rewrote the Motif version of xscreensaver-demo to match the new Gtk version. * The Athena toolkit is no longer supported. XXX: depends on lesstif>=0.89.9 (or motif), but dependency is handled indirectly by USE_MOTIF... how to handle this? @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- ./hacks/webcollage.orig Thu Dec 9 12:47:14 1999 +++ ./hacks/webcollage Mon Jan 31 02:10:28 2000 @ 1.1 log @Update xscreensaver to 3.17. @ text @d3 3 a5 3 --- hacks/webcollage-orig Fri Jul 16 07:20:44 1999 +++ hacks/webcollage Wed Jul 21 22:33:52 1999 @@@@ -76,7 +76,7 @@@@ @