diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk index ec812a2134..2c3a7e0bc4 100644 --- a/packages/mediacenter/kodi-theme-Confluence/package.mk +++ b/packages/mediacenter/kodi-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-theme-Confluence" -PKG_VERSION="16.0-rc3-34d1e49" +PKG_VERSION="16.0-a5f3a99" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 6640b6a47a..c7b54079da 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="16.0-rc3-34d1e49" +PKG_VERSION="16.0-a5f3a99" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch b/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch index 68a927f48b..a976ab3dde 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch @@ -1,14 +1,5 @@ -From a4a1922fee3c51f2005bc6d2738ab1a871319a4f Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 18 Apr 2015 15:23:51 +0300 -Subject: [PATCH 02/13] add openelec.tv RSS news - ---- - userdata/RssFeeds.xml | 1 + - 1 file changed, 1 insertion(+) - diff --git a/userdata/RssFeeds.xml b/userdata/RssFeeds.xml -index 6169113..631aafb 100644 +index 48b99e8..856bf1e 100644 --- a/userdata/RssFeeds.xml +++ b/userdata/RssFeeds.xml @@ -3,6 +3,7 @@ @@ -16,9 +7,6 @@ index 6169113..631aafb 100644 + http://feeds.openelec.tv/news - http://feeds.xbmc.org/xbmc - http://feeds.xbmc.org/latest_xbmc_addons - http://feeds.xbmc.org/updated_xbmc_addons --- -2.5.0 - + http://feeds.kodi.tv/xbmc + http://feeds.kodi.tv/latest_xbmc_addons + http://feeds.kodi.tv/updated_xbmc_addons diff --git a/packages/mediacenter/kodi/patches/kodi-999.01-fix-segfault.patch b/packages/mediacenter/kodi/patches/kodi-999.01-fix-segfault.patch new file mode 100644 index 0000000000..76235c7e49 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.01-fix-segfault.patch @@ -0,0 +1,69 @@ +From 7216c71bfd250f8c3f9fa82685ec635cf7be4b60 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 21 Feb 2016 17:54:20 +0100 +Subject: [PATCH] vaapi: fix segfault + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +index 19f05ca..540f914 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +@@ -738,12 +738,14 @@ int CDecoder::FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags) + + void CDecoder::FFReleaseBuffer(uint8_t *data) + { +- VASurfaceID surf; ++ { ++ VASurfaceID surf; + +- CSingleLock lock(m_DecoderSection); ++ CSingleLock lock(m_DecoderSection); + +- surf = (VASurfaceID)(uintptr_t)data; +- m_videoSurfaces.ClearReference(surf); ++ surf = (VASurfaceID)(uintptr_t)data; ++ m_videoSurfaces.ClearReference(surf); ++ } + + IHardwareDecoder::Release(); + } + +From eb7ccc54a4db746368191927c5b2fe77b4f678fe Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 21 Feb 2016 18:00:24 +0100 +Subject: [PATCH] dxva2: fix segfault + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp +index 1fc5061..a340183 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp +@@ -1144,14 +1144,16 @@ bool CDecoder::Supports(enum PixelFormat fmt) + + void CDecoder::RelBuffer(uint8_t *data) + { +- CSingleLock lock(m_section); +- ID3D11VideoDecoderOutputView* view = (ID3D11VideoDecoderOutputView*)(uintptr_t)data; +- +- if (!m_surface_context->IsValid(view)) + { +- CLog::Log(LOGWARNING, "%s - return of invalid surface", __FUNCTION__); ++ CSingleLock lock(m_section); ++ ID3D11VideoDecoderOutputView* view = (ID3D11VideoDecoderOutputView*)(uintptr_t)data; ++ ++ if (!m_surface_context->IsValid(view)) ++ { ++ CLog::Log(LOGWARNING, "%s - return of invalid surface", __FUNCTION__); ++ } ++ m_surface_context->ClearReference(view); + } +- m_surface_context->ClearReference(view); + + IHardwareDecoder::Release(); + }