summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch44
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch100
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch18
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb36
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb53
5 files changed, 108 insertions, 143 deletions
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch b/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
new file mode 100644
index 0000000000..7703a43204
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
@@ -0,0 +1,44 @@
1From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 8 Jul 2021 15:40:10 -0700
4Subject: [PATCH] build: Do not build po files
5
6Fixes
7| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po'
8| make[1]: *** No rule to make target 'default'. Stop.
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Makefile.in | 3 +--
14 1 file changed, 1 insertion(+), 2 deletions(-)
15
16--- a/Makefile.in
17+++ b/Makefile.in
18@@ -6,8 +6,8 @@ srcdir = @srcdir@
19 VPATH = @srcdir@
20
21 SHELL = /bin/sh
22-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \
23- driver po
24+SUBDIRS = utils jwxyz hacks/images hacks hacks/fonts \
25+ driver
26 SUBDIRS2 = $(SUBDIRS) OSX android
27 TARFILES = README README.hacking INSTALL \
28 configure configure.ac Makefile.in config.h.in \
29@@ -451,4 +451,3 @@ cerebrum::
30 --include 'configure*' \
31 --include '*/' \
32 --exclude '*'
33-
34--- a/driver/Makefile.in
35+++ b/driver/Makefile.in
36@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid
37 xdpyinfo test-screens test-yarandom test-xinput \
38 test-xkb
39
40-EXES = xscreensaver xscreensaver-command xscreensaver-settings
41+EXES = xscreensaver xscreensaver-command
42 UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@
43 SETUID_EXES = xscreensaver-auth
44 DEMO_EXES = @ALL_DEMO_PROGRAMS@
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
deleted file mode 100644
index afc8bc8e74..0000000000
--- a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1--- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000
2+++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000
3@@ -14,6 +14,9 @@
4 #
5 ###############################################################################
6
7+includedir=''
8+libdir=''
9+
10 AH_TOP([
11 /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski.
12 *
13diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in
14--- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000
15+++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000
16@@ -10,7 +10,7 @@
17 top_srcdir = @top_srcdir@
18 top_builddir = ..
19
20-install_prefix =
21+install_prefix = ${DESTDIR}
22 prefix = @prefix@
23 exec_prefix = @exec_prefix@
24 bindir = @bindir@
25@@ -228,7 +228,7 @@
26 SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \
27 xscreensaver-text
28 SCRIPTS_OSX = xscreensaver-getimage-desktop
29-SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
30+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
31
32 HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
33 xscreensaver.h prefs.h remote.h exec.h \
34diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in
35--- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000
36+++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000
37@@ -10,7 +10,7 @@
38 top_srcdir = @top_srcdir@
39 top_builddir = ..
40
41-install_prefix =
42+install_prefix = ${DESTDIR}
43 prefix = @prefix@
44 exec_prefix = @exec_prefix@
45 bindir = @bindir@
46@@ -124,7 +124,7 @@
47 tessellimage.c delaunay.c recanim.c binaryring.c \
48 glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \
49 webcollage-helper-cocoa.m testx11.c
50-SCRIPTS = vidwhacker webcollage ljlatest
51+#SCRIPTS = vidwhacker webcollage ljlatest
52
53 # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
54 # but that are not shipped with xscreensaver itself.
55@@ -166,7 +166,13 @@
56 tessellimage.o delaunay.o recanim.o binaryring.o \
57 glitchpeg.o vfeedback.o scooter.o testx11.o
58
59-EXES = attraction blitspin bouboule braid decayscreen deco \
60+EXES = fontglide
61+JPEG_EXES = webcollage-helper
62+
63+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
64+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \
65+ whirlygig worm xsublim juggle testx11 \
66+ attraction blitspin bouboule braid decayscreen deco \
67 drift flame galaxy grav greynetic halo \
68 helix hopalong ifs imsmap julia kaleidescope \
69 maze moire noseguy pedal \
70@@ -182,17 +188,12 @@
71 speedmine vermiculate twang apollonian euler2d \
72 polyominoes thornbird fluidballs anemone halftone \
73 metaballs eruption popsquares barcode piecewise cloudlife \
74- fontglide apple2 xanalogtv pong filmleader wormhole \
75+ apple2 xanalogtv pong filmleader wormhole \
76 pacman fuzzyflakes anemotaxis memscroller substrate \
77 intermomentary fireworkx fiberlamp boxfit interaggregate \
78 celtic cwaves m6502 abstractile lcdscrub hexadrop \
79 tessellimage binaryring glitchpeg vfeedback scooter \
80 @JPEG_EXES@
81-JPEG_EXES = webcollage-helper
82-
83-RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
84- lightning lisa lissie lmorph rotor sphere spiral t3d vines \
85- whirlygig worm xsublim juggle testx11
86
87 HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
88 $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \
89diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in
90--- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000
91+++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000
92@@ -6,7 +6,7 @@
93 VPATH = @srcdir@
94
95 SHELL = /bin/sh
96-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po
97+SUBDIRS = utils jwxyz hacks/images hacks driver
98 SUBDIRS2 = $(SUBDIRS) OSX android
99 TARFILES = README README.hacking README.VMS INSTALL \
100 configure configure.in Makefile.in config.h.in \
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
index 0f2e09aec7..4ce2faed5d 100644
--- a/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
+++ b/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
@@ -1,5 +1,5 @@
1--- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000 1--- a/driver/XScreenSaver.ad.in
2+++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000 2+++ b/driver/XScreenSaver.ad.in
3@@ -29,7 +29,7 @@ 3@@ -29,7 +29,7 @@
4 ! /* (xrdb prevention kludge: whole file) 4 ! /* (xrdb prevention kludge: whole file)
5 5
@@ -18,13 +18,13 @@
18 *grabVideoFrames: False 18 *grabVideoFrames: False
19 *chooseRandomImages: @DEFAULT_IMAGES_P@ 19 *chooseRandomImages: @DEFAULT_IMAGES_P@
20 ! This can be a local directory name, or the URL of an RSS or Atom feed. 20 ! This can be a local directory name, or the URL of an RSS or Atom feed.
21@@ -48,11 +48,11 @@ 21@@ -47,11 +47,11 @@
22 *memoryLimit: 0
22 *lock: False 23 *lock: False
23 *verbose: False 24 *verbose: False
24 *timestamp: True
25-*fade: True 25-*fade: True
26+*fade: False 26+*fade: False
27 *unfade: False 27 *unfade: True
28 *fadeSeconds: 0:00:03 28 *fadeSeconds: 0:00:03
29 *fadeTicks: 20 29 *fadeTicks: 20
30-*splash: True 30-*splash: True
@@ -32,7 +32,7 @@
32 *splashDuration: 0:00:05 32 *splashDuration: 0:00:05
33 *visualID: default 33 *visualID: default
34 *installColormap: True 34 *installColormap: True
35@@ -343,246 +343,8 @@ 35@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh
36 !============================================================================= 36 !=============================================================================
37 37
38 *programs: \ 38 *programs: \
@@ -272,8 +272,12 @@
272- vfeedback -root \n\ 272- vfeedback -root \n\
273-@GL_KLUDGE@ GL: deepstars -root \n\ 273-@GL_KLUDGE@ GL: deepstars -root \n\
274-@GL_KLUDGE@ GL: gravitywell -root \n\ 274-@GL_KLUDGE@ GL: gravitywell -root \n\
275-@GL_KLUDGE@ GL: beats -root \n\
276-@GL_KLUDGE@ GL: covid19 -root \n\
275-@GL_KLUDGE@ GL: etruscanvenus -root \n\ 277-@GL_KLUDGE@ GL: etruscanvenus -root \n\
276-@GL_KLUDGE@ GL: gibson -root \n 278-@GL_KLUDGE@ GL: gibson -root \n\
279-@GL_KLUDGE@ GL: headroom -root \n\
280-@GL_KLUDGE@ GL: sphereeversion -root \n
277- 281-
278- 282-
279+- fontglide -root -program "date +'%F %H:%M %z'" 283+- fontglide -root -program "date +'%F %H:%M %z'"
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb
deleted file mode 100644
index 9131c754d5..0000000000
--- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SUMMARY = "X screen saver and locker"
2HOMEPAGE = "https://www.jwz.org/xscreensaver/"
3LICENSE = "BSD-0-Clause"
4LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463"
5
6SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
7SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba"
8SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95"
9
10SRC_URI += " \
11 file://xscreensaver.service \
12 file://fix-buildscripts.patch \
13 file://tweak-app-defaults.patch \
14"
15
16DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
17# These are only needed as part of the stopgap screensaver implementation:
18RDEPENDS_${PN} = " \
19 liberation-fonts \
20 xuser-account \
21"
22
23inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check
24
25EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults"
26
27REQUIRED_DISTRO_FEATURES = "x11"
28
29do_install_append() {
30 install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
31}
32
33FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver"
34SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
35
36CLEANBROKEN = "1"
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
new file mode 100644
index 0000000000..d67e05844f
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
@@ -0,0 +1,53 @@
1SUMMARY = "X screen saver and locker"
2HOMEPAGE = "https://www.jwz.org/xscreensaver/"
3LICENSE = "BSD-0-Clause"
4LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51"
5
6SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
7SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b"
8
9SRC_URI += " \
10 file://xscreensaver.service \
11 file://0001-build-Do-not-build-po-files.patch \
12 file://tweak-app-defaults.patch \
13"
14
15DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam"
16# These are only needed as part of the stopgap screensaver implementation:
17RDEPENDS_${PN} = " \
18 liberation-fonts \
19 xuser-account \
20"
21
22inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check
23
24
25EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \
26 --includedir=${STAGING_INCDIR} --with-pam --with-login-manager"
27
28EXTRA_OEMAKE += "install_prefix=${D}"
29REQUIRED_DISTRO_FEATURES = "x11 pam"
30
31do_install_append() {
32 install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
33 for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker
34 do
35 sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f
36 done
37}
38
39PACKAGES =+ "${PN}-perl"
40
41FILES_${PN}-perl = "\
42 ${libexecdir}/${PN}/xscreensaver-getimage-file \
43 ${libexecdir}/${PN}/xscreensaver-getimage-video \
44 ${libexecdir}/${PN}/webcollage \
45 ${libexecdir}/${PN}/xscreensaver-text \
46 ${libexecdir}/${PN}/vidwhacker \
47 "
48FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver ${datadir}/fonts"
49SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
50
51RDEPENDS_${PN}-perl = "perl"
52
53CLEANBROKEN = "1"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-21 05:50:16 +0000