From 31e7d8c8aae0c95373b09aaf5d4c624139be0ac5 Mon Sep 17 00:00:00 2001 From: awiouy Date: Sun, 26 Jul 2020 21:53:48 +0200 Subject: [PATCH 1/2] rust: update to 1.45.0 --- packages/addons/addon-depends/librespot-depends/rust/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk index d67318299d..94b371931f 100644 --- a/packages/addons/addon-depends/librespot-depends/rust/package.mk +++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rust" -PKG_VERSION="1.44.1" +PKG_VERSION="1.45.0" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_DEPENDS_TARGET="toolchain rustup.rs" From 5cb4bcab97248208883329d3f3df7ee49a7ed22e Mon Sep 17 00:00:00 2001 From: awiouy Date: Sun, 26 Jul 2020 21:54:09 +0200 Subject: [PATCH 2/2] librespot: update to 0.1.3 --- .../addons/service/librespot/changelog.txt | 4 ++ packages/addons/service/librespot/package.mk | 15 +++--- .../patches/librespot-02_android.patch | 50 ------------------- .../source/resources/lib/ls_addon.py | 4 +- 4 files changed, 16 insertions(+), 57 deletions(-) delete mode 100644 packages/addons/service/librespot/patches/librespot-02_android.patch diff --git a/packages/addons/service/librespot/changelog.txt b/packages/addons/service/librespot/changelog.txt index 0e6b05bb3d..7d0db541ac 100644 --- a/packages/addons/service/librespot/changelog.txt +++ b/packages/addons/service/librespot/changelog.txt @@ -1,3 +1,7 @@ +125 +- Update to 0.1.3 +- Revert to dns-sd instead of mdns + 124 - Update to 9f3a02e (2020-06-22) - Fix switching playback with Android diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 87d0b0f9fa..81211c6d8b 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -3,14 +3,13 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librespot" -PKG_VERSION="9f3a02ee8f62f8e178f714c3c63132388d90af64" -PKG_SHA256="5b2d3c0a250fbd171ea86303b213dafc035bf32b5c6fb2e7e98d61d9140168a9" -PKG_VERSION_DATE="2020-06-22" -PKG_REV="124" +PKG_VERSION="0.1.3" +PKG_SHA256="2d28a63c6dda08ecbc1245c7cfe34c9b3b29e8c5304f4aa8b65aedb899056b25" +PKG_REV="125" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" -PKG_URL="https://github.com/librespot-org/librespot/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/librespot-org/librespot/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib libvorbis pulseaudio rust" PKG_SECTION="service" PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote" @@ -28,7 +27,7 @@ make_target() { cargo build \ --release \ --no-default-features \ - --features "alsa-backend pulseaudio-backend with-vorbis" + --features "alsa-backend pulseaudio-backend with-dns-sd with-vorbis" $STRIP $PKG_BUILD/.$TARGET_NAME/*/release/librespot } @@ -36,4 +35,8 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp $PKG_BUILD/.$TARGET_NAME/*/release/librespot \ $ADDON_BUILD/$PKG_ADDON_ID/bin + + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp $(get_build_dir avahi)/avahi-compat-libdns_sd/.libs/libdns_sd.so.1 \ + $ADDON_BUILD/$PKG_ADDON_ID/lib } diff --git a/packages/addons/service/librespot/patches/librespot-02_android.patch b/packages/addons/service/librespot/patches/librespot-02_android.patch deleted file mode 100644 index eb897d9a48..0000000000 --- a/packages/addons/service/librespot/patches/librespot-02_android.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 16b83b38c1b77b34c64ad3f567e5f43bb1dc5ef0 Mon Sep 17 00:00:00 2001 -From: Anthony Green -Date: Tue, 7 Jul 2020 16:23:20 +0100 -Subject: [PATCH 1/2] Issue #497 - Playing songs from android app - -Implement the fix suggested by @Johannesd3 ---- - connect/src/spirc.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs -index b4c657f7..88d377df 100644 ---- a/connect/src/spirc.rs -+++ b/connect/src/spirc.rs -@@ -790,7 +790,7 @@ impl SpircTask { - } - - MessageType::kMessageTypeNotify => { -- if self.device.get_is_active() && frame.get_device_state().get_is_active() { -+ if self.device.get_is_active() && frame.get_device_state().get_is_active() && self.device.get_became_active_at() <= frame.get_device_state().get_became_active_at() { - self.device.set_is_active(false); - self.state.set_status(PlayStatus::kPlayStatusStop); - self.player.stop(); - -From 9565e4392ab6ba8d39b7714395ce3b8a58048fb6 Mon Sep 17 00:00:00 2001 -From: Anthony Green -Date: Fri, 10 Jul 2020 21:17:01 +0100 -Subject: [PATCH 2/2] Fix formatting - ---- - connect/src/spirc.rs | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs -index 88d377df..0dd67093 100644 ---- a/connect/src/spirc.rs -+++ b/connect/src/spirc.rs -@@ -790,7 +790,11 @@ impl SpircTask { - } - - MessageType::kMessageTypeNotify => { -- if self.device.get_is_active() && frame.get_device_state().get_is_active() && self.device.get_became_active_at() <= frame.get_device_state().get_became_active_at() { -+ if self.device.get_is_active() -+ && frame.get_device_state().get_is_active() -+ && self.device.get_became_active_at() -+ <= frame.get_device_state().get_became_active_at() -+ { - self.device.set_is_active(false); - self.state.set_status(PlayStatus::kPlayStatusStop); - self.player.stop(); diff --git a/packages/addons/service/librespot/source/resources/lib/ls_addon.py b/packages/addons/service/librespot/source/resources/lib/ls_addon.py index 8fab49300f..a4ac1cf29b 100644 --- a/packages/addons/service/librespot/source/resources/lib/ls_addon.py +++ b/packages/addons/service/librespot/source/resources/lib/ls_addon.py @@ -22,7 +22,9 @@ ADDON_HOME = xbmc.translatePath(ADDON.getAddonInfo('profile')) ADDON_ICON = ADDON.getAddonInfo('icon') ADDON_NAME = ADDON.getAddonInfo('name') ADDON_PATH = ADDON.getAddonInfo('path') -ADDON_ENVT = dict(PATH=os.path.join(ADDON_PATH, 'bin')) +ADDON_ENVT = dict( + LD_LIBRARY_PATH=os.path.join(ADDON_PATH, 'lib'), + PATH=os.path.join(ADDON_PATH, 'bin')) DIALOG = xbmcgui.Dialog()