pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xscreensaver xscreensaver: update to 6.02.
details: https://anonhg.NetBSD.org/pkgsrc/rev/133a2577679a
branches: trunk
changeset: 374267:133a2577679a
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Feb 17 15:46:52 2022 +0000
description:
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.
diffstat:
x11/xscreensaver/Makefile | 72 ++-
x11/xscreensaver/Makefile.common | 73 --
x11/xscreensaver/PLIST | 417 +++++++++++++++-
x11/xscreensaver/PLIST.Darwin | 5 -
x11/xscreensaver/PLIST.opengl | 363 -------------
x11/xscreensaver/PLIST.webcollage | 4 -
x11/xscreensaver/distinfo | 14 +-
x11/xscreensaver/options.mk | 28 +-
x11/xscreensaver/patches/patch-ad | 42 -
x11/xscreensaver/patches/patch-af | 17 -
x11/xscreensaver/patches/patch-driver_screens.c | 37 -
x11/xscreensaver/patches/patch-hacks_Makefile.in | 15 -
x11/xscreensaver/patches/patch-hacks_images_Makefile.in | 12 -
x11/xscreensaver/patches/patch-utils_Makefile.in | 15 -
14 files changed, 472 insertions(+), 642 deletions(-)
diffs (truncated from 1565 to 300 lines):
diff -r acb9baf861ec -r 133a2577679a x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Thu Feb 17 15:45:33 2022 +0000
+++ b/x11/xscreensaver/Makefile Thu Feb 17 15:46:52 2022 +0000
@@ -1,28 +1,78 @@
-# $NetBSD: Makefile,v 1.132 2021/12/08 16:03:04 adam Exp $
+# $NetBSD: Makefile,v 1.133 2022/02/17 15:46:52 wiz Exp $
+
+DISTNAME= xscreensaver-6.02
+CATEGORIES= x11
+MASTER_SITES= https://www.jwz.org/xscreensaver/
+DIST_SUBDIR= xscreensaver
-COMMENT= Screen saver and locker for the X window system
-PKGREVISION= 5
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+COMMENT= Screen saver and locker for the X window system
+HOMEPAGE= https://www.jwz.org/xscreensaver/
-CONFLICTS+= xscreensaver-gnome<4.14
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+USE_LANGUAGES= c99
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
+
+CHECK_PORTABILITY_SKIP+= OSX/fuzztest.sh
+CHECK_PORTABILITY_SKIP+= OSX/installer.sh
+CHECK_PORTABILITY_SKIP+= android/Makefile
-.include "Makefile.common"
-.include "options.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
+CONFIGURE_ARGS+= --with-gl
+CONFIGURE_ARGS+= --with-gle
+CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
+CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver
+CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE}
+CONFIGURE_ARGS+= --without-motif
+
+CONFIGURE_ARGS.NetBSD+= --without-kerberos
-CONFIGURE_ARGS+= --without-gtk
-#CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
-CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
+#CONFIGURE_ARGS+= --with-pthread
+#CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
+#CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
+#CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
+#.if defined(PKGREVISION)
+#CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
+#.endif
+#CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
+
+CONFLICTS+= xscreensaver-gnome<4.14 xscreensaver-demo-[0-9]*
+
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc*)
+CFLAGS+= -fno-strict-aliasing
+.endif
+
+.if !exists(/usr/bin/bc)
+BUILD_DEPENDS+= bc-[0-9]*:../../math/bc
+.endif
+
+INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR}
INSTALLATION_DIRS= share/doc/${PKGBASE}
post-install:
${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+.include "options.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/gle/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r acb9baf861ec -r 133a2577679a x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common Thu Feb 17 15:45:33 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile.common,v 1.131 2021/01/04 12:23:32 wiz Exp $
-#
-# used by x11/xscreensaver/Makefile
-# used by x11/xscreensaver-demo/Makefile
-
-DISTNAME= xscreensaver-5.45
-CATEGORIES= x11
-MASTER_SITES= https://www.jwz.org/xscreensaver/
-DIST_SUBDIR= xscreensaver
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.jwz.org/xscreensaver/
-
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c99
-USE_TOOLS+= gmake msgfmt perl pkg-config
-
-CHECK_PORTABILITY_SKIP+= OSX/fuzztest.sh
-CHECK_PORTABILITY_SKIP+= OSX/installer.sh
-CHECK_PORTABILITY_SKIP+= android/Makefile
-
-GNU_CONFIGURE= yes
-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
-
-CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
-CONFIGURE_ENV+= ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
-CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
-.if defined(PKGREVISION)
-CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
-.endif
-CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
-
-DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo
-PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches
-
-.include "../../mk/bsd.prefs.mk"
-
-PERL_VERSION_cmd= if ${TEST} -x ${PERL5}; then \
- ${PERL5} -e 'print $$]'; \
- else \
- ${ECHO} "5.006"; \
- fi
-
-.if (${OPSYS} == "NetBSD")
-CONFIGURE_ARGS+= --without-kerberos
-.endif
-
-.if ${OPSYS} == "Darwin"
-PLIST_SRC+= PLIST.Darwin
-.endif
-
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc*)
-CFLAGS+= -fno-strict-aliasing
-.endif
-
-.if !exists(/usr/bin/bc)
-BUILD_DEPENDS+= bc-[0-9]*:../../math/bc
-.endif
-
-INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.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 acb9baf861ec -r 133a2577679a x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST Thu Feb 17 15:45:33 2022 +0000
+++ b/x11/xscreensaver/PLIST Thu Feb 17 15:46:52 2022 +0000
@@ -1,142 +1,280 @@
-@comment $NetBSD: PLIST,v 1.52 2021/05/03 23:31:40 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.53 2022/02/17 15:46:52 wiz Exp $
bin/xscreensaver
bin/xscreensaver-command
-bin/xscreensaver-getimage
-bin/xscreensaver-getimage-file
-bin/xscreensaver-getimage-video
-bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
+bin/xscreensaver-demo
+bin/xscreensaver-settings
libexec/xscreensaver/abstractile
libexec/xscreensaver/anemone
libexec/xscreensaver/anemotaxis
+libexec/xscreensaver/antinspect
+libexec/xscreensaver/antmaze
+libexec/xscreensaver/antspotlight
libexec/xscreensaver/apollonian
libexec/xscreensaver/apple2
+libexec/xscreensaver/atlantis
libexec/xscreensaver/attraction
+libexec/xscreensaver/atunnel
libexec/xscreensaver/barcode
+libexec/xscreensaver/beats
+libexec/xscreensaver/binaryhorizon
libexec/xscreensaver/binaryring
libexec/xscreensaver/blaster
+libexec/xscreensaver/blinkbox
libexec/xscreensaver/blitspin
+libexec/xscreensaver/blocktube
+libexec/xscreensaver/boing
libexec/xscreensaver/bouboule
+libexec/xscreensaver/bouncingcow
+libexec/xscreensaver/boxed
libexec/xscreensaver/boxfit
libexec/xscreensaver/braid
libexec/xscreensaver/bsod
+libexec/xscreensaver/bubble3d
libexec/xscreensaver/bumps
+libexec/xscreensaver/cage
+libexec/xscreensaver/carousel
libexec/xscreensaver/ccurve
libexec/xscreensaver/celtic
+libexec/xscreensaver/circuit
+libexec/xscreensaver/cityflow
libexec/xscreensaver/cloudlife
+libexec/xscreensaver/companioncube
libexec/xscreensaver/compass
libexec/xscreensaver/config/README
libexec/xscreensaver/config/abstractile.xml
libexec/xscreensaver/config/anemone.xml
libexec/xscreensaver/config/anemotaxis.xml
+libexec/xscreensaver/config/antinspect.xml
+libexec/xscreensaver/config/antmaze.xml
+libexec/xscreensaver/config/antspotlight.xml
libexec/xscreensaver/config/apollonian.xml
libexec/xscreensaver/config/apple2.xml
+libexec/xscreensaver/config/atlantis.xml
libexec/xscreensaver/config/attraction.xml
+libexec/xscreensaver/config/atunnel.xml
libexec/xscreensaver/config/barcode.xml
+libexec/xscreensaver/config/beats.xml
+libexec/xscreensaver/config/binaryhorizon.xml
libexec/xscreensaver/config/binaryring.xml
libexec/xscreensaver/config/blaster.xml
+libexec/xscreensaver/config/blinkbox.xml
libexec/xscreensaver/config/blitspin.xml
+libexec/xscreensaver/config/blocktube.xml
+libexec/xscreensaver/config/boing.xml
libexec/xscreensaver/config/bouboule.xml
+libexec/xscreensaver/config/bouncingcow.xml
+libexec/xscreensaver/config/boxed.xml
libexec/xscreensaver/config/boxfit.xml
libexec/xscreensaver/config/braid.xml
libexec/xscreensaver/config/bsod.xml
+libexec/xscreensaver/config/bubble3d.xml
libexec/xscreensaver/config/bumps.xml
+libexec/xscreensaver/config/cage.xml
+libexec/xscreensaver/config/carousel.xml
libexec/xscreensaver/config/ccurve.xml
libexec/xscreensaver/config/celtic.xml
+libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/cityflow.xml
libexec/xscreensaver/config/cloudlife.xml
+libexec/xscreensaver/config/companioncube.xml
libexec/xscreensaver/config/compass.xml
libexec/xscreensaver/config/coral.xml
+libexec/xscreensaver/config/covid19.xml
+libexec/xscreensaver/config/crackberg.xml
+libexec/xscreensaver/config/crumbler.xml
libexec/xscreensaver/config/crystal.xml
+libexec/xscreensaver/config/cube21.xml
+libexec/xscreensaver/config/cubenetic.xml
+libexec/xscreensaver/config/cubestack.xml
+libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubetwist.xml
+libexec/xscreensaver/config/cubicgrid.xml
libexec/xscreensaver/config/cwaves.xml
libexec/xscreensaver/config/cynosure.xml
+libexec/xscreensaver/config/dangerball.xml
libexec/xscreensaver/config/decayscreen.xml
libexec/xscreensaver/config/deco.xml
+libexec/xscreensaver/config/deepstars.xml
libexec/xscreensaver/config/deluxe.xml
libexec/xscreensaver/config/demon.xml
+libexec/xscreensaver/config/discoball.xml
libexec/xscreensaver/config/discrete.xml
libexec/xscreensaver/config/distort.xml
libexec/xscreensaver/config/drift.xml
+libexec/xscreensaver/config/dymaxionmap.xml
+libexec/xscreensaver/config/endgame.xml
+libexec/xscreensaver/config/energystream.xml
+libexec/xscreensaver/config/engine.xml
libexec/xscreensaver/config/epicycle.xml
libexec/xscreensaver/config/eruption.xml
+libexec/xscreensaver/config/esper.xml
+libexec/xscreensaver/config/etruscanvenus.xml
libexec/xscreensaver/config/euler2d.xml
+libexec/xscreensaver/config/extrusion.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/flipflop.xml
+libexec/xscreensaver/config/flipscreen3d.xml
Home |
Main Index |
Thread Index |
Old Index