kodi: set audio backend via command line arg instead of env var

Support for the KODI_AE_SINK environment variable has been dropped
in kodi, use the --audio-backend command line option instead.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2023-06-17 10:27:40 +02:00
parent c41da7dd5d
commit 12b747f4ca
3 changed files with 7 additions and 7 deletions

View File

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

View File

@ -340,17 +340,17 @@ post_makeinstall_target() {
-i ${INSTALL}/usr/lib/kodi/kodi.sh
if [ "${KODI_PIPEWIRE_SUPPORT}" = "yes" ]; then
KODI_AE_SINK="PIPEWIRE"
KODI_AUDIO_ARGS="--audio-backend=pipewire"
elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
KODI_AE_SINK="ALSA+PULSE"
KODI_AUDIO_ARGS="--audio-backend=alsa+pulseaudio"
elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" != "yes" ]; then
KODI_AE_SINK="PULSE"
KODI_AUDIO_ARGS="--audio-backend=pulseaudio"
elif [ "${KODI_PULSEAUDIO_SUPPORT}" != "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
KODI_AE_SINK="ALSA"
KODI_AUDIO_ARGS="--audio-backend=alsa"
fi
# adjust audio output device to what was built
sed "s/@KODI_AE_SINK@/${KODI_AE_SINK}/" ${PKG_DIR}/config/kodi.conf.in > ${INSTALL}/usr/lib/kodi/kodi.conf
sed "s/@KODI_AUDIO_ARGS@/${KODI_AUDIO_ARGS}/" ${PKG_DIR}/config/kodi.conf.in > ${INSTALL}/usr/lib/kodi/kodi.conf
# set default display environment
if [ "${DISPLAYSERVER}" = "x11" ]; then

View File

@ -9,7 +9,7 @@ EnvironmentFile=/usr/lib/kodi/kodi.conf
EnvironmentFile=-/run/libreelec/kodi.conf
EnvironmentFile=-/run/libreelec/debug/kodi.conf
ExecStartPre=-/usr/lib/kodi/kodi-config
ExecStart=/usr/lib/kodi/kodi.sh --standalone -fs $KODI_ARGS $KODI_DEBUG
ExecStart=/usr/lib/kodi/kodi.sh --standalone -fs $KODI_AUDIO_ARGS $KODI_ARGS $KODI_DEBUG
ExecStop=/bin/kill -TERM $MAINPID
ExecStopPost=-/usr/lib/kodi/kodi-safe-mode
TimeoutStopSec=30