diff --git a/packages-spotify.txt b/packages-spotify.txt index 862f2c2a3..5187a5f88 100644 --- a/packages-spotify.txt +++ b/packages-spotify.txt @@ -1,13 +1,7 @@ # Define packages for apt-get. These can be installed with # 'sed 's/#.*//g' packages.txt | xargs sudo apt-get install' -libspotify-dev -libspotify12 python3-cffi python3-ply python3-pycparser -python3-spotify mopidy -mopidy-mpd -mopidy-local -mopidy-spotify diff --git a/requirements-spotify.txt b/requirements-spotify.txt index 83c411544..19d752a14 100644 --- a/requirements-spotify.txt +++ b/requirements-spotify.txt @@ -1,3 +1,6 @@ # Spotify related requirements - # You need to install these with `sudo pip install --upgrade --force-reinstall -r requirements-spotify.txt` - Mopidy-Iris==3.69.3 +# You need to install these with `sudo pip install --upgrade --force-reinstall -r requirements-spotify.txt` +Mopidy-Local +Mopidy-MPD +Mopidy-Iris==3.69.3 +Mopidy-Spotify==5.0.0a1 \ No newline at end of file diff --git a/scripts/installscripts/install-jukebox.sh b/scripts/installscripts/install-jukebox.sh index 751a2ef06..35adea368 100644 --- a/scripts/installscripts/install-jukebox.sh +++ b/scripts/installscripts/install-jukebox.sh @@ -962,6 +962,11 @@ install_main() { ${apt_get} upgrade call_with_args_from_file "${jukebox_dir}"/packages-spotify.txt ${apt_get} ${allow_downgrades} install + # not yet available on apt.mopidy.com, so install manually + wget -q https://github.com/kingosticks/gst-plugins-rs-build/releases/download/gst-plugin-spotify_0.12.2-1/gst-plugin-spotify_0.12.2-1_armhf.deb + ${apt_get} install ./gst-plugin-spotify_0.12.2-1_armhf.deb + sudo rm -f gst-plugin-spotify_0.12.2-1_armhf.deb + # Install necessary Python packages ${pip_install} -r "${jukebox_dir}"/requirements-spotify.txt fi diff --git a/scripts/installscripts/tests/test_installation.sh b/scripts/installscripts/tests/test_installation.sh index 93fd63315..79ea2d4fd 100755 --- a/scripts/installscripts/tests/test_installation.sh +++ b/scripts/installscripts/tests/test_installation.sh @@ -320,6 +320,8 @@ verify_apt_packages() { # also check for spotify packages if it has been installed if [[ "${SPOTinstall}" == "YES" ]]; then packages="${packages} ${packages_spotify}" + # not yet available on apt.mopidy.com, so install manually + packages="${packages} gst-plugin-spotify" fi if [[ "$AUTOHOTSPOTconfig" == "YES" ]]; then