helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-28 23:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

xscreensaver: Upgrade 5.39 -> 5.44

Browse Source 
Upgrade to release 5.44. Rebase patches for fixing build scripts
and app defaults. Change the license checksum due to update of the
year. Add xuser-account as a run-time dependency because the
systemd service runs as xuser and fails if such user doesn't
exist. The new release brings:

- New hacks, `gibson', `etruscanvenus' and `scooter'.
- New color options in `romanboy', `projectiveplane', `hypertorus'
  and `klein'.
- X11: Always use $HOME/.xscreensaver, not getpwuid's directory.
- Various bug fixes.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Leon Anavi 2020-06-16 18:24:12 +03:00 committed by Khem Raj
parent fdbfb6ce99
commit 4d5162a030
3 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
View File

@ -1,5 +1,5 @@
--- xscreensaver-5.39.orig/configure.in --- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000
+++ xscreensaver-5.39/configure.in +++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000
@@ -14,6 +14,9 @@ @@ -14,6 +14,9 @@
# #
############################################################################### ###############################################################################
@ -10,38 +10,9 @@
AH_TOP([ AH_TOP([
/* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski.
* *
@@ -422,12 +425,12 @@ diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in
--- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000
OBJCC="$CC" +++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000
- AC_MSG_CHECKING([whether the compiler works on ANSI C])
- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
+# AC_MSG_CHECKING([whether the compiler works on ANSI C])
+# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
+# AC_MSG_RESULT(yes),
+# AC_MSG_RESULT(no)
+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
if test -n "$GCC"; then
AC_MSG_RESULT(Turning on gcc compiler warnings.)
--- xscreensaver-5.39.orig/Makefile.in
+++ xscreensaver-5.39/Makefile.in
@@ -6,7 +6,7 @@
VPATH = @srcdir@
SHELL = /bin/sh
-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po
+SUBDIRS = utils jwxyz hacks/images hacks driver
SUBDIRS2 = $(SUBDIRS) OSX android
TARFILES = README README.hacking README.VMS INSTALL \
configure configure.in Makefile.in config.h.in \
--- xscreensaver-5.39.orig/driver/Makefile.in
+++ xscreensaver-5.39/driver/Makefile.in
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = .. top_builddir = ..
@ -51,7 +22,7 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
@@ -221,7 +221,7 @@ @@ -228,7 +228,7 @@
SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \
xscreensaver-text xscreensaver-text
SCRIPTS_OSX = xscreensaver-getimage-desktop SCRIPTS_OSX = xscreensaver-getimage-desktop
@ -60,8 +31,9 @@
HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
xscreensaver.h prefs.h remote.h exec.h \ xscreensaver.h prefs.h remote.h exec.h \
--- xscreensaver-5.39.orig/hacks/Makefile.in diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in
+++ xscreensaver-5.39/hacks/Makefile.in --- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000
+++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = .. top_builddir = ..
@ -71,40 +43,40 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
@@ -122,7 +122,7 @@ @@ -124,7 +124,7 @@
asm6502.c abstractile.c lcdscrub.c hexadrop.c \
tessellimage.c delaunay.c recanim.c binaryring.c \ tessellimage.c delaunay.c recanim.c binaryring.c \
webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \
webcollage-helper-cocoa.m testx11.c
-SCRIPTS = vidwhacker webcollage ljlatest -SCRIPTS = vidwhacker webcollage ljlatest
+#SCRIPTS = vidwhacker webcollage ljlatest +#SCRIPTS = vidwhacker webcollage ljlatest
# Programs that are mentioned in XScreenSaver.ad, and that have XML files, # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
# but that are not shipped with xscreensaver itself. # but that are not shipped with xscreensaver itself.
@@ -163,7 +163,13 @@ @@ -166,7 +166,13 @@
lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ tessellimage.o delaunay.o recanim.o binaryring.o \
binaryring.o testx11.o glitchpeg.o vfeedback.o scooter.o testx11.o
-EXES = attraction blitspin bouboule braid decayscreen deco \ -EXES = attraction blitspin bouboule braid decayscreen deco \
+EXES = fontglide +EXES = fontglide
+JPEG_EXES = webcollage-helper +JPEG_EXES = webcollage-helper
+ +
+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ +RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ + lightning lisa lissie lmorph rotor sphere spiral t3d vines \
+ whirlygig worm xsublim juggle testx11 \ + whirlygig worm xsublim juggle testx11 \
+ attraction blitspin bouboule braid decayscreen deco \ + attraction blitspin bouboule braid decayscreen deco \
drift flame galaxy grav greynetic halo \ drift flame galaxy grav greynetic halo \
helix hopalong ifs imsmap julia kaleidescope \ helix hopalong ifs imsmap julia kaleidescope \
maze moire noseguy pedal \ maze moire noseguy pedal \
@@ -179,17 +185,12 @@ @@ -182,17 +188,12 @@
speedmine vermiculate twang apollonian euler2d \ speedmine vermiculate twang apollonian euler2d \
polyominoes thornbird fluidballs anemone halftone \ polyominoes thornbird fluidballs anemone halftone \
metaballs eruption popsquares barcode piecewise cloudlife \ metaballs eruption popsquares barcode piecewise cloudlife \
- fontglide apple2 xanalogtv pong wormhole \ - fontglide apple2 xanalogtv pong filmleader wormhole \
+ apple2 xanalogtv pong wormhole \ + apple2 xanalogtv pong filmleader wormhole \
pacman fuzzyflakes anemotaxis memscroller substrate \ pacman fuzzyflakes anemotaxis memscroller substrate \
intermomentary fireworkx fiberlamp boxfit interaggregate \ intermomentary fireworkx fiberlamp boxfit interaggregate \
celtic cwaves m6502 abstractile lcdscrub hexadrop \ celtic cwaves m6502 abstractile lcdscrub hexadrop \
tessellimage binaryring \ tessellimage binaryring glitchpeg vfeedback scooter \
@JPEG_EXES@ @JPEG_EXES@
-JPEG_EXES = webcollage-helper -JPEG_EXES = webcollage-helper
- -
@ -114,3 +86,15 @@
HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
$(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \
diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in
--- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000
+++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000
@@ -6,7 +6,7 @@
VPATH = @srcdir@
SHELL = /bin/sh
-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po
+SUBDIRS = utils jwxyz hacks/images hacks driver
SUBDIRS2 = $(SUBDIRS) OSX android
TARFILES = README README.hacking README.VMS INSTALL \
configure configure.in Makefile.in config.h.in \

30
meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
View File

@ -1,5 +1,5 @@
--- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in --- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000
+++ xscreensaver-5.39/driver/XScreenSaver.ad.in +++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
! /* (xrdb prevention kludge: whole file) ! /* (xrdb prevention kludge: whole file)
@ -31,10 +31,10 @@
+*splash: False +*splash: False
*splashDuration: 0:00:05 *splashDuration: 0:00:05
*visualID: default *visualID: default
*captureStderr: True *installColormap: True
@@ -158,236 +158,8 @@ @@ -343,246 +343,8 @@
! screen savers interactively. !=============================================================================
!
*programs: \ *programs: \
- maze -root \n\ - maze -root \n\
-@GL_KLUDGE@ GL: superquadrics -root \n\ -@GL_KLUDGE@ GL: superquadrics -root \n\
@ -138,6 +138,7 @@
-@GL_KLUDGE@ GL: menger -root \n\ -@GL_KLUDGE@ GL: menger -root \n\
-@GL_KLUDGE@ GL: molecule -root \n\ -@GL_KLUDGE@ GL: molecule -root \n\
- rotzoomer -root \n\ - rotzoomer -root \n\
- scooter -root \n\
- speedmine -root \n\ - speedmine -root \n\
-@GL_KLUDGE@ GL: starwars -root \n\ -@GL_KLUDGE@ GL: starwars -root \n\
-@GL_KLUDGE@ GL: stonerview -root \n\ -@GL_KLUDGE@ GL: stonerview -root \n\
@ -262,12 +263,21 @@
-@GL_KLUDGE@ GL: esper -root \n\ -@GL_KLUDGE@ GL: esper -root \n\
-@GL_KLUDGE@ GL: vigilance -root \n\ -@GL_KLUDGE@ GL: vigilance -root \n\
-@GL_KLUDGE@ GL: crumbler -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: maze3d -root \n\
-@GL_KLUDGE@ GL: peepers -root \n\ -@GL_KLUDGE@ GL: peepers -root \n\
-@GL_KLUDGE@ GL: razzledazzle -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: etruscanvenus -root \n\
-@GL_KLUDGE@ GL: gibson -root \n
- -
+- fontglide -root -program "date +'%F %H:%M %z'" \n\ -
+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n +- fontglide -root -program "date +'%F %H:%M %z'"
+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif
!============================================================================= !=============================================================================
!

11
meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb → meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb
View File

@ -1,11 +1,11 @@
SUMMARY = "X screen saver and locker" SUMMARY = "X screen saver and locker"
LICENSE = "BSD-0-Clause" LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463"
SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
SRC_URI[md5sum] = "a5da62b91271f4e8afcc73d44697364b" SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba"
SRC_URI[sha256sum] = "48ce1880f18b5321182be0c033aeceb5ec5628a1505b9d1ff69dbf06093c2426" SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95"
SRC_URI += " \ SRC_URI += " \
file://xscreensaver.service \ file://xscreensaver.service \
@ -15,7 +15,10 @@ SRC_URI += " \
DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
# These are only needed as part of the stopgap screensaver implementation: # These are only needed as part of the stopgap screensaver implementation:
RDEPENDS_${PN} += "liberation-fonts" RDEPENDS_${PN} = " \
liberation-fonts \
xuser-account \
"
inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check