[pkgsrc/trunk]: pkgsrc/x11/xscreensaver xscreensaver: update to 5.40.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/251cb94339cf
branches:  trunk
changeset: 312387:251cb94339cf
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Sep 02 20:12:03 2018 +0000

description:
xscreensaver: update to 5.40.

5.40    * New hacks, 'filmleader', 'vfeedback'.
        * New hack, 'glitchpeg' (X11 and macOS only).
        * GLPlanet blends between day and night maps at the dusk terminator.
        * DymaxionMap can display arbitrary map images, and animate sunlight
          across the flattened globe.
        * Tessellimage can draw either Delaunay or Voronoi tilings.
        * XAnalogTV includes test cards.
        * Android: These hacks work now: 'blitspin', 'bumps', 'cityflow',
          'endgame', 'esper', 'flipscreen3d', 'gleidescope', 'glslideshow',
          'jigglypuff', 'queens', 'tessellimage', 'xanalogtv', 'xmatrix',
          'zoom'.

diffstat:

 x11/xscreensaver/Makefile                  |   3 +--
 x11/xscreensaver/Makefile.common           |  15 ++++-----------
 x11/xscreensaver/PLIST                     |  11 ++++++++++-
 x11/xscreensaver/distinfo                  |  11 +++++------
 x11/xscreensaver/patches/patch-utils_xft.c |  25 -------------------------
 5 files changed, 20 insertions(+), 45 deletions(-)

diffs (194 lines):

diff -r 7e0638db0191 -r 251cb94339cf x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sun Sep 02 18:38:04 2018 +0000
+++ b/x11/xscreensaver/Makefile Sun Sep 02 20:12:03 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2018/08/22 09:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2018/09/02 20:12:03 wiz Exp $
 
 COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   3
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 
diff -r 7e0638db0191 -r 251cb94339cf x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Sun Sep 02 18:38:04 2018 +0000
+++ b/x11/xscreensaver/Makefile.common  Sun Sep 02 20:12:03 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.127 2018/08/18 06:31:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.128 2018/09/02 20:12:03 wiz Exp $
 #
 # used by x11/xscreensaver/Makefile
 # used by x11/xscreensaver-demo/Makefile
 
-DISTNAME=              xscreensaver-5.39
+DISTNAME=              xscreensaver-5.40
 CATEGORIES=            x11
 MASTER_SITES=          https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=           xscreensaver
@@ -11,11 +11,8 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://www.jwz.org/xscreensaver/
 
-BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
-
 USE_PKGLOCALEDIR=      yes
-USE_X11=               yes
-USE_TOOLS+=            msgfmt perl pkg-config
+USE_TOOLS+=            gmake msgfmt perl pkg-config
 
 CHECK_PORTABILITY_SKIP+=       OSX/fuzztest.sh
 
@@ -23,7 +20,6 @@
 CONFIGURE_ARGS+=       --with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=       --with-jpeg=${JPEGBASE}
 #CONFIGURE_ARGS+=      --with-zippy=/usr/games/fortune
-
 CONFIGURE_ARGS+=       --without-motif
 CONFIGURE_ARGS+=       --with-pthread
 
@@ -59,10 +55,6 @@
 CFLAGS+=               -fno-strict-aliasing
 .endif
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=             2.95.3
-.endif
-
 .if !exists(/usr/bin/bc)
 BUILD_DEPENDS+=                bc-[0-9]*:../../math/bc
 .endif
@@ -73,5 +65,6 @@
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff -r 7e0638db0191 -r 251cb94339cf x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Sun Sep 02 18:38:04 2018 +0000
+++ b/x11/xscreensaver/PLIST    Sun Sep 02 20:12:03 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2018/06/24 05:51:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.47 2018/09/02 20:12:03 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -61,6 +61,7 @@
 libexec/xscreensaver/config/euler2d.xml
 libexec/xscreensaver/config/fadeplot.xml
 libexec/xscreensaver/config/fiberlamp.xml
+libexec/xscreensaver/config/filmleader.xml
 libexec/xscreensaver/config/fireworkx.xml
 libexec/xscreensaver/config/flame.xml
 libexec/xscreensaver/config/flow.xml
@@ -68,6 +69,7 @@
 libexec/xscreensaver/config/fontglide.xml
 libexec/xscreensaver/config/fuzzyflakes.xml
 libexec/xscreensaver/config/galaxy.xml
+libexec/xscreensaver/config/glitchpeg.xml
 libexec/xscreensaver/config/goop.xml
 libexec/xscreensaver/config/grav.xml
 libexec/xscreensaver/config/greynetic.xml
@@ -130,6 +132,7 @@
 libexec/xscreensaver/config/truchet.xml
 libexec/xscreensaver/config/twang.xml
 libexec/xscreensaver/config/vermiculate.xml
