summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorParthiban Nallathambi <pn@denx.de>2018-11-06 16:57:12 +0100
committerArmin Kuster <akuster808@gmail.com>2018-11-15 13:18:51 -0800
commitf0d6a6b3551aaafdf52433d614931e389fc49bef (patch)
treed0204504dc480017f77b13e9a2d2405a53327125
parente7281c9dd4402333c3775648e0cedab01d92df1a (diff)
downloadmeta-openembedded-f0d6a6b3551aaafdf52433d614931e389fc49bef.tar.gz
Adding support for xscreensaver-5.39
- This patch enables the support for xscreensaver 5.39 version - xscreensaver.service created for the system with systemd Signed-off-by: Parthiban Nallathambi <pn@denx.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch116
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch273
-rwxr-xr-xmeta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service14
-rw-r--r--meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb25
4 files changed, 428 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
new file mode 100644
index 000000000..3a50eff83
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
@@ -0,0 +1,116 @@
1--- xscreensaver-5.39.orig/configure.in
2+++ xscreensaver-5.39/configure.in
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 *
13@@ -422,12 +425,12 @@
14
15 OBJCC="$CC"
16
17- AC_MSG_CHECKING([whether the compiler works on ANSI C])
18- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
19- AC_MSG_RESULT(yes),
20- AC_MSG_RESULT(no)
21- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
22- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
23+# AC_MSG_CHECKING([whether the compiler works on ANSI C])
24+# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
25+# AC_MSG_RESULT(yes),
26+# AC_MSG_RESULT(no)
27+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.),
28+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.))
29
30 if test -n "$GCC"; then
31 AC_MSG_RESULT(Turning on gcc compiler warnings.)
32--- xscreensaver-5.39.orig/Makefile.in
33+++ xscreensaver-5.39/Makefile.in
34@@ -6,7 +6,7 @@
35 VPATH = @srcdir@
36
37 SHELL = /bin/sh
38-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po
39+SUBDIRS = utils jwxyz hacks/images hacks driver
40 SUBDIRS2 = $(SUBDIRS) OSX android
41 TARFILES = README README.hacking README.VMS INSTALL \
42 configure configure.in Makefile.in config.h.in \
43--- xscreensaver-5.39.orig/driver/Makefile.in
44+++ xscreensaver-5.39/driver/Makefile.in
45@@ -10,7 +10,7 @@
46 top_srcdir = @top_srcdir@
47 top_builddir = ..
48
49-install_prefix =
50+install_prefix = ${DESTDIR}
51 prefix = @prefix@
52 exec_prefix = @exec_prefix@
53 bindir = @bindir@
54@@ -221,7 +221,7 @@
55 SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \
56 xscreensaver-text
57 SCRIPTS_OSX = xscreensaver-getimage-desktop
58-SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
59+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
60
61 HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
62 xscreensaver.h prefs.h remote.h exec.h \
63--- xscreensaver-5.39.orig/hacks/Makefile.in
64+++ xscreensaver-5.39/hacks/Makefile.in
65@@ -10,7 +10,7 @@
66 top_srcdir = @top_srcdir@
67 top_builddir = ..
68
69-install_prefix =
70+install_prefix = ${DESTDIR}
71 prefix = @prefix@
72 exec_prefix = @exec_prefix@
73 bindir = @bindir@
74@@ -122,7 +122,7 @@
75 asm6502.c abstractile.c lcdscrub.c hexadrop.c \
76 tessellimage.c delaunay.c recanim.c binaryring.c \
77 webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c
78-SCRIPTS = vidwhacker webcollage ljlatest
79+#SCRIPTS = vidwhacker webcollage ljlatest
80
81 # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
82 # but that are not shipped with xscreensaver itself.
83@@ -163,7 +163,13 @@
84 lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \
85 binaryring.o testx11.o
86
87-EXES = attraction blitspin bouboule braid decayscreen deco \
88+EXES = fontglide
89+JPEG_EXES = webcollage-helper
90+
91+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
92+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \
93+ whirlygig worm xsublim juggle testx11 \
94+ attraction blitspin bouboule braid decayscreen deco \
95 drift flame galaxy grav greynetic halo \
96 helix hopalong ifs imsmap julia kaleidescope \
97 maze moire noseguy pedal \
98@@ -179,17 +185,12 @@
99 speedmine vermiculate twang apollonian euler2d \
100 polyominoes thornbird fluidballs anemone halftone \
101 metaballs eruption popsquares barcode piecewise cloudlife \
102- fontglide apple2 xanalogtv pong wormhole \
103+ apple2 xanalogtv pong wormhole \
104 pacman fuzzyflakes anemotaxis memscroller substrate \
105 intermomentary fireworkx fiberlamp boxfit interaggregate \
106 celtic cwaves m6502 abstractile lcdscrub hexadrop \
107 tessellimage binaryring \
108 @JPEG_EXES@
109-JPEG_EXES = webcollage-helper
110-
111-RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
112- lightning lisa lissie lmorph rotor sphere spiral t3d vines \
113- whirlygig worm xsublim juggle testx11
114
115 HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
116 $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
new file mode 100644
index 000000000..099a0b2f4
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
@@ -0,0 +1,273 @@
1--- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in
2+++ xscreensaver-5.39/driver/XScreenSaver.ad.in
3@@ -29,7 +29,7 @@
4 ! /* (xrdb prevention kludge: whole file)
5
6 *mode: random
7-*timeout: 0:10:00
8+*timeout: 0:15:00
9 *cycle: 0:10:00
10 *lockTimeout: 0:00:00
11 *passwdTimeout: 0:00:30
12@@ -38,7 +38,7 @@
13 *dpmsStandby: 2:00:00
14 *dpmsSuspend: 2:00:00
15 *dpmsOff: 4:00:00
16-*grabDesktopImages: True
17+*grabDesktopImages: False
18 *grabVideoFrames: False
19 *chooseRandomImages: @DEFAULT_IMAGES_P@
20 ! This can be a local directory name, or the URL of an RSS or Atom feed.
21@@ -48,11 +48,11 @@
22 *lock: False
23 *verbose: False
24 *timestamp: True
25-*fade: True
26+*fade: False
27 *unfade: False
28 *fadeSeconds: 0:00:03
29 *fadeTicks: 20
30-*splash: True
31+*splash: False
32 *splashDuration: 0:00:05
33 *visualID: default
34 *captureStderr: True
35@@ -158,236 +158,8 @@
36 ! screen savers interactively.
37 !
38 *programs: \
39- maze -root \n\
40-@GL_KLUDGE@ GL: superquadrics -root \n\
41- attraction -root \n\
42- blitspin -root \n\
43- greynetic -root \n\
44- helix -root \n\
45- hopalong -root \n\
46- imsmap -root \n\
47-- noseguy -root \n\
48-- pyro -root \n\
49- qix -root \n\
50-- rocks -root \n\
51- rorschach -root \n\
52- decayscreen -root \n\
53- flame -root \n\
54- halo -root \n\
55- slidescreen -root \n\
56- pedal -root \n\
57- bouboule -root \n\
58-- braid -root \n\
59- coral -root \n\
60- deco -root \n\
61- drift -root \n\
62-- fadeplot -root \n\
63- galaxy -root \n\
64- goop -root \n\
65- grav -root \n\
66- ifs -root \n\
67-@GL_KLUDGE@ GL: jigsaw -root \n\
68- julia -root \n\
69-- kaleidescope -root \n\
70-@GL_KLUDGE@ GL: moebius -root \n\
71- moire -root \n\
72-@GL_KLUDGE@ GL: morph3d -root \n\
73- mountain -root \n\
74- munch -root \n\
75- penrose -root \n\
76-@GL_KLUDGE@ GL: pipes -root \n\
77- rd-bomb -root \n\
78-@GL_KLUDGE@ GL: rubik -root \n\
79-- sierpinski -root \n\
80- slip -root \n\
81-@GL_KLUDGE@ GL: sproingies -root \n\
82- starfish -root \n\
83- strange -root \n\
84- swirl -root \n\
85- triangle -root \n\
86- xjack -root \n\
87- xlyap -root \n\
88-@GL_KLUDGE@ GL: atlantis -root \n\
89- bsod -root \n\
90-@GL_KLUDGE@ GL: bubble3d -root \n\
91-@GL_KLUDGE@ GL: cage -root \n\
92-- crystal -root \n\
93- cynosure -root \n\
94- discrete -root \n\
95- distort -root \n\
96- epicycle -root \n\
97- flow -root \n\
98-@GL_KLUDGE@ GL: glplanet -root \n\
99- interference -root \n\
100- kumppa -root \n\
101-@GL_KLUDGE@ GL: lament -root \n\
102- moire2 -root \n\
103-@GL_KLUDGE@ GL: sonar -root \n\
104-@GL_KLUDGE@ GL: stairs -root \n\
105- truchet -root \n\
106-- vidwhacker -root \n\
107- blaster -root \n\
108- bumps -root \n\
109- ccurve -root \n\
110- compass -root \n\
111- deluxe -root \n\
112-- demon -root \n\
113-@GLE_KLUDGE@ GL: extrusion -root \n\
114-- loop -root \n\
115- penetrate -root \n\
116- petri -root \n\
117- phosphor -root \n\
118-@GL_KLUDGE@ GL: pulsar -root \n\
119- ripples -root \n\
120- shadebobs -root \n\
121-@GL_KLUDGE@ GL: sierpinski3d -root \n\
122- spotlight -root \n\
123- squiral -root \n\
124- wander -root \n\
125-- webcollage -root \n\
126- xflame -root \n\
127- xmatrix -root \n\
128-@GL_KLUDGE@ GL: gflux -root \n\
129-- nerverot -root \n\
130- xrayswarm -root \n\
131- xspirograph -root \n\
132-@GL_KLUDGE@ GL: circuit -root \n\
133-@GL_KLUDGE@ GL: dangerball -root \n\
134-- GL: dnalogo -root \n\
135-@GL_KLUDGE@ GL: engine -root \n\
136-@GL_KLUDGE@ GL: flipscreen3d -root \n\
137-@GL_KLUDGE@ GL: gltext -root \n\
138-@GL_KLUDGE@ GL: menger -root \n\
139-@GL_KLUDGE@ GL: molecule -root \n\
140- rotzoomer -root \n\
141- speedmine -root \n\
142-@GL_KLUDGE@ GL: starwars -root \n\
143-@GL_KLUDGE@ GL: stonerview -root \n\
144- vermiculate -root \n\
145- whirlwindwarp -root \n\
146- zoom -root \n\
147- anemone -root \n\
148- apollonian -root \n\
149-@GL_KLUDGE@ GL: boxed -root \n\
150-@GL_KLUDGE@ GL: cubenetic -root \n\
151-@GL_KLUDGE@ GL: endgame -root \n\
152- euler2d -root \n\
153- fluidballs -root \n\
154-@GL_KLUDGE@ GL: flurry -root \n\
155-- GL: glblur -root \n\
156-@GL_KLUDGE@ GL: glsnake -root \n\
157- halftone -root \n\
158-@GL_KLUDGE@ GL: juggler3d -root \n\
159-@GL_KLUDGE@ GL: lavalite -root \n\
160-- polyominoes -root \n\
161-@GL_KLUDGE@ GL: queens -root \n\
162-- GL: sballs -root \n\
163-@GL_KLUDGE@ GL: spheremonics -root \n\
164-- thornbird -root \n\
165- twang -root \n\
166-- GL: antspotlight -root \n\
167- apple2 -root \n\
168-@GL_KLUDGE@ GL: atunnel -root \n\
169- barcode -root \n\
170-@GL_KLUDGE@ GL: blinkbox -root \n\
171-@GL_KLUDGE@ GL: blocktube -root \n\
172-@GL_KLUDGE@ GL: bouncingcow -root \n\
173- cloudlife -root \n\
174-@GL_KLUDGE@ GL: cubestorm -root \n\
175- eruption -root \n\
176-@GL_KLUDGE@ GL: flipflop -root \n\
177-@GL_KLUDGE@ GL: flyingtoasters -root \n\
178- fontglide -root \n\
179-@GL_KLUDGE@ GL: gleidescope -root \n\
180-@GL_KLUDGE@ GL: glknots -root \n\
181-@GL_KLUDGE@ GL: glmatrix -root \n\
182-- GL: glslideshow -root \n\
183-@GL_KLUDGE@ GL: hypertorus -root \n\
184-- GL: jigglypuff -root \n\
185- metaballs -root \n\
186-@GL_KLUDGE@ GL: mirrorblob -root \n\
187- piecewise -root \n\
188-@GL_KLUDGE@ GL: polytopes -root \n\
189- pong -root \n\
190- popsquares -root \n\
191-@GL_KLUDGE@ GL: surfaces -root \n\
192- xanalogtv -root \n\
193- abstractile -root \n\
194- anemotaxis -root \n\
195-- GL: antinspect -root \n\
196- fireworkx -root \n\
197- fuzzyflakes -root \n\
198- interaggregate -root \n\
199- intermomentary -root \n\
200- memscroller -root \n\
201-@GL_KLUDGE@ GL: noof -root \n\
202- pacman -root \n\
203-@GL_KLUDGE@ GL: pinion -root \n\
204-@GL_KLUDGE@ GL: polyhedra -root \n\
205-- GL: providence -root \n\
206- substrate -root \n\
207- wormhole -root \n\
208-- GL: antmaze -root \n\
209-@GL_KLUDGE@ GL: boing -root \n\
210- boxfit -root \n\
211-@GL_KLUDGE@ GL: carousel -root \n\
212- celtic -root \n\
213-@GL_KLUDGE@ GL: crackberg -root \n\
214-@GL_KLUDGE@ GL: cube21 -root \n\
215- fiberlamp -root \n\
216-@GL_KLUDGE@ GL: fliptext -root \n\
217-@GL_KLUDGE@ GL: glhanoi -root \n\
218-@GL_KLUDGE@ GL: tangram -root \n\
219-@GL_KLUDGE@ GL: timetunnel -root \n\
220-@GL_KLUDGE@ GL: glschool -root \n\
221-@GL_KLUDGE@ GL: topblock -root \n\
222-@GL_KLUDGE@ GL: cubicgrid -root \n\
223- cwaves -root \n\
224-@GL_KLUDGE@ GL: gears -root \n\
225-@GL_KLUDGE@ GL: glcells -root \n\
226-@GL_KLUDGE@ GL: lockward -root \n\
227- m6502 -root \n\
228-@GL_KLUDGE@ GL: moebiusgears -root \n\
229-@GL_KLUDGE@ GL: voronoi -root \n\
230-@GL_KLUDGE@ GL: hypnowheel -root \n\
231-@GL_KLUDGE@ GL: klein -root \n\
232-- lcdscrub -root \n\
233-@GL_KLUDGE@ GL: photopile -root \n\
234-@GL_KLUDGE@ GL: skytentacles -root \n\
235-@GL_KLUDGE@ GL: rubikblocks -root \n\
236-@GL_KLUDGE@ GL: companioncube -root \n\
237-@GL_KLUDGE@ GL: hilbert -root \n\
238-@GL_KLUDGE@ GL: tronbit -root \n\
239-@GL_KLUDGE@ GL: geodesic -root \n\
240- hexadrop -root \n\
241-@GL_KLUDGE@ GL: kaleidocycle -root \n\
242-@GL_KLUDGE@ GL: quasicrystal -root \n\
243-@GL_KLUDGE@ GL: unknownpleasures -root \n\
244- binaryring -root \n\
245-@GL_KLUDGE@ GL: cityflow -root \n\
246-@GL_KLUDGE@ GL: geodesicgears -root \n\
247-@GL_KLUDGE@ GL: projectiveplane -root \n\
248-@GL_KLUDGE@ GL: romanboy -root \n\
249- tessellimage -root \n\
250-@GL_KLUDGE@ GL: winduprobot -root \n\
251-@GL_KLUDGE@ GL: splitflap -root \n\
252-@GL_KLUDGE@ GL: cubestack -root \n\
253-@GL_KLUDGE@ GL: cubetwist -root \n\
254-@GL_KLUDGE@ GL: discoball -root \n\
255-@GL_KLUDGE@ GL: dymaxionmap -root \n\
256-@GL_KLUDGE@ GL: energystream -root \n\
257-@GL_KLUDGE@ GL: hexstrut -root \n\
258-@GL_KLUDGE@ GL: hydrostat -root \n\
259-@GL_KLUDGE@ GL: raverhoop -root \n\
260-@GL_KLUDGE@ GL: splodesic -root \n\
261-@GL_KLUDGE@ GL: unicrud -root \n\
262-@GL_KLUDGE@ GL: esper -root \n\
263-@GL_KLUDGE@ GL: vigilance -root \n\
264-@GL_KLUDGE@ GL: crumbler -root \n\
265-@GL_KLUDGE@ GL: maze3d -root \n\
266-@GL_KLUDGE@ GL: peepers -root \n\
267-@GL_KLUDGE@ GL: razzledazzle -root \n
268-
269+- fontglide -root -program "date +'%F %H:%M %z'" \n\
270+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n
271
272
273 !=============================================================================
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 000000000..17dfe75ef
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service
@@ -0,0 +1,14 @@
1[Unit]
2Description=Xscreensaver service
3PartOf=xserver-nodm.service
4After=xserver-nodm.service
5
6[Service]
7ExecStart=/usr/bin/xscreensaver
8Environment="DISPLAY=:0"
9User=xuser
10Restart=always
11RestartSec=1
12
13[Install]
14WantedBy=multi-user.target
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
new file mode 100644
index 000000000..e7f97b61a
--- /dev/null
+++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
@@ -0,0 +1,25 @@
1SUMMARY = "X screen saver and locker"
2LICENSE = "BSD"
3LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df"
4SRC_URI = "https://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz"
5SRC_URI[md5sum] = "a5da62b91271f4e8afcc73d44697364b"
6SRC_URI[sha256sum] = "48ce1880f18b5321182be0c033aeceb5ec5628a1505b9d1ff69dbf06093c2426"
7
8SRC_URI += " \
9 file://xscreensaver.service \
10 file://fix-buildscripts.patch \
11 file://tweak-app-defaults.patch \
12 "
13
14DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
15# These are only needed as part of the stopgap screensaver implementation:
16RDEPENDS_${PN} += "xserver-nodm-init liberation-fonts"
17
18inherit systemd perlnative pkgconfig gettext autotools-brokensep
19
20do_install_append() {
21 install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
22}
23
24FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver"
25SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-03 02:53:13 +0000