diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 800147607b..73520dad46 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="19.0-Matrix" -PKG_SHA256="f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2" +PKG_VERSION="4471acbb77ab5197b9144a9125a575a53ed47a6d" +PKG_SHA256="3a7bfe1cd10129ff6763797e386d19cfb52c50a428f740ea7882b2d2dbb72180" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch index 298b99827f..11adba478e 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch @@ -47,7 +47,7 @@ // OE addon->OnPostInstall(update, modal); -@@ -416,6 +450,8 @@ void OnPostInstall(const AddonPtr& addon +@@ -416,6 +449,8 @@ void OnPostInstall(const AddonPtr& addon void OnPreUnInstall(const AddonPtr& addon) { @@ -76,7 +76,7 @@ public: --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp -@@ -788,6 +788,7 @@ bool CAddonMgr::DisableAddon(const std:: +@@ -789,6 +789,7 @@ bool CAddonMgr::DisableAddon(const std:: AddonPtr addon; if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL) { @@ -84,7 +84,7 @@ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); } -@@ -833,6 +834,7 @@ bool CAddonMgr::EnableSingle(const std:: +@@ -834,6 +835,7 @@ bool CAddonMgr::EnableSingle(const std:: if (!m_database.EnableAddon(id)) return false; m_disabled.erase(id); diff --git a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch index 6945253655..c7ec60588a 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch @@ -9,7 +9,7 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -446,6 +446,9 @@ void OnPostInstall(const AddonPtr& addon +@@ -445,6 +445,9 @@ void OnPostInstall(const AddonPtr& addon // OE addon->OnPostInstall(update, modal); @@ -19,7 +19,7 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall } void OnPreUnInstall(const AddonPtr& addon) -@@ -458,6 +461,9 @@ void OnPreUnInstall(const AddonPtr& addo +@@ -457,6 +460,9 @@ void OnPreUnInstall(const AddonPtr& addo void OnPostUnInstall(const AddonPtr& addon) { addon->OnPostUnInstall(); diff --git a/packages/mediacenter/kodi/patches/kodi-995.20-gbm-default-to-original-crtc-mode.patch b/packages/mediacenter/kodi/patches/kodi-995.20-gbm-default-to-original-crtc-mode.patch index fb4d1e87af..1803e9d504 100644 --- a/packages/mediacenter/kodi/patches/kodi-995.20-gbm-default-to-original-crtc-mode.patch +++ b/packages/mediacenter/kodi/patches/kodi-995.20-gbm-default-to-original-crtc-mode.patch @@ -25,8 +25,6 @@ Signed-off-by: Matthias Reichl xbmc/windowing/gbm/drm/DRMUtils.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) -diff --git a/xbmc/windowing/gbm/drm/DRMCrtc.h b/xbmc/windowing/gbm/drm/DRMCrtc.h -index 15d7f8faf6..a1aadc2fad 100644 --- a/xbmc/windowing/gbm/drm/DRMCrtc.h +++ b/xbmc/windowing/gbm/drm/DRMCrtc.h @@ -30,6 +30,7 @@ public: @@ -37,11 +35,9 @@ index 15d7f8faf6..a1aadc2fad 100644 private: struct DrmModeCrtcDeleter -diff --git a/xbmc/windowing/gbm/drm/DRMUtils.cpp b/xbmc/windowing/gbm/drm/DRMUtils.cpp -index 5593ce086b..85fc266fd2 100644 --- a/xbmc/windowing/gbm/drm/DRMUtils.cpp +++ b/xbmc/windowing/gbm/drm/DRMUtils.cpp -@@ -144,6 +144,9 @@ drm_fb * CDRMUtils::DrmFbGetFromBo(struct gbm_bo *bo) +@@ -144,6 +144,9 @@ drm_fb * CDRMUtils::DrmFbGetFromBo(struc bool CDRMUtils::FindPreferredMode() { @@ -65,6 +61,3 @@ index 5593ce086b..85fc266fd2 100644 return true; } } --- -2.20.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-995.30-CDVDVideoCodecDRMPRIME-skip-frames-when-requested.patch b/packages/mediacenter/kodi/patches/kodi-995.30-CDVDVideoCodecDRMPRIME-skip-frames-when-requested.patch index da55f3ae2d..b055828d18 100644 --- a/packages/mediacenter/kodi/patches/kodi-995.30-CDVDVideoCodecDRMPRIME-skip-frames-when-requested.patch +++ b/packages/mediacenter/kodi/patches/kodi-995.30-CDVDVideoCodecDRMPRIME-skip-frames-when-requested.patch @@ -8,11 +8,9 @@ Subject: [PATCH] CDVDVideoCodecDRMPRIME: skip frames when requested .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.h | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -index 8024c20816ffe..b27db92b5f7d7 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -@@ -517,6 +517,12 @@ void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture) +@@ -517,6 +517,12 @@ void CDVDVideoCodecDRMPRIME::SetPictureP pVideoPicture->iFlags = 0; pVideoPicture->iFlags |= m_pFrame->interlaced_frame ? DVP_FLAG_INTERLACED : 0; pVideoPicture->iFlags |= m_pFrame->top_field_first ? DVP_FLAG_TOP_FIELD_FIRST : 0; @@ -25,7 +23,7 @@ index 8024c20816ffe..b27db92b5f7d7 100644 int64_t pts = m_pFrame->best_effort_timestamp; pVideoPicture->pts = (pts == AV_NOPTS_VALUE) -@@ -590,3 +596,24 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo +@@ -590,3 +596,24 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecD return VC_PICTURE; } @@ -50,11 +48,9 @@ index 8024c20816ffe..b27db92b5f7d7 100644 + } + } +} -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h -index 77d066c3d9caf..9d70893b70b83 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h -@@ -29,7 +29,7 @@ class CDVDVideoCodecDRMPRIME : public CDVDVideoCodec +@@ -29,7 +29,7 @@ public: CDVDVideoCodec::VCReturn GetPicture(VideoPicture* pVideoPicture) override; const char* GetName() override { return m_name.c_str(); } unsigned GetAllowedReferences() override { return 5; }