diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2020-01-07 23:50:02 +0100 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2020-01-07 23:50:02 +0100 |
| commit | d7492936cf7ee78d28274789bdc6a36cc5874dd0 (patch) | |
| tree | f4a7ba2a57ff8469b0954fd4e98e73ffda26dcef | |
| parent | gentoo-vdr-sctips.git: fixed path to functions.sh (diff) | |
| download | gentoo-vdr-scripts-d7492936cf7ee78d28274789bdc6a36cc5874dd0.tar.gz gentoo-vdr-scripts-d7492936cf7ee78d28274789bdc6a36cc5874dd0.tar.bz2 gentoo-vdr-scripts-d7492936cf7ee78d28274789bdc6a36cc5874dd0.zip | |
added support for the DISPLAY=:0.0 environment variable
needed for media-plugins/vdr-softhddevice supporting OpenGlOSD
Suggested-by: Lucian Muresan
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | etc/conf.d/vdr | 6 | ||||
| -rw-r--r-- | usr/share/vdr/systemd/vdr-systemd_helper.sh | 4 |
3 files changed, 14 insertions, 1 deletions
@@ -3,9 +3,12 @@ - removed rtc-wakeup, anounced in privius version Suggested-by: Lucian Muresan <lucianm@users.sourceforge.net> - fixed path to functions.sh - rather depend on sys-apps/gentoo-functions than relaying on the + rather depend on sys-apps/gentoo-functions than relaying on the existence of openrc Suggested-by: Lucian Muresan <lucianm@users.sourceforge.net> + - added support for the DISPLAY=:0.0 environment variable + (needed for media-plugins/vdr-softhddevice supporting OpenGL OSD) + Suggested-by: Lucian Muresan <lucianm@users.sourceforge.net> *gentoo-vdr-scripts-2.8 (15 Dec 2019) diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr index 0067f18..eae6459 100644 --- a/etc/conf.d/vdr +++ b/etc/conf.d/vdr @@ -146,6 +146,12 @@ LOG="3" # default: ':0 -br -nocursor -nolisten tcp -quiet' #X11_SERVER=" " +# X11 display +# (needed for media-plugin/vdr-softhddevice supporting OpenGL OSD) +# please make sure to set it matching the X11_SERVER contents above +# and let it on, always !!! +DISPLAY=:0.0 + ########################################################### # Expert Settings # ########################################################### diff --git a/usr/share/vdr/systemd/vdr-systemd_helper.sh b/usr/share/vdr/systemd/vdr-systemd_helper.sh index 5ec6495..f240c35 100644 --- a/usr/share/vdr/systemd/vdr-systemd_helper.sh +++ b/usr/share/vdr/systemd/vdr-systemd_helper.sh @@ -94,6 +94,10 @@ if [ "$1" = "--start-pre" ]; then # these options are what we need to start VDR from the systemd unit file echo "VDR_OPTS=\"${vdr_opts}\"" > ${SYSTEMD_ENV_FILE} + # X11 DISPLAY + # (needed for media-plugins/vdr-softhddevice supporting OpenGL OSD) + echo "DISPLAY=$DISPLAY" >> ${SYSTEMD_ENV_FILE} + # LANG LC_COLLATE from /etc/conf.d/vdr will be ignored, wrt bug 530690 echo "LANG=$LANG" >> ${SYSTEMD_ENV_FILE} echo "LC_COLLATE=${VDR_SORT_ORDER}" >> ${SYSTEMD_ENV_FILE} |