From a7600ca517f908006f650b220fda6b7f32354bef Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 8 Jun 2018 15:39:03 +0200 Subject: [PATCH 1/4] hyperion: update to dc6a602 Signed-off-by: Matthias Reichl --- packages/addons/service/hyperion/package.mk | 4 ++-- .../hyperion/patches/hyperion-0004-fix-gcc7.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 packages/addons/service/hyperion/patches/hyperion-0004-fix-gcc7.patch diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index cbcea91f04..95f4b35e7c 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -18,8 +18,8 @@ ################################################################################ PKG_NAME="hyperion" -PKG_VERSION="1c21232" -PKG_SHA256="aea69ba3027c0f967880a65f0c39a2cd7f9cf913947b755ac37a2572a77d51c0" +PKG_VERSION="dc6a602" +PKG_SHA256="d585b4e71aafd49f32ced6e27cc88db3c19278a7f258972c22a4e88cad981b0d" PKG_REV="106" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/service/hyperion/patches/hyperion-0004-fix-gcc7.patch b/packages/addons/service/hyperion/patches/hyperion-0004-fix-gcc7.patch deleted file mode 100644 index 5527848d74..0000000000 --- a/packages/addons/service/hyperion/patches/hyperion-0004-fix-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur build.LibreELEC-Generic.x86_64-9.0-devel/org_hyperion-355a324/include/utils/Image.h build.LibreELEC-Generic.x86_64-9.0-devel/hyperion-355a324/include/utils/Image.h ---- org_hyperion-355a324/include/utils/Image.h 2016-09-06 22:58:55.000000000 +0200 -+++ hyperion-355a324/include/utils/Image.h 2017-05-30 18:18:06.043345976 +0200 -@@ -2,6 +2,7 @@ - - // STL includes - #include -+#include - #include - #include - #include From 5f905a1cd80aed0921e0572b7deb05a7ff67207d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 8 Jun 2018 17:24:25 +0200 Subject: [PATCH 2/4] hyperion: fix start event for Kodi 18 Signed-off-by: Matthias Reichl --- ...hyperion-0004-fix-kodi18-start-event.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/addons/service/hyperion/patches/hyperion-0004-fix-kodi18-start-event.patch diff --git a/packages/addons/service/hyperion/patches/hyperion-0004-fix-kodi18-start-event.patch b/packages/addons/service/hyperion/patches/hyperion-0004-fix-kodi18-start-event.patch new file mode 100644 index 0000000000..aa3c2e8ee0 --- /dev/null +++ b/packages/addons/service/hyperion/patches/hyperion-0004-fix-kodi18-start-event.patch @@ -0,0 +1,27 @@ +From 1c134f52389f93b94fa6db291b79ba3933a031f7 Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Fri, 8 Jun 2018 17:19:35 +0200 +Subject: [PATCH] XBMCVideoChecker: use OnAVStart event for Kodi 18 + +Signed-off-by: Matthias Reichl +--- + libsrc/xbmcvideochecker/XBMCVideoChecker.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp b/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp +index f638888..054e462 100644 +--- a/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp ++++ b/libsrc/xbmcvideochecker/XBMCVideoChecker.cpp +@@ -62,7 +62,8 @@ void XBMCVideoChecker::receiveReply() + // silence - no "debug" code should be at the log + // std::cout << "KODICHECK INFO: Kodi Message: " << reply.toStdString() << std::endl; + +- if (reply.contains("\"method\":\"Player.OnPlay\"")) ++ if ( (_xbmcVersion < 18 && reply.contains("\"method\":\"Player.OnPlay\"")) || ++ (_xbmcVersion >= 18 && reply.contains("\"method\":\"Player.OnAVStart\"")) ) + { + // send a request for the current player state + _socket.write(_activePlayerRequest.toUtf8()); +-- +2.11.0 + From 3cef93f075ce4ae152b5e0945d8662078bbffbf9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 8 Jun 2018 18:53:58 +0200 Subject: [PATCH 3/4] rpi_ws281x: update to 6c5ade9 Signed-off-by: Matthias Reichl --- packages/addons/addon-depends/rpi_ws281x/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/rpi_ws281x/package.mk b/packages/addons/addon-depends/rpi_ws281x/package.mk index 6b4aa8be38..283674edb2 100644 --- a/packages/addons/addon-depends/rpi_ws281x/package.mk +++ b/packages/addons/addon-depends/rpi_ws281x/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="rpi_ws281x" -PKG_VERSION="f580777" -PKG_SHA256="edc831ff9daac354c54bfab1dad52f282ad44225d5769e6ae2b45160fe21762e" +PKG_VERSION="6c5ade9" +PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21" PKG_ARCH="any" PKG_LICENSE="BSD-3c" PKG_SITE="https://github.com/hyperion-project/rpi_ws281x" From d9b0ee58276e771234beb02f31fae5c78dbbe431 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 8 Jun 2018 18:57:22 +0200 Subject: [PATCH 4/4] hyperion: update rev to 107 Signed-off-by: Matthias Reichl --- packages/addons/service/hyperion/changelog.txt | 4 ++++ packages/addons/service/hyperion/package.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/hyperion/changelog.txt b/packages/addons/service/hyperion/changelog.txt index cb5076ee95..99f0d3eb7f 100644 --- a/packages/addons/service/hyperion/changelog.txt +++ b/packages/addons/service/hyperion/changelog.txt @@ -1,3 +1,7 @@ +107 +- Update to version dc6a602 +- Use correct OnAVStart event on Kodi 18 + 106 - Update to version 1c21232 diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index 95f4b35e7c..5bea17c74f 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -20,7 +20,7 @@ PKG_NAME="hyperion" PKG_VERSION="dc6a602" PKG_SHA256="d585b4e71aafd49f32ced6e27cc88db3c19278a7f258972c22a4e88cad981b0d" -PKG_REV="106" +PKG_REV="107" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hyperion-project/hyperion"