From d06ef35b2d61b3754bbb4f2cc1bb7bdd44c4e048 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 30 Jul 2008 20:18:36 +0000 Subject: update to 5.06 changes: Xinerama/RANDR fixes: this time for sure. It should now work to add/remove monitors or resize screens at any time. New hack, skytentacles. New version of gleidescope. Added the -log option to the xscreensaver daemon, since a truly shocking number of Linux users seem to have no idea how to redirect output to a file. Added -duration arg to most image-loading hacks, so that they pick a new image every few minutes. Added an ATM crash to BSOD. --- x11/xscreensaver/Makefile.common | 4 ++-- x11/xscreensaver/PLIST | 7 +++++-- x11/xscreensaver/distinfo | 11 ++++++----- x11/xscreensaver/patches/patch-ac | 20 ++++++++++---------- x11/xscreensaver/patches/patch-aj | 14 ++++++++++++++ 5 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 x11/xscreensaver/patches/patch-aj (limited to 'x11/xscreensaver') diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 55680e66fa1..b8761452a93 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.96 2008/03/10 12:37:12 drochner Exp $ +# $NetBSD: Makefile.common,v 1.97 2008/07/30 20:18:36 drochner Exp $ # # When updating the package, # please check kdeartwork3 -- it installs some extra # files depending on which screensavers it finds. -DISTNAME= xscreensaver-5.05 +DISTNAME= xscreensaver-5.06 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index da05e9b3dad..0c38f9054fb 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2008/03/10 12:37:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.33 2008/07/30 20:18:36 drochner Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-getimage @@ -214,6 +214,7 @@ libexec/xscreensaver/config/sballs.xml libexec/xscreensaver/config/shadebobs.xml libexec/xscreensaver/config/sierpinski.xml libexec/xscreensaver/config/sierpinski3d.xml +libexec/xscreensaver/config/skytentacles.xml libexec/xscreensaver/config/slidescreen.xml libexec/xscreensaver/config/slip.xml libexec/xscreensaver/config/sonar.xml @@ -400,6 +401,7 @@ libexec/xscreensaver/sballs libexec/xscreensaver/shadebobs libexec/xscreensaver/sierpinski libexec/xscreensaver/sierpinski3d +libexec/xscreensaver/skytentacles libexec/xscreensaver/slidescreen libexec/xscreensaver/slip libexec/xscreensaver/sonar @@ -564,7 +566,7 @@ man/man6/kumppa.6 man/man6/lament.6 man/man6/laser.6 man/man6/lavalite.6 -man/man6/lcdscrub +man/man6/lcdscrub.6 man/man6/lightning.6 man/man6/lisa.6 man/man6/lissie.6 @@ -618,6 +620,7 @@ man/man6/sballs.6 man/man6/shadebobs.6 man/man6/sierpinski.6 man/man6/sierpinski3d.6 +man/man6/skytentacles.6 man/man6/slidescreen.6 man/man6/slip.6 man/man6/sonar.6 diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 7c064cc2ff0..90d1eff8e2c 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.52 2008/03/10 12:37:12 drochner Exp $ +$NetBSD: distinfo,v 1.53 2008/07/30 20:18:36 drochner Exp $ -SHA1 (xscreensaver-5.05.tar.gz) = 6f23422b17dd8a06cdaf419fd16d398eee50601b -RMD160 (xscreensaver-5.05.tar.gz) = 8f174d544ae68f54454d946c854cf81749427afb -Size (xscreensaver-5.05.tar.gz) = 5468293 bytes +SHA1 (xscreensaver-5.06.tar.gz) = 3310789ecf1ed8ff790d94512fe536857e793e4c +RMD160 (xscreensaver-5.06.tar.gz) = de164ee7f68094f77b28dcfaa3279953f98cba83 +Size (xscreensaver-5.06.tar.gz) = 5486779 bytes SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb -SHA1 (patch-ac) = a18940984f4ebb96bcfb07618ae86aacbdc9cbfb +SHA1 (patch-ac) = 8ca1464ac1b0748755405977a436e51a2a288329 SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5 +SHA1 (patch-aj) = 053c64a595423a65e9b3bde474ae2e19f3382cf7 diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 1321b6b8b88..a796ce6b89b 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ +$NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ ---- configure.orig 2008-03-02 06:34:45.000000000 +0100 +--- configure.orig 2008-07-16 23:40:47.000000000 +0200 +++ configure -@@ -3510,6 +3510,9 @@ echo "${ECHO_T}Disabling Objective C ext - fi +@@ -3500,6 +3500,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp + ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" fi +# Disable c89 options, since these trigger more errors than expected and @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ if test -n "$GCC"; then if test -n "$GCC"; then { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 -@@ -3558,6 +3561,7 @@ echo "${ECHO_T}Disabling C++ comments in +@@ -3550,6 +3553,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -7929,7 +7933,7 @@ _ACEOF +@@ -7921,7 +7925,7 @@ _ACEOF @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -@@ -13552,7 +13556,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -13640,7 +13644,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13639,7 +13643,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -13727,7 +13731,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp # (who got it from amu@mit.edu) @@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -14801,7 +14805,7 @@ fi +@@ -14889,7 +14893,7 @@ fi # if test "$enable_locking" = yes ; then case "$host" in @@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ need_setuid=yes ;; esac -@@ -15235,11 +15239,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > +@@ -15323,11 +15327,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > ac_gtk_config_libs=$ac_cv_gtk_config_libs GTK_EXTRA_OBJS="" diff --git a/x11/xscreensaver/patches/patch-aj b/x11/xscreensaver/patches/patch-aj new file mode 100644 index 00000000000..920ad11f2b1 --- /dev/null +++ b/x11/xscreensaver/patches/patch-aj @@ -0,0 +1,14 @@ +$NetBSD: patch-aj,v 1.1 2008/07/30 20:18:37 drochner Exp $ + +--- hacks/glx/skytentacles.c.orig 2008-07-16 22:19:15.000000000 +0200 ++++ hacks/glx/skytentacles.c +@@ -241,6 +241,9 @@ make_tentacle (ModeInfo *mi, int which, + + if (tc->tentacles_size <= tc->ntentacles) + { ++ if (!tc->tentacles_size) ++ tc->tentacles_size = 10; ++ else + tc->tentacles_size = (tc->tentacles_size * 1.2) + tc->ntentacles; + tc->tentacles = (tentacle **) + realloc (tc->tentacles, tc->tentacles_size * sizeof(*tc->tentacles)); -- cgit v1.2.3