diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk index 7a45fdadd0..7a7e3ecfaa 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.28.0" +PKG_VERSION="1.30.0" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_DEPENDS_TARGET="toolchain rustup.rs" diff --git a/packages/addons/service/librespot/changelog.txt b/packages/addons/service/librespot/changelog.txt index da06063d81..4a8ffd1c0f 100644 --- a/packages/addons/service/librespot/changelog.txt +++ b/packages/addons/service/librespot/changelog.txt @@ -1,3 +1,6 @@ +113 +- Update to 96557b4 + 112 - Update to a4e0f58 - Rework Python diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 4af0e4ba39..94cb9dc286 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librespot" -PKG_VERSION="a4e0f582a8c705b05c8abba58d9e9c1c06ad532d" -PKG_SHA256="63ed879d7185f16963316b0c3149a40875260f5403b2c55c6cdb470e91b7741d" -PKG_REV="112" +PKG_VERSION="96557b4ec1c45413cdf34673695f1269f99e3545" +PKG_SHA256="09fe8f8de50d25e460bdc75d02239961336ac4db837509386ac17057b00cc49a" +PKG_REV="113" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" diff --git a/packages/addons/service/librespot/patches/librespot-02_kodi_hooks.patch b/packages/addons/service/librespot/patches/librespot-02_kodi_hooks.patch index 3e57b4b7e1..dc6a78028b 100644 --- a/packages/addons/service/librespot/patches/librespot-02_kodi_hooks.patch +++ b/packages/addons/service/librespot/patches/librespot-02_kodi_hooks.patch @@ -1,8 +1,12 @@ -commit 55439529ae313eac5d946aa751387fa747cc6bc4 -Author: awiouy -Date: Wed Jun 13 17:39:54 2018 +0200 +From 109452968762175b255d3a46d2447bf103022a68 Mon Sep 17 00:00:00 2001 +From: awiouy +Date: Wed, 7 Nov 2018 07:49:31 +0100 +Subject: [PATCH] libreelec: kodi hooks - libreelec: kodi hooks +--- + playback/src/player.rs | 44 ++++++++++++++++++++++++++----------- + src/player_event_handler.rs | 8 +++++-- + 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index ab1a8ab..0aa0630 100644 @@ -106,35 +110,31 @@ index ab1a8ab..0aa0630 100644 } PlayerState::Stopped => { diff --git a/src/player_event_handler.rs b/src/player_event_handler.rs -index b6a653d..7549e00 100644 +index 1e682b9..3b478f1 100644 --- a/src/player_event_handler.rs +++ b/src/player_event_handler.rs -@@ -18,18 +18,22 @@ pub fn run_program_on_events(event: PlayerEvent, onevent: &str) { +@@ -19,18 +19,22 @@ pub fn run_program_on_events(event: PlayerEvent, onevent: &str) -> io::Result { env_vars.insert("PLAYER_EVENT", "change".to_string()); -- env_vars.insert("OLD_TRACK_ID", old_track_id.to_base16()); -- env_vars.insert("TRACK_ID", new_track_id.to_base16()); -+ env_vars.insert("OLD_TRACK_ID", old_track_id.to_base62()); -+ env_vars.insert("TRACK_ID", new_track_id.to_base62()); + env_vars.insert("OLD_TRACK_ID", old_track_id.to_base62()); + env_vars.insert("TRACK_ID", new_track_id.to_base62()); + env_vars.insert("STATE", new_state.to_string()); } - PlayerEvent::Started { track_id } => { + PlayerEvent::Started { track_id, new_state } => { env_vars.insert("PLAYER_EVENT", "start".to_string()); -- env_vars.insert("TRACK_ID", track_id.to_base16()); -+ env_vars.insert("TRACK_ID", track_id.to_base62()); + env_vars.insert("TRACK_ID", track_id.to_base62()); + env_vars.insert("STATE", new_state.to_string()); } - PlayerEvent::Stopped { track_id } => { + PlayerEvent::Stopped { track_id, new_state } => { env_vars.insert("PLAYER_EVENT", "stop".to_string()); -- env_vars.insert("TRACK_ID", track_id.to_base16()); -+ env_vars.insert("TRACK_ID", track_id.to_base62()); + env_vars.insert("TRACK_ID", track_id.to_base62()); + env_vars.insert("STATE", new_state.to_string()); } } - run_program(onevent, env_vars); + run_program(onevent, env_vars) diff --git a/packages/addons/service/librespot/patches/librespot-03_pulseaudio_sink.patch b/packages/addons/service/librespot/patches/librespot-03_pulseaudio_sink.patch index ccbefea025..f441a109e7 100644 --- a/packages/addons/service/librespot/patches/librespot-03_pulseaudio_sink.patch +++ b/packages/addons/service/librespot/patches/librespot-03_pulseaudio_sink.patch @@ -1,3 +1,12 @@ +From b87d18c6513cebc31118ffb447e2b7ae9255e6bd Mon Sep 17 00:00:00 2001 +From: awiouy +Date: Wed, 7 Nov 2018 07:51:46 +0100 +Subject: [PATCH] libreelec: pulseaudio sink + +--- + playback/src/audio_backend/pulseaudio.rs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + diff --git a/playback/src/audio_backend/pulseaudio.rs b/playback/src/audio_backend/pulseaudio.rs index 88f6280..4e7186b 100644 --- a/playback/src/audio_backend/pulseaudio.rs diff --git a/packages/addons/service/librespot/patches/librespot-04_status_instead_of_spawn.patch b/packages/addons/service/librespot/patches/librespot-04_status_instead_of_spawn.patch deleted file mode 100644 index 1469a1f59f..0000000000 --- a/packages/addons/service/librespot/patches/librespot-04_status_instead_of_spawn.patch +++ /dev/null @@ -1,23 +0,0 @@ -From abcd8697b46924f8a18d733fc9d2bf884e901a46 Mon Sep 17 00:00:00 2001 -From: leszekb -Date: Mon, 14 May 2018 22:42:34 +0200 -Subject: [PATCH] Update player_event_handler.rs - ---- - src/player_event_handler.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/player_event_handler.rs b/src/player_event_handler.rs -index b6a653d..6064bc0 100644 ---- a/src/player_event_handler.rs -+++ b/src/player_event_handler.rs -@@ -8,7 +8,7 @@ fn run_program(program: &str, env_vars: HashMap<&str, String>) { - Command::new(&v.remove(0)) - .args(&v) - .envs(env_vars.iter()) -- .spawn() -+ .status() - .expect("program failed to start"); - } - -