diff options
| author | Jonathan Bauer | 2021-04-07 16:21:28 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-04-07 16:21:28 +0200 |
| commit | 1f41253a05d7fddedfbc3ac13f6065088d6680b8 (patch) | |
| tree | e59488c2a7e2ca69bfdad6bc32dde1be0ce744b9 | |
| parent | [dnbd3-proxy-mode] immediately switch to local caching if available (diff) | |
| parent | [xorg] intel_drv is deprecated, use modesetting (diff) | |
| download | mltk-1f41253a05d7fddedfbc3ac13f6065088d6680b8.tar.gz mltk-1f41253a05d7fddedfbc3ac13f6065088d6680b8.tar.xz mltk-1f41253a05d7fddedfbc3ac13f6065088d6680b8.zip | |
Merge branch 'master' into installer
| -rw-r--r-- | core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf | 5 | ||||
| -rw-r--r-- | core/modules/xscreensaver/module.build | 8 | ||||
| -rw-r--r-- | core/modules/xscreensaver/module.conf | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf b/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf deleted file mode 100644 index 711fd644..00000000 --- a/core/modules/xorg/data/etc/X11/xorg.conf.d/10-intel.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "OutputClass" - Identifier "Intel iGPU" - MatchDriver "i915" - Driver "intel" -EndSection 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 " |