diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 246860ae71..343b3865ef 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -18,8 +18,8 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="593949a" -PKG_SHA256="7a4ccfacd24461d5dfbba9be362372912ebc26dd6743e52b706907b6cc081be5" +PKG_VERSION="87c7f9b" +PKG_SHA256="97f8aec04fcc7a19890ae6f02520f375bbb7bb798d0fb229e486092dc0bc1ff1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" diff --git a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch index 7fbca0cd66..a7bf93ed54 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch @@ -19,8 +19,8 @@ index 6e31a80..2e76053 100644 CWinSystemX11GLContext::CWinSystemX11GLContext() { - std::string envSink; -- if (getenv("AE_SINK")) -- envSink = getenv("AE_SINK"); +- if (getenv("KODI_AE_SINK")) +- envSink = getenv("KODI_AE_SINK"); - if (StringUtils::EqualsNoCase(envSink, "ALSA")) - { - OPTIONALS::ALSARegister(); @@ -85,8 +85,8 @@ index 72ddf6a..79e81d5 100644 m_libinput(new CLibInputHandler) { - std::string envSink; -- if (getenv("AE_SINK")) -- envSink = getenv("AE_SINK"); +- if (getenv("KODI_AE_SINK")) +- envSink = getenv("KODI_AE_SINK"); - if (StringUtils::EqualsNoCase(envSink, "ALSA")) - { - OPTIONALS::ALSARegister(); diff --git a/projects/RPi/patches/kodi/kodi-0100-temp-add-pr13594.patch b/projects/RPi/patches/kodi/kodi-0100-temp-add-pr13594.patch deleted file mode 100644 index b6e1bc4646..0000000000 --- a/projects/RPi/patches/kodi/kodi-0100-temp-add-pr13594.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 73fc8d7461e50426c20036e97a28af6fc974cbb9 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Mon, 26 Feb 2018 20:58:08 +0000 -Subject: [PATCH] DVDVideoCodec: Initialise VideoPicture fields to zero - -After the memset on VideoPicture was removed we are now accessing -uninitialised class members, e.g. pts and dts - -This caused stalls on start of playback and wild values in -a/v: offset. - -Make sure they are initialised. ---- - xbmc/cores/VideoPlayer/DVDFileInfo.cpp | 5 +++-- - xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp | 1 + - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp -index 1350dcf9c2aa..cb7b8bc682d5 100644 ---- a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp -+++ b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp -@@ -216,8 +216,8 @@ bool CDVDFileInfo::ExtractThumb(const std::string &strPath, - if (pDemuxer->SeekTime(nSeekTo, true)) - { - CDVDVideoCodec::VCReturn iDecoderState = CDVDVideoCodec::VC_NONE; -- VideoPicture picture = {}; -- -+ VideoPicture picture; -+ picture.Reset(); - // num streams * 160 frames, should get a valid frame, if not abort. - int abort_index = pDemuxer->GetNrOfStreams() * 160; - do -@@ -240,6 +240,7 @@ bool CDVDFileInfo::ExtractThumb(const std::string &strPath, - iDecoderState = CDVDVideoCodec::VC_NONE; - while (iDecoderState == CDVDVideoCodec::VC_NONE) - { -+ picture.Reset(); - iDecoderState = pVideoCodec->GetPicture(&picture); - } - -diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -index b547d17cb27a..b8a7797ba0b6 100644 ---- a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -+++ b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp -@@ -317,6 +317,7 @@ void CVideoPlayerVideo::Process() - int iDropDirective; - bool onlyPrioMsgs = false; - -+ m_picture.Reset(); - m_videoStats.Start(); - m_droppingStats.Reset(); - m_iDroppedFrames = 0;