mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

xscreensaver: Update to 6.01

Browse Source 
Drop fix-buildscripts.patch and move the required changes into recipe
Refresh tweak-app-defaults.patch to apply on latest release
Do not build po files as they are not buildable and are not used in
cross builds as much

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-07-08 16:01:01 -07:00
parent 1960e2a093
commit 85dc9b58e7
5 changed files with 108 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
+44
View File
@@ -0,0 +1,44 @@
From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 8 Jul 2021 15:40:10 -0700
Subject: [PATCH] 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- 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 \
@@ -451,4 +451,3 @@ cerebrum::
--include 'configure*' \
--include '*/' \
--exclude '*'
-
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid
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@
meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
-100
View File
@@ -1,100 +0,0 @@
--- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000
+++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000
@@ -14,6 +14,9 @@
#
###############################################################################
+includedir=''
+libdir=''
+
AH_TOP([
/* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski.
*
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
+++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000
@@ -10,7 +10,7 @@
top_srcdir = @top_srcdir@
top_builddir = ..
-install_prefix =
+install_prefix = ${DESTDIR}
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@@ -228,7 +228,7 @@
SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \
xscreensaver-text
SCRIPTS_OSX = xscreensaver-getimage-desktop
-SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@
HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
xscreensaver.h prefs.h remote.h exec.h \
diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/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 @@
top_srcdir = @top_srcdir@
top_builddir = ..
-install_prefix =
+install_prefix = ${DESTDIR}
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@@ -124,7 +124,7 @@
tessellimage.c delaunay.c recanim.c binaryring.c \
glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \
webcollage-helper-cocoa.m testx11.c
-SCRIPTS = vidwhacker webcollage ljlatest
+#SCRIPTS = vidwhacker webcollage ljlatest
# Programs that are mentioned in XScreenSaver.ad, and that have XML files,
# but that are not shipped with xscreensaver itself.
@@ -166,7 +166,13 @@
tessellimage.o delaunay.o recanim.o binaryring.o \
glitchpeg.o vfeedback.o scooter.o testx11.o
-EXES = attraction blitspin bouboule braid decayscreen deco \
+EXES = fontglide
+JPEG_EXES = webcollage-helper
+
+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \
+ whirlygig worm xsublim juggle testx11 \
+ attraction blitspin bouboule braid decayscreen deco \
drift flame galaxy grav greynetic halo \
helix hopalong ifs imsmap julia kaleidescope \
maze moire noseguy pedal \
@@ -182,17 +188,12 @@
speedmine vermiculate twang apollonian euler2d \
polyominoes thornbird fluidballs anemone halftone \
metaballs eruption popsquares barcode piecewise cloudlife \
- fontglide apple2 xanalogtv pong filmleader wormhole \
+ apple2 xanalogtv pong filmleader wormhole \
pacman fuzzyflakes anemotaxis memscroller substrate \
intermomentary fireworkx fiberlamp boxfit interaggregate \
celtic cwaves m6502 abstractile lcdscrub hexadrop \
tessellimage binaryring glitchpeg vfeedback scooter \
@JPEG_EXES@
-JPEG_EXES = webcollage-helper
-
-RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \
- lightning lisa lissie lmorph rotor sphere spiral t3d vines \
- whirlygig worm xsublim juggle testx11
HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.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 \
meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
+11 -7
View File
@@ -1,5 +1,5 @@
--- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000
+++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -29,7 +29,7 @@
! /* (xrdb prevention kludge: whole file)
@@ -18,13 +18,13 @@
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
! This can be a local directory name, or the URL of an RSS or Atom feed.
@@ -48,11 +48,11 @@
@@ -47,11 +47,11 @@
*memoryLimit: 0
*lock: False
*verbose: False
*timestamp: True
-*fade: True
+*fade: False
*unfade: False
*unfade: True
*fadeSeconds: 0:00:03
*fadeTicks: 20
-*splash: True
@@ -32,7 +32,7 @@
*splashDuration: 0:00:05
*visualID: default
*installColormap: True
@@ -343,246 +343,8 @@
@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh
!=============================================================================
*programs: \
@@ -272,8 +272,12 @@
- 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: gibson -root \n\
-@GL_KLUDGE@ GL: headroom -root \n\
-@GL_KLUDGE@ GL: sphereeversion -root \n
-
-
+- fontglide -root -program "date +'%F %H:%M %z'"
meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb
-36
View File
@@ -1,36 +0,0 @@
SUMMARY = "X screen saver and locker"
HOMEPAGE = "https://www.jwz.org/xscreensaver/"
LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463"
SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba"
SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95"
SRC_URI += " \
file://xscreensaver.service \
file://fix-buildscripts.patch \
file://tweak-app-defaults.patch \
"
DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
# 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-x-app-defaults=${datadir}/X11/app-defaults"
REQUIRED_DISTRO_FEATURES = "x11"
do_install_append() {
install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
}
FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver"
SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
CLEANBROKEN = "1"
meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
+53
View File
@@ -0,0 +1,53 @@
SUMMARY = "X screen saver and locker"
HOMEPAGE = "https://www.jwz.org/xscreensaver/"
LICENSE = "BSD-0-Clause"
LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51"
SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b"
SRC_URI += " \
file://xscreensaver.service \
file://0001-build-Do-not-build-po-files.patch \
file://tweak-app-defaults.patch \
"
DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam"
# 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}"
REQUIRED_DISTRO_FEATURES = "x11 pam"
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"