commit: 107fa148a3aa88d8ecf85236c1c526e18ec5938e Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Sat Jan 8 12:41:01 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Jan 8 12:49:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107fa148
x11-misc/xscreensaver: add 6.02 Closes: https://bugs.gentoo.org/822372 Closes: https://bugs.gentoo.org/828869 Closes: https://bugs.gentoo.org/811885 Closes: https://bugs.gentoo.org/809599 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> x11-misc/xscreensaver/Manifest | 1 + x11-misc/xscreensaver/metadata.xml | 2 + x11-misc/xscreensaver/xscreensaver-6.02.ebuild | 238 +++++++++++++++++++++++++ 3 files changed, 241 insertions(+) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index b90a0a6ec0d8..696909ec57ea 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1 +1,2 @@ DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a +DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index 41a55d69ca62..e6446e8ce0e8 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -12,6 +12,8 @@ <flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag> <flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag> <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> + <flag name="gles" restrict=">=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag> + <flag name="glx" restrict=">=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag> <flag name="locking">Compile in support for locking the display</flag> <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> </use> diff --git a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild new file mode 100644 index 000000000000..c32955e7c5e9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic font multilib optfeature pam + +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"; + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama" +REQUIRED_USE=" + gdk-pixbuf? ( gtk ) + gles? ( !glx opengl ) + glx? ( opengl ) + gtk? ( png ) + opengl? ( png ) + elogind? ( !systemd ) +" + +COMMON_DEPEND=" + dev-libs/libxml2 + media-libs/netpbm + virtual/libcrypt:= + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + xft? ( x11-libs/libXft ) + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + gdk-pixbuf? ( + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + ) + gtk? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( sys-libs/pam ) + png? ( media-libs/libpng:= ) + systemd? ( >=sys-apps/systemd-221 ) + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-6.01-interix.patch + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-5.45-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-gtk-detection.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +) + +DOCS=( README{,.hacking} ) + +src_prepare() { + default + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + 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 + fi + + # 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 gles) + $(use_with glx) + $(use_with gtk) + $(use_with new-login login-manager) + $(use_with opengl gl) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=$(usex png yes no) + --with-xft=$(usex xft yes no) + --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-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --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}" install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die + + # 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 -v "${ED}${FONTDIR}"/*.{ttf,otf} || die + rmdir -v "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + rm -f "${ED}/etc/pam.d/xscreensaver" # install our version instead + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + # bugs #809599, #828869 + if ! use gtk; then + rm -f "${ED}/usr/bin/xscreensaver-demo" + fi + + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx && use opengl; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + 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 +} + +pkg_postrm() { + use fonts && font_pkg_postrm +}
