From 876d25b0a57d53891bbf5039b63f178fc9f343c7 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 14 Dec 2021 19:35:12 -0800 Subject: [PATCH 1/4] kodi: add missing options --- packages/mediacenter/kodi/package.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index c41f162fa6..108d090236 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -239,7 +239,9 @@ configure_package() { ${KODI_AIRTUNES} \ ${KODI_OPTICAL} \ ${KODI_BLURAY} \ - ${KODI_PLAYER}" + ${KODI_PLAYER} \ + ${KODI_ALSA} \ + ${KODI_PULSEAUDIO}" } pre_configure_target() { From d5be131e309eed6e7fd99bbcc17987b6517b8293 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 17 May 2022 09:12:12 -0700 Subject: [PATCH 2/4] kodi: split ALSA_SUPPORT and KODI_ALSA_SUPPORT --- distributions/LibreELEC/options | 2 ++ packages/mediacenter/kodi/package.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index ae397823b8..92dee96a56 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -135,6 +135,8 @@ # build with Samba Client support (mounting SAMBA shares with KODI) (yes / no) KODI_SAMBA_SUPPORT="yes" +# build kodi with alsa support (yes/no) + KODI_ALSA_SUPPORT="yes" ### KODI ADDONS ### diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 108d090236..5e14e79dab 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -48,7 +48,7 @@ configure_package() { PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi - if [ "${ALSA_SUPPORT}" = yes ]; then + if [ "${KODI_ALSA_SUPPORT}" = yes ]; then PKG_DEPENDS_TARGET+=" alsa-lib" KODI_ALSA="-DENABLE_ALSA=ON" else From 245fc2894c6f1e00b4436cb73ca7c6da22c3a0c0 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 17 May 2022 09:13:51 -0700 Subject: [PATCH 3/4] kodi: split PULSEAUDIO_SUPPORT and KODI_PULSEAUDIO_SUPPORT --- distributions/LibreELEC/options | 3 +++ packages/mediacenter/kodi/package.mk | 2 +- packages/virtual/image/package.mk | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 92dee96a56..21fa8499fc 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -138,6 +138,9 @@ # build kodi with alsa support (yes/no) KODI_ALSA_SUPPORT="yes" +# build kodi with pulseaudio support (yes/no) + KODI_PULSEAUDIO_SUPPORT="yes" + ### KODI ADDONS ### # Distribution Specific source location diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 5e14e79dab..3952ebe56b 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -55,7 +55,7 @@ configure_package() { KODI_ALSA="-DENABLE_ALSA=OFF" fi - if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then + if [ "${KODI_PULSEAUDIO_SUPPORT}" = yes ]; then PKG_DEPENDS_TARGET+=" pulseaudio" KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=ON" else diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index 8888a25bb6..ddd47a266f 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -17,6 +17,8 @@ PKG_LONGDESC="Root package used to build and create complete image" # Sound support [ "${ALSA_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa" +[ "${PULSEAUDIO_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" pulseaudio" + # Automounter support [ "${UDEVIL}" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil" From adb7a8fa53971f4b639b7a33c984207abe677ce4 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 17 May 2022 11:20:00 -0700 Subject: [PATCH 4/4] kodi: dynamically set audio device to what kodi was built with --- .../kodi/config/{kodi.conf => kodi.conf.in} | 2 +- packages/mediacenter/kodi/package.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) rename packages/mediacenter/kodi/config/{kodi.conf => kodi.conf.in} (71%) diff --git a/packages/mediacenter/kodi/config/kodi.conf b/packages/mediacenter/kodi/config/kodi.conf.in similarity index 71% rename from packages/mediacenter/kodi/config/kodi.conf rename to packages/mediacenter/kodi/config/kodi.conf.in index fdb943b8f4..17f51a6913 100644 --- a/packages/mediacenter/kodi/config/kodi.conf +++ b/packages/mediacenter/kodi/config/kodi.conf.in @@ -1,4 +1,4 @@ -KODI_AE_SINK=ALSA+PULSE +KODI_AE_SINK=@KODI_AE_SINK@ HOME=/storage KODI_TEMP=/storage/.kodi/temp KODI_HOME=/usr/share/kodi/ diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 3952ebe56b..dedd74c16e 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -275,7 +275,16 @@ 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 + if [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then + KODI_AE_SINK="ALSA+PULSE" + elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" != "yes" ]; then + KODI_AE_SINK="PULSE" + elif [ "${KODI_PULSEAUDIO_SUPPORT}" != "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then + KODI_AE_SINK="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 # set default display environment if [ "${DISPLAYSERVER}" = "x11" ]; then