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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/xscreensaver xscreensaver: update to 6.03.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Tue, 08 Mar 2022 08:20:10 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3426c5d61df
branches:  trunk
changeset: 375140:a3426c5d61df
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Mar 08 07:27:11 2022 +0000

description:
xscreensaver: update to 6.03.

6.03    * New hack, `squirtorus'.
        * New hack, `mapscroller' (X11 and macOS only).
        * `sphereeversion' now has corrugation-mode, and can evert the Earth.
        * `glplanet' is higher resolution, and displays time zones.
        * `glslideshow' displays relative pathnames again.
        * iOS: Apple broke drag-to-rotate again. Fixed.
        * macOS: fixed spurious error message in auto-update installer.
        * X11: fixed `sonar' failing to ping on some Linux systems.
        * X11: Touch-screens work.
        * X11: Hold down Backspace to clear the whole password field.

diffstat:

 x11/xscreensaver/Makefile                       |    9 +-
 x11/xscreensaver/PLIST                          |   37 +----
 x11/xscreensaver/distinfo                       |   10 +-
 x11/xscreensaver/patches/patch-configure        |   14 ++
 x11/xscreensaver/patches/patch-hacks_marbling.c |  153 ------------------------
 5 files changed, 35 insertions(+), 188 deletions(-)

diffs (truncated from 335 to 300 lines):

diff -r 7ef5304dd33e -r a3426c5d61df x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Tue Mar 08 01:42:12 2022 +0000
+++ b/x11/xscreensaver/Makefile Tue Mar 08 07:27:11 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.135 2022/02/18 22:58:05 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2022/03/08 07:27:11 wiz Exp $
 
-DISTNAME=              xscreensaver-6.02
-PKGREVISION=           2
+DISTNAME=              xscreensaver-6.03
 CATEGORIES=            x11
 MASTER_SITES=          https://www.jwz.org/xscreensaver/
 DIST_SUBDIR=           xscreensaver
@@ -13,7 +12,7 @@
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c99
-USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=            gmake intltool msgfmt perl:run pkg-config
 
 CHECK_PORTABILITY_SKIP+=       OSX/fuzztest.sh
 CHECK_PORTABILITY_SKIP+=       OSX/installer.sh
@@ -53,6 +52,8 @@
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}
 
+REPLACE_PERL+= hacks/*.pl hacks/*/*.pl
+
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
diff -r 7ef5304dd33e -r a3426c5d61df x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Tue Mar 08 01:42:12 2022 +0000
+++ b/x11/xscreensaver/PLIST    Tue Mar 08 07:27:11 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2022/02/17 15:46:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.54 2022/03/08 07:27:11 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -178,6 +178,7 @@
 libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/m6502.xml
+libexec/xscreensaver/config/mapscroller.xml
 libexec/xscreensaver/config/marbling.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/maze3d.xml
@@ -221,7 +222,7 @@
 libexec/xscreensaver/config/queens.xml
 libexec/xscreensaver/config/raverhoop.xml
 libexec/xscreensaver/config/razzledazzle.xml
-libexec/xscreensaver/config/rd-bomb.xml
+libexec/xscreensaver/config/rdbomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
 libexec/xscreensaver/config/romanboy.xml
@@ -246,6 +247,7 @@
 libexec/xscreensaver/config/spotlight.xml
 libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.xml
+libexec/xscreensaver/config/squirtorus.xml
 libexec/xscreensaver/config/stairs.xml
 libexec/xscreensaver/config/starfish.xml
 libexec/xscreensaver/config/starwars.xml
@@ -384,6 +386,8 @@
 libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
 libexec/xscreensaver/m6502
+libexec/xscreensaver/mapscroller
+libexec/xscreensaver/mapscroller.pl
 libexec/xscreensaver/marbling
 libexec/xscreensaver/maze
 libexec/xscreensaver/maze3d
@@ -427,7 +431,7 @@
 libexec/xscreensaver/queens
 libexec/xscreensaver/raverhoop
 libexec/xscreensaver/razzledazzle
-libexec/xscreensaver/rd-bomb
+libexec/xscreensaver/rdbomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
 libexec/xscreensaver/romanboy
@@ -452,6 +456,7 @@
 libexec/xscreensaver/spotlight
 libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
+libexec/xscreensaver/squirtorus
 libexec/xscreensaver/stairs
 libexec/xscreensaver/starfish
 libexec/xscreensaver/starwars
@@ -638,6 +643,7 @@
 man/man6/lcdscrub.6
 man/man6/lockward.6
 man/man6/loop.6
+man/man6/mapscroller.6
 man/man6/marbling.6
 man/man6/maze.6
 man/man6/maze3d.6
@@ -680,7 +686,7 @@
 man/man6/queens.6
 man/man6/raverhoop.6
 man/man6/razzledazzle.6
