jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: move environment variables in systemd unit to environment file

Browse Source 
Only set DISPLAY or WAYLAND_DISPLAY if actually running under
x11/wayland. This fixes latest kodi gbm refusing to start because
it thinks a window manager is active.

Also set the Nvidia-specific __GL_YIELD only when Nvidia drivers
are actually used and drop SDL_MOUSE_RELATIVE - kodi stopped using
SDL a long time ago.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2020-10-14 10:53:57 +02:00
parent fede07ec5d
commit cc8c6c628f
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi/config/kodi.conf Normal file
View File

@ -0,0 +1,4 @@
KODI_AE_SINK=ALSA+PULSE
HOME=/storage
KODI_TEMP=/storage/.kodi/temp
KODI_HOME=/usr/share/kodi/

14
packages/mediacenter/kodi/package.mk
View File

@ -258,6 +258,20 @@ post_makeinstall_target() {
-e "s|@KODI_MAX_SECONDS@|${KODI_MAX_SECONDS:-900}|g" \
-i $INSTALL/usr/lib/kodi/kodi.sh
cp $PKG_DIR/config/kodi.conf $INSTALL/usr/lib/kodi/kodi.conf
# set default display environment
if [ "$DISPLAYSERVER" = "x11" ]; then
echo "DISPLAY=:0.0" >> $INSTALL/usr/lib/kodi/kodi.conf
elif [ "$DISPLAYSERVER" = "weston" ]; then
echo "WAYLAND_DISPLAY=wayland-0" >> $INSTALL/usr/lib/kodi/kodi.conf
fi
# nvidia: Enable USLEEP to reduce CPU load while rendering
if listcontains "${GRAPHIC_DRIVERS}" "nvidia" || listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
echo "__GL_YIELD=USLEEP" >> $INSTALL/usr/lib/kodi/kodi.conf
fi
mkdir -p $INSTALL/usr/sbin
cp $PKG_DIR/scripts/service-addon-wrapper $INSTALL/usr/sbin

9
packages/mediacenter/kodi/system.d/kodi.service
View File

@ -5,14 +5,7 @@ Requires=graphical.target
Wants=network-online.target
[Service]
Environment=KODI_AE_SINK=ALSA+PULSE
Environment=__GL_YIELD=USLEEP
Environment=DISPLAY=:0.0
Environment=WAYLAND_DISPLAY=wayland-0
Environment=SDL_MOUSE_RELATIVE=0
Environment=HOME=/storage
Environment=KODI_TEMP=/storage/.kodi/temp
Environment=KODI_HOME=/usr/share/kodi/
EnvironmentFile=/usr/lib/kodi/kodi.conf
EnvironmentFile=-/run/libreelec/kodi.conf
EnvironmentFile=-/run/libreelec/debug/kodi.conf
ExecStartPre=-/usr/lib/kodi/kodi-config