commit: 142845b4fcc54cb8b6d58872761cadf976d12f2b Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Fri Jan 16 21:31:23 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 25 06:45:02 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142845b4
x11-misc/xscreensaver: add 6.14 * drop `x11-libs/libXxf86vm` dependency * drop `--with-xf86gamma-ext` and `--with-xf86vmode-ext` configure options * drop `--with-proc-interrupts` configure option * update ffmpeg configure patch * update OCRA.ttf font licensing Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx> Part-of: https://github.com/gentoo/gentoo/pull/45407 Closes: https://github.com/gentoo/gentoo/pull/45407 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-misc/xscreensaver/Manifest | 1 + .../files/xscreensaver-6.14-ffmpeg.patch | 91 ++++++ x11-misc/xscreensaver/xscreensaver-6.14.ebuild | 343 +++++++++++++++++++++ 3 files changed, 435 insertions(+) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index d041c6bf73e5..83a105319552 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -4,3 +4,4 @@ DIST xscreensaver-6.10.1.tar.gz 25081752 BLAKE2B 6bfeed1acbe0aee07ed64c31f8e503a DIST xscreensaver-6.12-logind-idle-hint.patch 4056 BLAKE2B 30861195aeef16f8252d2324e61674a8d77cd1c0fb62aa5128c8d1e7289edfc2ee7bc4d39e50e1dcbcfe5601b95c14868320bf257bb1c9fe96c9542bde86240a SHA512 3ebb0398266b659545831a772417772f0ba99dd8125cc1ae497eb8dfa4d98dd368a119763283464ea72cab410573b7adc32176e80d243652820b4649b1e4551d DIST xscreensaver-6.12.tar.gz 25177935 BLAKE2B 0e102abd2c28574110b6e1d2b8d59619430869d04c151f379654e1ee8350a93208f198f739f63507e781efd93808fbe17df0f11e5196dde6de010272272eb9fb SHA512 df98e07fe66fd6ad1fd680c6790d66a160f146ff721f90a76c46142888a0d17f82f068343b1ac82aa4562385460da393dc4733abdb26f0cda0f2a8944a614497 DIST xscreensaver-6.13.tar.gz 25233110 BLAKE2B a165a9bf9fa2f1d3db6e660ccb03fe5474bf2338e4d1d606d76b5552ae08d4d9ca97ff5a4b4a0778c741f391a9d654b0422c4b0e9b4a0a5a0c7b535c346d3e69 SHA512 1ab42c0d0bf31b6d25e543d44c2ff41f48ef229ffce3a02f82495c1ef9c9452eddec4abe1cd7705220c6491562361f8cd0cca8bce9875ff80a765816574bf8ac +DIST xscreensaver-6.14.tar.gz 25206667 BLAKE2B 2137d12232f97cf68daaa9d44bfc0a566a56afefe29cd348b72f8335a92dc391ff0d69fb50c0aa283548c64d746d49c27df20f64d7ab768ada76088240fff08b SHA512 2ef426f7ae862e7b4665014843451410e30dce8dcc16b98e94c58c0a904bba8ab9eb0f561599ea57eb68df49265171507074026784fdbff23fafeb87175e47df diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.14-ffmpeg.patch b/x11-misc/xscreensaver/files/xscreensaver-6.14-ffmpeg.patch new file mode 100644 index 000000000000..d355adca31f4 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.14-ffmpeg.patch @@ -0,0 +1,91 @@ +Since version 6.07, xscreensaver could save videos, using ffmpeg, +but the configure flag --with-record-animation doesn't work to +deactivate this feature. + +Signed-off-by: Cristian Othón Martínez Vera <[email protected]> + +--- a/configure.ac ++++ b/configure.ac +@@ -3801,6 +3801,28 @@ + XFT_OBJS='$(UTILS_BIN)/xft.o' + fi + ++############################################################################### ++# ++# Check for --with-record-animation ++# ++############################################################################### ++ ++record_anim_default=no ++record_anim="$record_anim_default" ++AC_ARG_WITH(record-animation, ++[ --with-record-animation Include code for generating MP4 videos.], ++ [record_anim="$withval"], [record_anim="$record_anim_default"]) ++ ++HANDLE_X_PATH_ARG(record_anim, --with-record-animation, record animation) ++ ++if test "$record_anim" = yes; then ++ true ++elif test "$record_anim" != no; then ++ echo "error: must be yes or no: --with-record-animation=$record_anim" ++ exit 1 ++fi ++ ++if test "$record_anim" = yes; then + + ############################################################################### + # +@@ -3958,6 +3980,15 @@ + FFMPEG_LIBS="$FFMPEG_LIBS $extra_ffmpeg_bs" + fi + ++ if test "$have_ffmpeg" != yes; then ++ AC_MSG_WARN(--with-record-animation requires the ffmpeg libraries) ++ else ++ AC_MSG_RESULT(enabling --record-animation) ++ AC_DEFINE(HAVE_RECORD_ANIM) ++ ANIM_OBJS='$(ANIM_OBJS)' ++ ANIM_LIBS='$(ANIM_LIBS)' ++ fi ++fi + + ############################################################################### + # +@@ -4050,37 +4081,7 @@ + fi + + +-############################################################################### +-# +-# Check for --with-record-animation +-# +-############################################################################### +- +-record_anim_default=no +-record_anim="$record_anim_default" +-AC_ARG_WITH(record-animation, +-[ --with-record-animation Include code for generating MP4 videos.], +- [record_anim="$withval"], [record_anim="$record_anim_default"]) +- +-HANDLE_X_PATH_ARG(record_anim, --with-record-animation, record animation) +- +-if test "$record_anim" = yes; then +- true +-elif test "$record_anim" != no; then +- echo "error: must be yes or no: --with-record-animation=$record_anim" +- exit 1 +-fi + +-if test "$record_anim" = yes; then +- if test "$have_ffmpeg" != yes; then +- AC_MSG_WARN(--with-record-animation requires the ffmpeg libraries) +- else +- AC_MSG_RESULT(enabling --record-animation) +- AC_DEFINE(HAVE_RECORD_ANIM) +- ANIM_OBJS='$(ANIM_OBJS)' +- ANIM_LIBS='$(ANIM_LIBS)' +- fi +-fi + + + ############################################################################### diff --git a/x11-misc/xscreensaver/xscreensaver-6.14.ebuild b/x11-misc/xscreensaver/xscreensaver-6.14.ebuild new file mode 100644 index 000000000000..e72accdbf279 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.14.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font greadme optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/"; +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/e79e2f41be3367c196899ef2f38ab97436fa1a65.patch -> + ${PN}-6.12-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +S="${WORKDIR}/${PN}-$(ver_cut 1-2)" +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- BSD +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRA.ttf -- freely redistributable +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT freedist Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="elogind ffmpeg fonts +gdk-pixbuf gdm +gtk jpeg +locking logind-idle-hint new-login offensive pam +perl +png selinux suid systemd xinerama wayland" +REQUIRED_USE=" + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6:= + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + >=x11-libs/libXft-2.1.0 + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + virtual/glu + virtual/opengl + elogind? ( sys-auth/elogind ) + gdk-pixbuf? ( >=x11-libs/gdk-pixbuf-2.42.0:2[jpeg?] ) + gtk? ( >=x11-libs/gtk+-3.0.0:3[X,wayland?] ) + ffmpeg? ( >=media-video/ffmpeg-6.1:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + pam? ( sys-libs/pam ) + png? ( media-libs/libpng:= ) + systemd? ( >=sys-apps/systemd-221:= ) + xinerama? ( x11-libs/libXinerama ) + wayland? ( >=dev-libs/wayland-1.8 ) +" +# For USE="perl" see output of `qlist xscreensaver | grep '\(bin\|misc\)' | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + sys-apps/attr + x11-misc/xdg-utils + perl? ( + dev-lang/perl + dev-perl/HTML-Parser + dev-perl/LWP-Protocol-https + dev-perl/libwww-perl + ) + selinux? ( sec-policy/selinux-xscreensaver ) + wayland? ( gui-apps/grim ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch + "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch + "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch + "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch + "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch + "${FILESDIR}"/${PN}-6.14-ffmpeg.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + sed -i \ + -e 's|Ass |Dumb |g' \ + -e 's|Buttcorn|Blue Corn|g' \ + -e 's| dick||gi' \ + -e 's| shit||g' \ + hacks/bsod.c || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.12-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + $(use_with gdk-pixbuf pixbuf) + $(use_with gtk) + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + $(use_with wayland) + --with-jpeg=$(usex jpeg yes no) + --with-record-animation=$(usex ffmpeg yes no) + --with-png=$(usex png yes no) + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-gles + --without-glx + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + # bugs #809599, #828869 + if ! use gtk; then + rm "${ED}/usr/bin/xscreensaver-demo" || die + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth + + if ! { use png || use gdk-pixbuf; }; then + greadme_stdin --append <<-EOF + Xscreensaver was built without any means to support image manipulation + (i.e. with neither USE=gtk-pixbuf or USE=png. Several screensavers + will likely just fail to work without it and several others will + have diminished appearance like displaying a checkerboard pattern + instead of an image. It is strongly recommended to enable at least one + of those flags. + + EOF + elif ! use gdk-pixbuf; then + greadme_stdin --append <<-EOF + Xscreensaver was built with png support only. This means that most of + screensavers won't be able to use images in any other formats. It is + recommended to enable USE=gtk-pixbuf. + + EOF + fi + + if ! use jpeg; then + greadme_stdin --append <<-EOF + Xscreensaver was built without jpeg support. This mean that + 'webcollage' screensaver will be considerably slower. Enable + USE=jpeg if that will become an issue. + + EOF + fi + + if use gtk; then + greadme_stdin --append <<-EOF + You can configure xscreensaver via 'xscreensaver-settings'. + + EOF + else + greadme_stdin --append <<-EOF + Since xscreensaver had been built without USE=gtk + 'xscreensaver-settings' was not installed. Hence the only + way to configure it is via some third-party utilities or + directly via configuration file '~/.xscreensaver'. + + EOF + fi + + if use wayland; then + greadme_stdin --append <<-EOF + WARNING: Wayland support is preliminary. It does not lock and you need + a supported compositor, like: + + * kde-plasma/kwin + * gui-wm/sway + * gui-wm/hyprland + * gui-wm/wayfire + * gui-wm/labwc + EOF + fi +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + greadme_pkg_postinst + + optfeature_header 'Additional dependencies for specific screensavers' + optfeature 'vidwhacker' 'media-libs/netpbm[jpeg,png] virtual/imagemagick-tools' \ + 'media-libs/netpbm[jpeg,png] media-libs/libjpeg-turbo media-gfx/fbida' + optfeature 'webcollage' 'virtual/imagemagick-tools[jpeg,png] x11-apps/xdpyinfo' + + optfeature_header 'Fonts' + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +}