-man/man6/rd-bomb.6
+man/man6/rdbomb.6
 man/man6/ripples.6
 man/man6/rocks.6
 man/man6/romanboy.6
@@ -705,6 +711,7 @@
 man/man6/spotlight.6
 man/man6/sproingies.6
 man/man6/squiral.6
+man/man6/squirtorus.6
 man/man6/stairs.6
 man/man6/starfish.6
 man/man6/starwars.6
@@ -758,28 +765,6 @@
 share/fonts/xscreensaver/clacon.ttf
 share/fonts/xscreensaver/gallant12x22.ttf
 share/fonts/xscreensaver/luximr.ttf
-share/locale/da/LC_MESSAGES/xscreensaver.mo
-share/locale/de/LC_MESSAGES/xscreensaver.mo
-share/locale/es/LC_MESSAGES/xscreensaver.mo
-share/locale/et/LC_MESSAGES/xscreensaver.mo
-share/locale/fi/LC_MESSAGES/xscreensaver.mo
-share/locale/fr/LC_MESSAGES/xscreensaver.mo
-share/locale/hu/LC_MESSAGES/xscreensaver.mo
-share/locale/it/LC_MESSAGES/xscreensaver.mo
-share/locale/ja/LC_MESSAGES/xscreensaver.mo
-share/locale/ko/LC_MESSAGES/xscreensaver.mo
-share/locale/nb/LC_MESSAGES/xscreensaver.mo
-share/locale/nl/LC_MESSAGES/xscreensaver.mo
-share/locale/pl/LC_MESSAGES/xscreensaver.mo
-share/locale/pt/LC_MESSAGES/xscreensaver.mo
-share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
-share/locale/sk/LC_MESSAGES/xscreensaver.mo
-share/locale/sv/LC_MESSAGES/xscreensaver.mo
-share/locale/vi/LC_MESSAGES/xscreensaver.mo
-share/locale/wa/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
 share/pixmaps/xscreensaver.xpm
 share/xscreensaver/ui/screensaver-cmndln.png
 share/xscreensaver/ui/screensaver-colorselector.png
diff -r 7ef5304dd33e -r a3426c5d61df x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Tue Mar 08 01:42:12 2022 +0000
+++ b/x11/xscreensaver/distinfo Tue Mar 08 07:27:11 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.87 2022/02/19 17:58:21 wiz Exp $
+$NetBSD: distinfo,v 1.88 2022/03/08 07:27:11 wiz Exp $
 