+libexec/xscreensaver/config/vfeedback.xml
 libexec/xscreensaver/config/vidwhacker.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
@@ -158,6 +161,7 @@
 libexec/xscreensaver/euler2d
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/fiberlamp
+libexec/xscreensaver/filmleader
 libexec/xscreensaver/fireworkx
 libexec/xscreensaver/flame
 libexec/xscreensaver/flow
@@ -165,6 +169,7 @@
 libexec/xscreensaver/fontglide
 libexec/xscreensaver/fuzzyflakes
 libexec/xscreensaver/galaxy
+libexec/xscreensaver/glitchpeg
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
 libexec/xscreensaver/greynetic
@@ -228,6 +233,7 @@
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
 libexec/xscreensaver/vermiculate
+libexec/xscreensaver/vfeedback
 libexec/xscreensaver/vidwhacker
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
@@ -281,6 +287,7 @@
 man/man6/euler2d.6
 man/man6/fadeplot.6
 man/man6/fiberlamp.6
+man/man6/filmleader.6
 man/man6/fireworkx.6
 man/man6/flame.6
 man/man6/flow.6
@@ -288,6 +295,7 @@
 man/man6/fontglide.6
 man/man6/fuzzyflakes.6
 man/man6/galaxy.6
+man/man6/glitchpeg.6
 man/man6/goop.6
 man/man6/grav.6
 man/man6/greynetic.6
@@ -349,6 +357,7 @@
 man/man6/truchet.6
 man/man6/twang.6
 man/man6/vermiculate.6
+man/man6/vfeedback.6
 man/man6/vidwhacker.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
diff -r 7e0638db0191 -r 251cb94339cf x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Sun Sep 02 18:38:04 2018 +0000
+++ b/x11/xscreensaver/distinfo Sun Sep 02 20:12:03 2018 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.75 2018/06/25 08:42:39 wiz Exp $
+$NetBSD: distinfo,v 1.76 2018/09/02 20:12:03 wiz Exp $
 
-SHA1 (xscreensaver/xscreensaver-5.39.tar.gz) = 7166c9f4a860785e0829df046f0328f5be74c0d7
-RMD160 (xscreensaver/xscreensaver-5.39.tar.gz) = 6fb6f51024fc052a92ef4dbe594d8ffb18dc9561
-SHA512 (xscreensaver/xscreensaver-5.39.tar.gz) = 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
-Size (xscreensaver/xscreensaver-5.39.tar.gz) = 12157285 bytes
+SHA1 (xscreensaver/xscreensaver-5.40.tar.gz) = 82c7433fe008e6ea9ab8683cf3325a673b8a8233
+RMD160 (xscreensaver/xscreensaver-5.40.tar.gz) = 05dd6ff6fc607c4364adb9485b9888134ebaa56b
+SHA512 (xscreensaver/xscreensaver-5.40.tar.gz) = e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
+Size (xscreensaver/xscreensaver-5.40.tar.gz) = 12248135 bytes
 SHA1 (patch-ad) = ff03b044ca82964c3b9535b84a7dcca6d5f8f1bb
 SHA1 (patch-af) = 4ee300a205a0ac448939ac2776087db48d808ad8
-SHA1 (patch-utils_xft.c) = 786bbc3c75f1d51dc35c8140deed32fb9301cdb1
diff -r 7e0638db0191 -r 251cb94339cf x11/xscreensaver/patches/patch-utils_xft.c
--- a/x11/xscreensaver/patches/patch-utils_xft.c        Sun Sep 02 18:38:04 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-utils_xft.c,v 1.1 2018/06/25 08:42:39 wiz Exp $
-
-Fix build with libX11-1.6.5.
-
---- utils/xft.c.orig   2017-11-02 20:05:48.000000000 +0000
-+++ utils/xft.c
-@@ -198,12 +198,12 @@ XftColorAllocValue (Display *dpy,
-       int green_shift, green_len;
-       int blue_shift, blue_len;
- 
--      red_shift   = maskbase (visual->rgba_masks[0]);
--      red_len     = masklen  (visual->rgba_masks[0]);
--      green_shift = maskbase (visual->rgba_masks[1]);
--      green_len   = masklen (visual->rgba_masks[1]);
--      blue_shift  = maskbase (visual->rgba_masks[2]);
--      blue_len    = masklen (visual->rgba_masks[2]);
-+      red_shift   = maskbase (visual->red_mask);
-+      red_len     = masklen  (visual->red_mask);
-+      green_shift = maskbase (visual->green_mask);
-+      green_len   = masklen (visual->green_mask);
-+      blue_shift  = maskbase (visual->blue_mask);
-+      blue_len    = masklen (visual->blue_mask);
-       result->pixel = (((color->red   >> (16 - red_len))   << red_shift)   |
-                        ((color->green >> (16 - green_len)) << green_shift) |
-                        ((color->blue  >> (16 - blue_len))  << blue_shift));