diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xscreensaver')
5 files changed, 480 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch b/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch new file mode 100644 index 0000000000..1d0d20da2f --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch @@ -0,0 +1,304 @@ +From f2c592352360e52a7c817a1adcc8b09fd92cd941 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Jul 2022 09:58:24 -0700 +Subject: [PATCH 1/2] Tweak app defaults + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + driver/XScreenSaver.ad.in | 259 +------------------------------------- + 1 file changed, 6 insertions(+), 253 deletions(-) + +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -29,7 +29,7 @@ + ! /* (xrdb prevention kludge: whole file) + + *mode: random +-*timeout: 0:10:00 ++*timeout: 0:15:00 + *cycle: 0:10:00 + *lockTimeout: 0:00:00 + *passwdTimeout: 0:00:30 +@@ -38,7 +38,7 @@ + *dpmsStandby: 2:00:00 + *dpmsSuspend: 2:00:00 + *dpmsOff: 4:00:00 +-*grabDesktopImages: True ++*grabDesktopImages: False + *grabVideoFrames: False + *chooseRandomImages: @DEFAULT_IMAGES_P@ + ! This can be a local directory name, or the URL of an RSS or Atom feed. +@@ -47,11 +47,11 @@ + *memoryLimit: 0 + *lock: False + *verbose: False +-*fade: True ++*fade: False + *unfade: True + *fadeSeconds: 0:00:03 + *fadeTicks: 20 +-*splash: True ++*splash: False + *splashDuration: 0:00:05 + *visualID: default + *installColormap: True +@@ -324,256 +324,8 @@ XScreenSaver.bourneShell: /bin/sh + !============================================================================= + + *programs: \ +- maze -root \n\ +-@GL_KLUDGE@ GL: superquadrics -root \n\ +- attraction -root \n\ +- blitspin -root \n\ +- greynetic -root \n\ +- helix -root \n\ +- hopalong -root \n\ +- imsmap -root \n\ +-- noseguy -root \n\ +-- pyro -root \n\ +- qix -root \n\ +-- rocks -root \n\ +- rorschach -root \n\ +- decayscreen -root \n\ +- flame -root \n\ +- halo -root \n\ +- slidescreen -root \n\ +- pedal -root \n\ +- bouboule -root \n\ +-- braid -root \n\ +- coral -root \n\ +- deco -root \n\ +- drift -root \n\ +-- fadeplot -root \n\ +- galaxy -root \n\ +- goop -root \n\ +- grav -root \n\ +- ifs -root \n\ +-@GL_KLUDGE@ GL: jigsaw -root \n\ +- julia -root \n\ +-- kaleidescope -root \n\ +-@GL_KLUDGE@ GL: moebius -root \n\ +- moire -root \n\ +-@GL_KLUDGE@ GL: morph3d -root \n\ +- mountain -root \n\ +- munch -root \n\ +- penrose -root \n\ +-@GL_KLUDGE@ GL: pipes -root \n\ +- rdbomb -root \n\ +-@GL_KLUDGE@ GL: rubik -root \n\ +-- sierpinski -root \n\ +- slip -root \n\ +-@GL_KLUDGE@ GL: sproingies -root \n\ +- starfish -root \n\ +- strange -root \n\ +- swirl -root \n\ +- triangle -root \n\ +- xjack -root \n\ +- xlyap -root \n\ +-@GL_KLUDGE@ GL: atlantis -root \n\ +- bsod -root \n\ +-@GL_KLUDGE@ GL: bubble3d -root \n\ +-@GL_KLUDGE@ GL: cage -root \n\ +-- crystal -root \n\ +- cynosure -root \n\ +- discrete -root \n\ +- distort -root \n\ +- epicycle -root \n\ +- flow -root \n\ +-@GL_KLUDGE@ GL: glplanet -root \n\ +- interference -root \n\ +- kumppa -root \n\ +-@GL_KLUDGE@ GL: lament -root \n\ +- moire2 -root \n\ +-@GL_KLUDGE@ GL: sonar -root \n\ +-@GL_KLUDGE@ GL: stairs -root \n\ +- truchet -root \n\ +-- vidwhacker -root \n\ +- blaster -root \n\ +- bumps -root \n\ +- ccurve -root \n\ +- compass -root \n\ +- deluxe -root \n\ +-- demon -root \n\ +-@GLE_KLUDGE@ GL: extrusion -root \n\ +-- loop -root \n\ +- penetrate -root \n\ +- petri -root \n\ +- phosphor -root \n\ +-@GL_KLUDGE@ GL: pulsar -root \n\ +- ripples -root \n\ +- shadebobs -root \n\ +-@GL_KLUDGE@ GL: sierpinski3d -root \n\ +- spotlight -root \n\ +- squiral -root \n\ +- wander -root \n\ +-- webcollage -root \n\ +- xflame -root \n\ +- xmatrix -root \n\ +-@GL_KLUDGE@ GL: gflux -root \n\ +-- nerverot -root \n\ +- xrayswarm -root \n\ +- xspirograph -root \n\ +-@GL_KLUDGE@ GL: circuit -root \n\ +-@GL_KLUDGE@ GL: dangerball -root \n\ +-- GL: dnalogo -root \n\ +-@GL_KLUDGE@ GL: engine -root \n\ +-@GL_KLUDGE@ GL: flipscreen3d -root \n\ +-@GL_KLUDGE@ GL: gltext -root \n\ +-@GL_KLUDGE@ GL: menger -root \n\ +-@GL_KLUDGE@ GL: molecule -root \n\ +- rotzoomer -root \n\ +- scooter -root \n\ +- speedmine -root \n\ +-@GL_KLUDGE@ GL: starwars -root \n\ +-@GL_KLUDGE@ GL: stonerview -root \n\ +- vermiculate -root \n\ +- whirlwindwarp -root \n\ +- zoom -root \n\ +- anemone -root \n\ +- apollonian -root \n\ +-@GL_KLUDGE@ GL: boxed -root \n\ +-@GL_KLUDGE@ GL: cubenetic -root \n\ +-@GL_KLUDGE@ GL: endgame -root \n\ +- euler2d -root \n\ +- fluidballs -root \n\ +-@GL_KLUDGE@ GL: flurry -root \n\ +-- GL: glblur -root \n\ +-@GL_KLUDGE@ GL: glsnake -root \n\ +- halftone -root \n\ +-@GL_KLUDGE@ GL: juggler3d -root \n\ +-@GL_KLUDGE@ GL: lavalite -root \n\ +-- polyominoes -root \n\ +-@GL_KLUDGE@ GL: queens -root \n\ +-- GL: sballs -root \n\ +-@GL_KLUDGE@ GL: spheremonics -root \n\ +-- thornbird -root \n\ +- twang -root \n\ +-- GL: antspotlight -root \n\ +- apple2 -root \n\ +-@GL_KLUDGE@ GL: atunnel -root \n\ +- barcode -root \n\ +-@GL_KLUDGE@ GL: blinkbox -root \n\ +-@GL_KLUDGE@ GL: blocktube -root \n\ +-@GL_KLUDGE@ GL: bouncingcow -root \n\ +- cloudlife -root \n\ +-@GL_KLUDGE@ GL: cubestorm -root \n\ +- eruption -root \n\ +-@GL_KLUDGE@ GL: flipflop -root \n\ +-@GL_KLUDGE@ GL: flyingtoasters -root \n\ +- fontglide -root \n\ +-@GL_KLUDGE@ GL: gleidescope -root \n\ +-@GL_KLUDGE@ GL: glknots -root \n\ +-@GL_KLUDGE@ GL: glmatrix -root \n\ +-- GL: glslideshow -root \n\ +-@GL_KLUDGE@ GL: hypertorus -root \n\ +-- GL: jigglypuff -root \n\ +- metaballs -root \n\ +-@GL_KLUDGE@ GL: mirrorblob -root \n\ +- piecewise -root \n\ +-@GL_KLUDGE@ GL: polytopes -root \n\ +- pong -root \n\ +- popsquares -root \n\ +-@GL_KLUDGE@ GL: surfaces -root \n\ +- xanalogtv -root \n\ +- abstractile -root \n\ +- anemotaxis -root \n\ +-- GL: antinspect -root \n\ +- fireworkx -root \n\ +- fuzzyflakes -root \n\ +- interaggregate -root \n\ +- intermomentary -root \n\ +- memscroller -root \n\ +-@GL_KLUDGE@ GL: noof -root \n\ +- pacman -root \n\ +-@GL_KLUDGE@ GL: pinion -root \n\ +-@GL_KLUDGE@ GL: polyhedra -root \n\ +-- GL: providence -root \n\ +- substrate -root \n\ +- wormhole -root \n\ +-- GL: antmaze -root \n\ +-@GL_KLUDGE@ GL: boing -root \n\ +- boxfit -root \n\ +-@GL_KLUDGE@ GL: carousel -root \n\ +- celtic -root \n\ +-@GL_KLUDGE@ GL: crackberg -root \n\ +-@GL_KLUDGE@ GL: cube21 -root \n\ +- fiberlamp -root \n\ +-@GL_KLUDGE@ GL: fliptext -root \n\ +-@GL_KLUDGE@ GL: glhanoi -root \n\ +-@GL_KLUDGE@ GL: tangram -root \n\ +-@GL_KLUDGE@ GL: timetunnel -root \n\ +-@GL_KLUDGE@ GL: glschool -root \n\ +-@GL_KLUDGE@ GL: topblock -root \n\ +-@GL_KLUDGE@ GL: cubicgrid -root \n\ +- cwaves -root \n\ +-@GL_KLUDGE@ GL: gears -root \n\ +-@GL_KLUDGE@ GL: glcells -root \n\ +-@GL_KLUDGE@ GL: lockward -root \n\ +- m6502 -root \n\ +-@GL_KLUDGE@ GL: moebiusgears -root \n\ +-@GL_KLUDGE@ GL: voronoi -root \n\ +-@GL_KLUDGE@ GL: hypnowheel -root \n\ +-@GL_KLUDGE@ GL: klein -root \n\ +-- lcdscrub -root \n\ +-@GL_KLUDGE@ GL: photopile -root \n\ +-@GL_KLUDGE@ GL: skytentacles -root \n\ +-@GL_KLUDGE@ GL: rubikblocks -root \n\ +-@GL_KLUDGE@ GL: companioncube -root \n\ +-@GL_KLUDGE@ GL: hilbert -root \n\ +-@GL_KLUDGE@ GL: tronbit -root \n\ +-@GL_KLUDGE@ GL: geodesic -root \n\ +- hexadrop -root \n\ +-@GL_KLUDGE@ GL: kaleidocycle -root \n\ +-@GL_KLUDGE@ GL: quasicrystal -root \n\ +-@GL_KLUDGE@ GL: unknownpleasures -root \n\ +- binaryring -root \n\ +-@GL_KLUDGE@ GL: cityflow -root \n\ +-@GL_KLUDGE@ GL: geodesicgears -root \n\ +-@GL_KLUDGE@ GL: projectiveplane -root \n\ +-@GL_KLUDGE@ GL: romanboy -root \n\ +- tessellimage -root \n\ +-@GL_KLUDGE@ GL: winduprobot -root \n\ +-@GL_KLUDGE@ GL: splitflap -root \n\ +-@GL_KLUDGE@ GL: cubestack -root \n\ +-@GL_KLUDGE@ GL: cubetwist -root \n\ +-@GL_KLUDGE@ GL: discoball -root \n\ +-@GL_KLUDGE@ GL: dymaxionmap -root \n\ +-@GL_KLUDGE@ GL: energystream -root \n\ +-@GL_KLUDGE@ GL: hexstrut -root \n\ +-@GL_KLUDGE@ GL: hydrostat -root \n\ +-@GL_KLUDGE@ GL: raverhoop -root \n\ +-@GL_KLUDGE@ GL: splodesic -root \n\ +-@GL_KLUDGE@ GL: unicrud -root \n\ +-@GL_KLUDGE@ GL: esper -root \n\ +-@GL_KLUDGE@ GL: vigilance -root \n\ +-@GL_KLUDGE@ GL: crumbler -root \n\ +- filmleader -root \n\ +- glitchpeg -root \n\ +-@GL_KLUDGE@ GL: handsy -root \n\ +-@GL_KLUDGE@ GL: maze3d -root \n\ +-@GL_KLUDGE@ GL: peepers -root \n\ +-@GL_KLUDGE@ GL: razzledazzle -root \n\ +- vfeedback -root \n\ +-@GL_KLUDGE@ GL: deepstars -root \n\ +-@GL_KLUDGE@ GL: gravitywell -root \n\ +-@GL_KLUDGE@ GL: beats -root \n\ +-@GL_KLUDGE@ GL: covid19 -root \n\ +-@GL_KLUDGE@ GL: etruscanvenus -root \n\ +-@GL_KLUDGE@ GL: gibson -root \n\ +-@GL_KLUDGE@ GL: headroom -root \n\ +-@GL_KLUDGE@ GL: sphereeversion -root \n\ +- binaryhorizon -root \n\ +- marbling -root \n\ +-@GL_KLUDGE@ GL: chompytower -root \n\ +-@GL_KLUDGE@ GL: mapscroller -root \n\ +-@GL_KLUDGE@ GL: nakagin -root \n\ +-@GL_KLUDGE@ GL: squirtorus -root \n +- +- ++- fontglide -root -program "date +'%F %H:%M %z'" ++ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif + + !============================================================================= + ! diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch new file mode 100644 index 0000000000..ea3f25a2f2 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch @@ -0,0 +1,47 @@ +From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 17 Jul 2022 09:47:35 -0700 +Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs + +These are just warnings + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c4fd38f..d7463cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4522,7 +4522,6 @@ fi + if test "$gtk_halfassed" != no ; then + warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK" + warn2 "can't be used." +- CONF_STATUS=1 + + if ( echo $gtk_halfassed_lib | grep -qi pixbuf-xlib ); then + echo '' +@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +- CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then + CONF_STATUS=1 + elif test "$with_gl_req" = no ; then + noteL 'The OpenGL 3D library is not being used.' +- CONF_STATUS=1 + else + noteL 'The OpenGL 3D library was not found.' +- CONF_STATUS=1 + fi + + if test "$gl_halfassed" = yes ; then +-- +2.37.1 + diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch b/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch new file mode 100644 index 0000000000..0ceba7be02 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch @@ -0,0 +1,53 @@ +From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Jul 2022 09:59:40 -0700 +Subject: [PATCH 2/2] build: Do not build po files + +Fixes +| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po' +| make[1]: *** No rule to make target 'default'. Stop. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.in | 5 ++--- + driver/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 9de79b2..1c1d16c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -6,8 +6,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \ +- driver po ++SUBDIRS = utils jwxyz hacks/images hacks hacks/fonts \ ++ driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking INSTALL \ + configure configure.ac Makefile.in config.h.in \ +@@ -461,4 +461,3 @@ cerebrum:: + --include 'ad2c' \ + --include '*/' \ + --exclude '*' +- +diff --git a/driver/Makefile.in b/driver/Makefile.in +index e1fa1b2..feca6fc 100644 +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -211,7 +211,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +-EXES = xscreensaver xscreensaver-command xscreensaver-settings ++EXES = xscreensaver xscreensaver-command + UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ + SETUID_EXES = xscreensaver-auth + DEMO_EXES = @ALL_DEMO_PROGRAMS@ +-- +2.37.1 + diff --git a/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service b/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service new file mode 100755 index 0000000000..17dfe75ef1 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service @@ -0,0 +1,14 @@ +[Unit] +Description=Xscreensaver service +PartOf=xserver-nodm.service +After=xserver-nodm.service + +[Service] +ExecStart=/usr/bin/xscreensaver +Environment="DISPLAY=:0" +User=xuser +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb new file mode 100644 index 0000000000..dc909ed78c --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb @@ -0,0 +1,62 @@ +SUMMARY = "X screen saver and locker" +HOMEPAGE = "https://www.jwz.org/xscreensaver/" +LICENSE = "0BSD" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51" + +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz \ + file://xscreensaver.service \ + file://0001-Tweak-app-defaults.patch \ + file://0002-build-Do-not-build-po-files.patch \ + file://0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch \ +" +MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomeration/${BPN}" + +SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" + +DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" +# These are only needed as part of the stopgap screensaver implementation: +RDEPENDS:${PN} = " \ + liberation-fonts \ + xuser-account \ +" + +inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check + + +EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} --with-pam --with-login-manager" + +EXTRA_OEMAKE += "install_prefix=${D} GTK_DATADIR=${datadir}" +REQUIRED_DISTRO_FEATURES = "x11 pam" + +PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" + +PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" +PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" + +CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}" +EXTRA_OECONF:remove = "--disable-static" + +do_install:append() { + install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service + for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker + do + sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f + done +} + +PACKAGES =+ "${PN}-perl" + +FILES:${PN}-perl = "\ + ${libexecdir}/${PN}/xscreensaver-getimage-file \ + ${libexecdir}/${PN}/xscreensaver-getimage-video \ + ${libexecdir}/${PN}/webcollage \ + ${libexecdir}/${PN}/xscreensaver-text \ + ${libexecdir}/${PN}/vidwhacker \ + " +FILES:${PN} += "${datadir}/X11/app-defaults/XScreenSaver ${datadir}/fonts" +SYSTEMD_SERVICE:${PN} = "xscreensaver.service" + +RDEPENDS:${PN}-perl = "perl" + +CLEANBROKEN = "1" |