summaryrefslogtreecommitdiffstats
path: root/core/modules/xscreensaver
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-07 13:52:01 +0200
committerSimon Rettberg2021-04-07 13:52:01 +0200
commit2800deeabc16434820f204527aedaaafb0ecfd78 (patch)
tree60996415004410c14e0314040b2339e57e917ae1 /core/modules/xscreensaver
parent[inc/useradd] make sure dest dir exists for passwd/group/shadow (diff)
downloadmltk-2800deeabc16434820f204527aedaaafb0ecfd78.tar.gz
mltk-2800deeabc16434820f204527aedaaafb0ecfd78.tar.xz
mltk-2800deeabc16434820f204527aedaaafb0ecfd78.zip
[xscreensaver] Update to 6.00
Diffstat (limited to 'core/modules/xscreensaver')
-rw-r--r--core/modules/xscreensaver/module.build8
-rw-r--r--core/modules/xscreensaver/module.conf2
2 files changed, 8 insertions, 2 deletions
diff --git a/core/modules/xscreensaver/module.build b/core/modules/xscreensaver/module.build
index 676def43..9faba11a 100644
--- a/core/modules/xscreensaver/module.build
+++ b/core/modules/xscreensaver/module.build
@@ -5,6 +5,7 @@ fetch_source() {
build() {
local SRCDIR="${MODULE_WORK_DIR}/src/"
+ local bin
# xscreensaver
mkdir -p "${MODULE_BUILD_DIR}/usr/bin"
@@ -16,8 +17,11 @@ build() {
--prefix=/usr --without-proc-interrupts $REQUIRED_CONFIGURE_OPTIONS \
|| perror "'./configure' failed"
cde driver
- make xscreensaver xscreensaver-command || perror "'make' failed"
- cp xscreensaver xscreensaver-command "${MODULE_BUILD_DIR}/usr/bin/" || perror "cp fail"
+ for bin in $REQUIRED_BINARIES; do
+ [[ "$bin" == xscreensaver* ]] || continue
+ make "$bin" || perror "'make $bin' failed"
+ cp "$bin" "${MODULE_BUILD_DIR}/usr/bin/" || perror "cp $bin fail"
+ done
mkdir -p "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
cde "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
diff --git a/core/modules/xscreensaver/module.conf b/core/modules/xscreensaver/module.conf
index 7e1ec8b7..84d3ff24 100644
--- a/core/modules/xscreensaver/module.conf
+++ b/core/modules/xscreensaver/module.conf
@@ -9,6 +9,8 @@ REQUIRED_GIT="
REQUIRED_PREFIX="/opt/openslx/bin"
REQUIRED_BINARIES="
xscreensaver
+ xscreensaver-auth
xscreensaver-command
+ xscreensaver-gfx
bwlp-screensaver
"