-BLAKE2s (xscreensaver/xscreensaver-6.02.tar.gz) = 080ff4236605bd59b82c6dc1f3da8120848d66468e5218c00e4230d29cb51d27
-SHA512 (xscreensaver/xscreensaver-6.02.tar.gz) = 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
-Size (xscreensaver/xscreensaver-6.02.tar.gz) = 22672643 bytes
-SHA1 (patch-hacks_marbling.c) = 55be2ea8e788094bf4b15e7bfe0b6858b6a33a79
+BLAKE2s (xscreensaver/xscreensaver-6.03.tar.gz) = de81815922c9ae70ea281c694d414b0fa6d88a597755f68d96a596423641b0ce
+SHA512 (xscreensaver/xscreensaver-6.03.tar.gz) = 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
+Size (xscreensaver/xscreensaver-6.03.tar.gz) = 25703584 bytes
+SHA1 (patch-configure) = 4821b6f4400976990b6042677960a53e25f03a24
diff -r 7ef5304dd33e -r a3426c5d61df x11/xscreensaver/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver/patches/patch-configure  Tue Mar 08 07:27:11 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2022/03/08 07:27:11 wiz Exp $
+
+configure script is overzealous.
+
+--- configure.orig     2022-02-27 21:30:07.732273168 +0000
++++ configure
+@@ -21135,7 +21135,6 @@ elif test "$have_pam" = no ; then
+   if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+     warn  "Your system seems to have PAM, but PAM is not being used."
+     warn2 "That is probably not going to work out well."
+-    CONF_STATUS=1
+   fi
+ fi
+ 
diff -r 7ef5304dd33e -r a3426c5d61df x11/xscreensaver/patches/patch-hacks_marbling.c
--- a/x11/xscreensaver/patches/patch-hacks_marbling.c   Tue Mar 08 01:42:12 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-$NetBSD: patch-hacks_marbling.c,v 1.1 2022/02/19 17:58:22 wiz Exp $
-
-Upstream patch from jwz to fix compilation with gcc 7.5.
-
---- hacks/marbling.c.orig      2021-10-04 23:20:23.052312294 +0000
-+++ hacks/marbling.c
-@@ -44,6 +44,13 @@
- #include "thread_util.h"
- #include "xshm.h"
- 
-+#if defined __GNUC__ || defined __clang__ || \
-+  defined __STDC_VERSION__ && __STDC_VERSION__ > 199901L
-+# define INLINE inline
-+#else
-+# define INLINE
-+#endif
-+
- /* Use GCC/Clang's vector SIMD extensions, when possible.
-    https://gcc.gnu.org/onlinedocs/gcc/Vector-Extensions.html
-  */
-@@ -59,17 +66,21 @@
-  */
- #  if defined __AVX2__
- #   define VSIZE 16
--#   define IMUL_HI __builtin_ia32_pmulhw256
--#   define MUL_HI __builtin_ia32_pmulhuw256
-+#   define IMUL_HI_OP __builtin_ia32_pmulhw256
-+#   define MUL_HI_OP __builtin_ia32_pmulhuw256
- #  elif defined __SSE2__
- #   define VSIZE 8
--#   define IMUL_HI __builtin_ia32_pmulhw128
--#   define MUL_HI __builtin_ia32_pmulhuw128
-+#   define IMUL_HI_OP __builtin_ia32_pmulhw128
-+#   define MUL_HI_OP __builtin_ia32_pmulhuw128
- #  endif
- 
- #  ifdef VSIZE
--typedef int16_t v_uhi __attribute__((vector_size(VSIZE * 2)));
-+typedef uint16_t v_uhi __attribute__((vector_size(VSIZE * 2)));
- typedef int16_t v_hi __attribute__((vector_size(VSIZE * 2)));
-+
-+static INLINE v_hi IMUL_HI(v_hi a, v_hi b) { return IMUL_HI_OP(a, b); }
-+static INLINE v_uhi MUL_HI(v_uhi a, v_uhi b) { return (v_uhi)MUL_HI_OP((v_hi)a, (v_hi)b); }
-+
- #  endif
- # endif
- 
-@@ -114,13 +125,6 @@ typedef int16_t v_hi;
- # define VEC_INDEX(v, i) ((v)[i])
- #endif
- 
--#if defined __GNUC__ || defined __clang__ || \
--  defined __STDC_VERSION__ && __STDC_VERSION__ > 199901L
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- struct state {
-   Display *dpy;
-   Window window;
-@@ -156,18 +160,20 @@ const unsigned lerp_loss = 2; /* Min: 2 
- #endif
- 
- /* == 8 for x86 and scalar. (Nice.) */
--const unsigned noise_out_bits = noise_work_bits - 3 * lerp_loss + 1;
-+/* const unsigned noise_out_bits = noise_work_bits - 3 * lerp_loss + 1; */
-+#define noise_out_bits ((noise_work_bits - 3) * (lerp_loss + 1))
- const unsigned noise_in_bits = 8;
- 
--static INLINE v_hi
-+static INLINE v_uhi
- broadcast (int16_t x)
- {
- #if VSIZE == 1
--  return x;
-+  v_hi r = x;
- #else
-   v_hi r = {0};
--  return r + x;
-+  r = r + x;
- #endif
-+  return (v_uhi)r;
- }
- 
- static INLINE v_uhi
-@@ -175,11 +181,22 @@ fade (v_uhi t)
- {
-   const uint16_t F = 256;
- 
-+  /* This whole thing is playing fast and loose with signdedness, mostly
-+     because __builtin_ia32_pmulhuw256 is an unsigned op that requires signed
-+     params, and Android's clang doesn't seem to care about signed vs.
-+     unsigned vector variables.
-+
-+     The multiplications below should be unsigned, but the result is the same
-+     either way, because it's getting the low 16 bits (not the high 16).
-+   */
- #if __ARM_NEON
--  v_uhi t2 = (t * t) >> 1;
--  return
--    vqdmulhq_s16(t2, 10 * t - vqdmulhq_s16(t2, (uint16_t)(15 * F) - t * 6)) <<
-+  v_uhi ut2 = (t * t) >> 1;
-+  v_hi it2 = (v_hi)ut2;
-+  v_hi it = (v_hi)t;
-+  v_hi iret =
-+    vqdmulhq_s16(it2, 10 * it - vqdmulhq_s16(it2, (int16_t)(15 * F) - it * 6)) <<
-     (noise_work_bits - noise_in_bits + 1);
-+  return (v_uhi)iret;
- #else
-   v_uhi t2 = t * t;
-   return
-@@ -239,7 +256,7 @@ noise (v_uhi x, v_uhi y, v_uhi z)
- {
-   const v_uhi one = broadcast(1 << noise_work_bits);
-   v_uhi X, Y, Z, A, B, AA, AB, BA, BB;
--  v_uhi u, v, w;
-+  v_hi u, v, w;
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/xscreensaver to 6.03
Next by Date: [pkgsrc/trunk]: pkgsrc/editors/Sigil Sigil: update to 1.9.1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/xscreensaver to 6.03
Next by Thread: [pkgsrc/trunk]: pkgsrc/editors/Sigil Sigil: update to 1.9.1.
Indexes:
Home | Main Index | Thread Index | Old Index