Merge pull request #2758 from HiassofT/le9-hyperion

hyperion: update to latest version and add potential fix for Kodi 18 issue
This commit is contained in:
Christian Hewitt 2018-06-26 06:36:00 +04:00 committed by GitHub
commit 79d33a571a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 16 deletions

View File

@ -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"

View File

@ -1,3 +1,7 @@
107
- Update to version dc6a602
- Use correct OnAVStart event on Kodi 18
106
- Update to version 1c21232

View File

@ -18,9 +18,9 @@
################################################################################
PKG_NAME="hyperion"
PKG_VERSION="1c21232"
PKG_SHA256="aea69ba3027c0f967880a65f0c39a2cd7f9cf913947b755ac37a2572a77d51c0"
PKG_REV="106"
PKG_VERSION="dc6a602"
PKG_SHA256="d585b4e71aafd49f32ced6e27cc88db3c19278a7f258972c22a4e88cad981b0d"
PKG_REV="107"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/hyperion-project/hyperion"

View File

@ -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 <vector>
+#include <cassert>
#include <cstdint>
#include <cstring>
#include <algorithm>

View File

@ -0,0 +1,27 @@
From 1c134f52389f93b94fa6db291b79ba3933a031f7 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 8 Jun 2018 17:19:35 +0200
Subject: [PATCH] XBMCVideoChecker: use OnAVStart event for Kodi 18
Signed-off-by: Matthias Reichl <hias@horus.com>
---
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