Merge pull request #4555 from CvH/10.0/kodi_up_1309

kodi update to latest
This commit is contained in:
Matthias Reichl 2020-09-13 22:04:21 +02:00 committed by GitHub
commit 74678a5160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 83 additions and 125 deletions

View File

@ -61,7 +61,7 @@ class BluetoothAudioClient(object):
def __init__(self):
xbmc.log('%s: starting add-on' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: starting add-on' % __addonid__, xbmc.LOGINFO)
self.devices = {}
self.signal_added = None
@ -75,7 +75,7 @@ class BluetoothAudioClient(object):
def quit(self):
xbmc.log('%s: stopping add-on' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: stopping add-on' % __addonid__, xbmc.LOGINFO)
self.kodi.select_default()
@ -133,8 +133,8 @@ class BluetoothAudioClient(object):
self.devices[device_path]['Connected'] = audio_device_iface.Get('org.bluez.Device1', 'Connected')
if self.devices[device_path]['Class'] & (1 << 21):
xbmc.log('%s: bluetooth audio device connected' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: switching to bluetooth audio device' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: bluetooth audio device connected' % __addonid__, xbmc.LOGINFO)
xbmc.log('%s: switching to bluetooth audio device' % __addonid__, xbmc.LOGINFO)
self.kodi.select_pulse()
elif kwargs['signal'] == 'InterfacesRemoved':
@ -147,15 +147,15 @@ class BluetoothAudioClient(object):
self.devices[device_path]['Connected'] = audio_device_iface.Get('org.bluez.Device1', 'Connected')
time.sleep(0.1)
xbmc.log('%s: bluetooth audio device disconnected' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: checking for other connected devices' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: bluetooth audio device disconnected' % __addonid__, xbmc.LOGINFO)
xbmc.log('%s: checking for other connected devices' % __addonid__, xbmc.LOGINFO)
for path in self.devices:
if self.devices[path]['Connected'] and self.devices[path]['Class'] & (1 << 21):
xbmc.log('%s: found connected bluetooth audio device' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: found connected bluetooth audio device' % __addonid__, xbmc.LOGINFO)
return
xbmc.log('%s: switching to default audio device' % __addonid__, xbmc.LOGNOTICE)
xbmc.log('%s: switching to default audio device' % __addonid__, xbmc.LOGINFO)
self.kodi.select_default()
except (TypeError, KeyError, dbus.exceptions.DBusException) as e:

View File

@ -40,7 +40,7 @@ def get_settings():
def log(message):
xbmc.log('{}: {}'.format(ADDON_NAME, message), xbmc.LOGNOTICE)
xbmc.log('{}: {}'.format(ADDON_NAME, message), xbmc.LOGINFO)
def notification(message):

View File

@ -142,7 +142,7 @@ class SlicePlayer(xbmc.Player):
self.speed = 1
patterns.play('startup', False, 0.02)
xbmc.log('service.slice add-on started', xbmc.LOGNOTICE)
xbmc.log('service.slice add-on started', xbmc.LOGINFO)
def onPlayBackEnded(self):
'Will be called when Kodi stops playing a file'

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libretro-mame2003"
PKG_VERSION="56cab1f992f12fc32d1495d0c917e1348cb1cb52"
PKG_SHA256="9d3a61c5401e5596196e6ef31f5ecba72e6016c85a9db68b7f717470f74ed8df"
PKG_VERSION="dd5a8dbdf932bde88d39078d547cd1abaa464572"
PKG_SHA256="b51398af4652abe9aac2cf3c1c93a6c4791d54e5bf81b7efc0dfdab40d6be89f"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mame2003-libretro"
PKG_URL="https://github.com/libretro/mame2003-libretro/archive/$PKG_VERSION.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libretro-mame2003_plus"
PKG_VERSION="be7dd0a46b06f035255aab666865da70a27f2060"
PKG_SHA256="f2c9740dc1022eb8a393a23f8081411dc463b1f9bd7edddbac41b69ef15d55fb"
PKG_VERSION="6c821ada3292270fe33d483e3c58753e8be136e7"
PKG_SHA256="fa04f7665f4655d448d83c5aff8ffe5686ce31e73406d3ad63d0d802e3f2477e"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/mame2003-plus-libretro"
PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/$PKG_VERSION.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libretro-mgba"
PKG_VERSION="20f007cf02f8412dfd4bc6d1d09ddac3f78e10b1"
PKG_SHA256="bcb0370625ecc85d906ed5e267abba2ea35c8ba8b6b5b68839e95709131b00a9"
PKG_VERSION="b485ee7aacad17cc3aea48bbf64f4dc38dc5b789"
PKG_SHA256="d8826bdf20f548071f2cc527170d639ef3b40da30cb5dccfff6a877d228d34ae"
PKG_LICENSE="MPL 2.0"
PKG_SITE="https://github.com/libretro/mgba"
PKG_URL="https://github.com/libretro/mgba/archive/$PKG_VERSION.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2003"
PKG_VERSION="0.78.0.18-Leia"
PKG_SHA256="5726cabc19a0e04e80630198e7fdb288990d1a6059392d0d8f5eb8bd3caaff83"
PKG_VERSION="0.78.0.20-Leia"
PKG_SHA256="3a780823b9c349fc089925668f2466d1b9a03c6b217d9607459106b20ab344da"
PKG_REV="1"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/kodi-game/game.libretro.mame2003"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mame2003_plus"
PKG_VERSION="0.0.1.29-Leia"
PKG_SHA256="8dc731c40210a706589f6b97df61156fa1f51b7d3c0cca340b86343c3b8d8ab9"
PKG_VERSION="0.0.1.31-Leia"
PKG_SHA256="7c2bed41603f3a5e1a3bbecc84adbcf5c520b21dec7f5f84251e2b0ea172b409"
PKG_REV="1"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/kodi-game/game.libretro.mame2003_plus"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.mgba"
PKG_VERSION="0.8.3.11-Leia"
PKG_SHA256="89f81aabb8f4a22a484abd48a10a74458226eae7bddd1cef258f82d799cddd96"
PKG_VERSION="0.8.3.12-Leia"
PKG_SHA256="26c92f156d8f427037e8d00ba303a1b7cf56c9e705f2168a6641e4e12290c786"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro.sameboy"
PKG_VERSION="0.12.0.11-Leia"
PKG_SHA256="1ca88f25a951f59aca8eb3dd1a0700312528e6dd09729881dbf8dfd9d5467083"
PKG_VERSION="0.0.1.12-Leia"
PKG_SHA256="ceea0092aa4449e5f2210b302a517357f7f1651076b29c4a9c409bf32d18e054"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="game.libretro"
PKG_VERSION="2.1.0-Matrix"
PKG_SHA256="957ce5c1774087fa14eb9b45bd62f412a9479993ef811c0b731e2b17d4442c3b"
PKG_VERSION="2.2.0-Matrix"
PKG_SHA256="b92670065d5644b4766bb90ee51cc69730e11b4a8dc912bbe90dce7d07b39e32"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="inputstream.ffmpegdirect"
PKG_VERSION="1.15.0-Matrix"
PKG_SHA256="a8f16004621bf5171f5382b04a736c92a8cf531beb7d4ce477a03ddb08425105"
PKG_VERSION="1.15.3-Matrix"
PKG_SHA256="16da84ea54a7ed631fbbdc25b89c5b322148113b2d4664f29c279e6ae54d0a34"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL2+"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="peripheral.joystick"
PKG_VERSION="1.6.1-Matrix"
PKG_SHA256="b9bd126932df3e01c5d13eecf3565ceeea7977121ed4ef35c7ec3cc1b07e6326"
PKG_VERSION="1.7.0-Matrix"
PKG_SHA256="7146ba5f4cc803002cfeb2f1a8c51bd6d0715d5c549015f117d2d53d4a8d2e6c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="peripheral.xarcade"
PKG_VERSION="1.1.1-Matrix"
PKG_SHA256="210c090abc6827e1afcf14a6737f33f3a963867aa83bd15224eadb1610fcd380"
PKG_VERSION="1.2.0-Matrix"
PKG_SHA256="6fa8e1d0e6ebb6c385a7aef6e6c7629d2f1f52601ade7839093c1c3abb844894"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.asteroids"
PKG_VERSION="2.5.0-Matrix"
PKG_SHA256="f01ae832c3a75081d7d5673ac607abcf6bf8d1b2f4b3782433e4eb20f5bc1b7d"
PKG_VERSION="2.5.1-Matrix"
PKG_SHA256="a379d7ae5e0811d7f96245ece5f9e6e3e4c93cc0ae9acd141bf47e2febc026d3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.asterwave"
PKG_VERSION="3.2.0-Matrix"
PKG_SHA256="4734ec479ee1253406d1bd6b6ed21649c1df5bd82ae73f957856180d0731b27d"
PKG_VERSION="3.2.1-Matrix"
PKG_SHA256="6a63bbaac1ad091a697acc93c6124176aa1ce1185bc8693d7ae02a3255f1a8b8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.greynetic"
PKG_VERSION="2.4.0-Matrix"
PKG_SHA256="0ee10818c5691ffd4c57d83d5c1b4785716c701b8f0e591f2b294d0b157cd73c"
PKG_VERSION="2.4.1-Matrix"
PKG_SHA256="d78a53d014f8fcf7efddbaf59faa9c8d74d10d0e4e9bb54b92ccf96e27cbf235"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.matrixtrails"
PKG_VERSION="2.5.0-Matrix"
PKG_SHA256="7d32d710a3df31792ab886be5627c045f7394d654cd79986b78195977feb57df"
PKG_VERSION="2.5.1-Matrix"
PKG_SHA256="bdf2bf9685b6546d0679cfa548c431c3419eea8d0110143fc3e06096d5d78557"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.pingpong"
PKG_VERSION="2.3.0-Matrix"
PKG_SHA256="041ad859c883d65974a971c233d2ae2888ffefd64d9fc3e44e3c478481d5ce9d"
PKG_VERSION="2.3.1-Matrix"
PKG_SHA256="d1e0dda7288bf7cc05e7d786d4c1a2fc52ae80489a21aa50068273fd4ea5669b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="screensaver.shadertoy"
PKG_VERSION="3.1.0-Matrix"
PKG_SHA256="05eddd69eb3eae5b88d6032dda8fd51f31e1fa43a6314bccc6a8d0f930704d4a"
PKG_VERSION="3.1.1-Matrix"
PKG_SHA256="6d4ef7591644cf05423bb5b5fe6c4484d816609dfe12607dcefda8753a003f45"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.fishbmc"
PKG_VERSION="6.2.0-Matrix"
PKG_SHA256="f80a69fa93cf64c0216289d11e1dc0161a9d18d31f5344b5548d3793fda18a9c"
PKG_VERSION="6.2.1-Matrix"
PKG_SHA256="4cf21ad69d2b02b893c5efca2a6c1634e053a237fc9e79e6ee9bece78fbb79bb"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.goom"
PKG_VERSION="3.3.0-Matrix"
PKG_SHA256="d714e40383048af236efd6c256dcfceffad0e7526417f8d2c5c187ae83c8c1cc"
PKG_VERSION="3.3.1-Matrix"
PKG_SHA256="96cc3e9d6570cc0deb301a0c0d1fd21da09d9d7c3c816066fae9561972b2501f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.pictureit"
PKG_VERSION="3.3.0-Matrix"
PKG_SHA256="adcfc02cfc2e51082c0885dc4dce2cb589f7de536788bf9300f27035293a71a8"
PKG_VERSION="3.3.1-Matrix"
PKG_SHA256="cd26c3213a15698a2054edf96254f477d02b0588f63997e46874acc0f6c20696"
PKG_REV="1"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.shadertoy"
PKG_VERSION="2.2.0-Matrix"
PKG_SHA256="8dd7d57648c578debf6ef2d96112c835fcbd30aec7ee2e81b8c65bcc1c4017af"
PKG_VERSION="2.2.1-Matrix"
PKG_SHA256="1108b3e6a79f49de840dd47e17aa6f1b3e83153c70ed135fb5ded95646dee6ce"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.spectrum"
PKG_VERSION="3.3.0-Matrix"
PKG_SHA256="e2ea7e4b5637a5f4243e4129072c6ed0864192f42096e2148fa53066cc22e96f"
PKG_VERSION="3.3.1-Matrix"
PKG_SHA256="611cf243e22da0a15d85f9fb7b5fc8a77f89fb12e82733ba85f8e5c57bf1465e"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.starburst"
PKG_VERSION="2.3.0-Matrix"
PKG_SHA256="6bd768e375ece8d2e19cc110d597b66bb390ce494a94586dce353b99d7aab153"
PKG_VERSION="2.3.1-Matrix"
PKG_SHA256="5d8458965ecc17c46d65818a7c68ced71122c454fb90e99f986196178d51b652"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.waveform"
PKG_VERSION="4.3.0-Matrix"
PKG_SHA256="0d3f15701358d060cf2e24eae02525f1baeb9538c94ee6a101b0cdf1ddb327cc"
PKG_VERSION="4.3.1-Matrix"
PKG_SHA256="700a2e2fa6f1983738ec504afc9fd278df90879ff5736068ec55b125fca99d63"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi"
PKG_VERSION="339dd24a8c0e02fd91e59fa9f625eb1a76dbb212"
PKG_SHA256="ffb6984864a0755ea1a3f4d61451911209a7691a8aaffcda455ee38cadceb07a"
PKG_VERSION="1cd618c9cfc9a6c57474959a77ae6a8db3013259"
PKG_SHA256="043f8b74d2a39f536855d9c2a1439e3eeecd25ca0038acbf03065d911d254599"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"

View File

@ -1,39 +0,0 @@
From 22ab58e8f958980c070a46cabe197b3557dda0a3 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 6 Sep 2020 23:50:53 +0200
Subject: [PATCH] [cmake] support libplist version 2.2.0
libplist 2.2.0 changed the pkgconfig and library names from
libplist(++) to libplist(++)-2.0. Add these names to cmake pkgconfig
and library lists so cmake can pick up external 2.2 versions as well.
Signed-off-by: Matthias Reichl <hias@horus.com>
---
cmake/modules/FindPlist.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake
index 2c86b7493a..8f9b2d6cd7 100644
--- a/cmake/modules/FindPlist.cmake
+++ b/cmake/modules/FindPlist.cmake
@@ -15,7 +15,7 @@
# Plist::Plist - The Plist library
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_PLIST libplist QUIET)
+ pkg_search_module(PC_PLIST libplist-2.0 libplist QUIET)
endif()
find_path(PLIST_INCLUDE_DIR plist/plist.h
@@ -23,7 +23,7 @@ find_path(PLIST_INCLUDE_DIR plist/plist.h
set(PLIST_VERSION ${PC_PLIST_VERSION})
-find_library(PLIST_LIBRARY NAMES plist libplist
+find_library(PLIST_LIBRARY NAMES plist-2.0 plist libplist-2.0 libplist
PATHS ${PC_PLIST_LIBDIR})
include(FindPackageHandleStandardArgs)
--
2.20.1

View File

@ -5,7 +5,7 @@ diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 1d112c4dd218..eaff4ee12d3f 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -1710,7 +1710,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
@@ -1702,7 +1702,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL},

View File

@ -11,7 +11,7 @@ diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index a6f6119b81..adf77074e0 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -4695,7 +4695,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
@@ -4692,7 +4692,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
void CApplication::Minimize()
{

View File

@ -80,10 +80,10 @@ index e8fed4e5bc..e8be365b44 100644
{
public:
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index f9a133474c..f4f7906765 100644
index 8150789b8f..49a84033e8 100644
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -735,6 +735,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
@@ -733,6 +733,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
AddonPtr addon;
if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
{
@ -91,7 +91,7 @@ index f9a133474c..f4f7906765 100644
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
}
@@ -763,6 +764,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
@@ -761,6 +762,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
if (!m_database.EnableAddon(id))
return false;
m_disabled.erase(id);

View File

@ -23,10 +23,10 @@ so, when shutdown/reboot is requested:
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index a6f6119b81..6b24f6bfe9 100644
index cb164168bd..d57f4791ef 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2073,12 +2073,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2069,12 +2069,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (msg)
{
case TMSG_POWERDOWN:
@ -41,7 +41,7 @@ index a6f6119b81..6b24f6bfe9 100644
break;
case TMSG_SHUTDOWN:
@@ -2099,12 +2099,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2095,12 +2095,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
case TMSG_RESTART:
case TMSG_RESET:
@ -56,7 +56,7 @@ index a6f6119b81..6b24f6bfe9 100644
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2582,6 +2583,17 @@ bool CApplication::Cleanup()
@@ -2579,6 +2580,17 @@ bool CApplication::Cleanup()
}
}
@ -74,7 +74,7 @@ index a6f6119b81..6b24f6bfe9 100644
void CApplication::Stop(int exitCode)
{
CLog::Log(LOGINFO, "Stopping player");
@@ -2608,7 +2620,7 @@ void CApplication::Stop(int exitCode)
@@ -2605,7 +2617,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@ -83,7 +83,7 @@ index a6f6119b81..6b24f6bfe9 100644
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2640,7 +2652,6 @@ void CApplication::Stop(int exitCode)
@@ -2637,7 +2649,6 @@ void CApplication::Stop(int exitCode)
// Needs cleaning up
CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false;
@ -91,7 +91,7 @@ index a6f6119b81..6b24f6bfe9 100644
CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager
@@ -4225,7 +4236,7 @@ void CApplication::ProcessSlow()
@@ -4222,7 +4233,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag())
{
CLog::Log(LOGINFO, "Quitting due to POSIX signal");

View File

@ -1,7 +1,7 @@
From 63c6707ac488e5bb61da045845cf533f39899dbf Mon Sep 17 00:00:00 2001
From 598151eb44cb9eec05a6403a1eee1efbd6ab0f61 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 27 Mar 2020 15:14:11 +0000
Subject: [PATCH 6/8] VideoPlayer: Add setting to disable non-hevc accel
Subject: [PATCH] VideoPlayer: Add setting to disable non-hevc accel
---
addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++
@ -12,7 +12,7 @@ Subject: [PATCH 6/8] VideoPlayer: Add setting to disable non-hevc accel
5 files changed, 26 insertions(+)
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 35706f9f07..2ae4e31231 100644
index 6beae9269ef1..a7331a4f4cf6 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -7275,6 +7275,16 @@ msgctxt "#13467"
@ -33,7 +33,7 @@ index 35706f9f07..2ae4e31231 100644
#: system/settings/settings.xml
diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml
index cdc6c2b284..fa6a14d4c6 100644
index cdc6c2b284d8..fa6a14d4c6ce 100644
--- a/system/settings/gbm.xml
+++ b/system/settings/gbm.xml
@@ -26,6 +26,12 @@
@ -50,7 +50,7 @@ index cdc6c2b284..fa6a14d4c6 100644
<visible>false</visible>
<level>2</level>
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
index f892b1140d..d25c64012c 100644
index ba3c93d89d48..0abcc90e72d5 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp
@@ -221,6 +221,13 @@ int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* fra
@ -59,7 +59,7 @@ index f892b1140d..d25c64012c 100644
{
+ if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_VIDEOPLAYER_DISABLE_NON_HEVC) && hints.codec != AV_CODEC_ID_HEVC)
+ {
+ CLog::Log(LOGNOTICE, "CDVDVideoCodecDRMPRIME::{} - codec {} disallowed",
+ CLog::Log(LOGINFO, "CDVDVideoCodecDRMPRIME::{} - codec {} disallowed",
+ __FUNCTION__, hints.codec);
+ return false;
+ }
@ -68,10 +68,10 @@ index f892b1140d..d25c64012c 100644
if (!pCodec)
{
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 67e87a53e5..2d91880849 100644
index 8036a9086842..eb771c984c19 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -135,6 +135,7 @@ const std::string CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD = "videoplayer.ren
@@ -132,6 +132,7 @@ const std::string CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD = "videoplayer.ren
const std::string CSettings::SETTING_VIDEOPLAYER_HQSCALERS = "videoplayer.hqscalers";
const std::string CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC = "videoplayer.usemediacodec";
const std::string CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE = "videoplayer.usemediacodecsurface";
@ -79,7 +79,7 @@ index 67e87a53e5..2d91880849 100644
const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAU = "videoplayer.usevdpau";
const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAUMIXER = "videoplayer.usevdpaumixer";
const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAUMPEG2 = "videoplayer.usevdpaumpeg2";
@@ -954,6 +955,7 @@ void CSettings::InitializeISettingCallbacks()
@@ -947,6 +948,7 @@ void CSettings::InitializeISettingCallbacks()
settingSet.insert(CSettings::SETTING_VIDEOSCREEN_TESTPATTERN);
settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC);
settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE);
@ -88,10 +88,10 @@ index 67e87a53e5..2d91880849 100644
settingSet.insert(CSettings::SETTING_SOURCE_VIDEOS);
settingSet.insert(CSettings::SETTING_SOURCE_MUSIC);
diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
index 7280587324..3dbaeeb234 100644
index 518d3c19ccf5..d74f8cc8da36 100644
--- a/xbmc/settings/Settings.h
+++ b/xbmc/settings/Settings.h
@@ -100,6 +100,7 @@ public:
@@ -100,6 +100,7 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC
static const std::string SETTING_VIDEOPLAYER_HQSCALERS;
static const std::string SETTING_VIDEOPLAYER_USEMEDIACODEC;
static const std::string SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE;
@ -99,6 +99,3 @@ index 7280587324..3dbaeeb234 100644
static const std::string SETTING_VIDEOPLAYER_USEVDPAU;
static const std::string SETTING_VIDEOPLAYER_USEVDPAUMIXER;
static const std::string SETTING_VIDEOPLAYER_USEVDPAUMPEG2;
--
2.20.1