kodi: update to kodi-14-085163e

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/kodi-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="14-b5dbdb5"
+PKG_VERSION="14-085163e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="14-b5dbdb5"
+PKG_VERSION="14-085163e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/patches/kodi-999.96-PR6356.patch

@@ -1,51 +0,0 @@
-From 9e65311555962ea40eae8cf34f2a545957a0beb0 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sat, 7 Feb 2015 18:38:00 +0100
-Subject: [PATCH 1/2] dvdplayer: reset speed of video reference clock after
- refresh rate changed
-
----
- xbmc/video/VideoReferenceClock.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
-index 9246a35..a3ee195 100644
---- a/xbmc/video/VideoReferenceClock.cpp
-+++ b/xbmc/video/VideoReferenceClock.cpp
-@@ -280,6 +280,7 @@ void CVideoReferenceClock::UpdateRefreshrate()
- {
-   CSingleLock SingleLock(m_CritSection);
-   m_RefreshRate = m_pVideoSync->GetFps();
-+  m_ClockSpeed = 1.0;
- 
-   CLog::Log(LOGDEBUG, "CVideoReferenceClock: Detected refreshrate: %.3f hertz", m_RefreshRate);
- }
--- 
-1.9.1
-
-
-From db557b5418b86d04dd6903ce04a9dee21df54882 Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Sun, 8 Feb 2015 21:45:49 +0100
-Subject: [PATCH 2/2] dvdplayer: fix clock speed
-
----
- xbmc/cores/dvdplayer/DVDClock.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/dvdplayer/DVDClock.cpp b/xbmc/cores/dvdplayer/DVDClock.cpp
-index 0a253e4..a496ec0 100644
---- a/xbmc/cores/dvdplayer/DVDClock.cpp
-+++ b/xbmc/cores/dvdplayer/DVDClock.cpp
-@@ -218,7 +218,7 @@ int CDVDClock::UpdateFramerate(double fps, double* interval /*= NULL*/)
- 
-   CSingleLock lock(m_speedsection);
- 
--  double weight = rate / (double)MathUtils::round_int(fps);
-+  double weight = MathUtils::round_int(rate) / (double)MathUtils::round_int(fps);
- 
-   //set the speed of the videoreferenceclock based on fps, refreshrate and maximum speed adjust set by user
-   if (m_maxspeedadjust > 0.05)
--- 
-1.9.1
-

packages/mediacenter/kodi/patches/kodi-999.97-PR6361.patch

@@ -1,80 +0,0 @@
-From 06010806542ef186fe11d7e0c56cc99c6d9e4cd5 Mon Sep 17 00:00:00 2001
-From: wsnipex <wsnipex@a1.net>
-Date: Fri, 6 Feb 2015 11:09:58 +0100
-Subject: [PATCH] [rtmp] re-add rtmp options
-
-partially reverts 0339c8cdf564d056fc307c04d12370ccdc75499b
-fixes (#15756)
----
- .../DVDInputStreams/DVDInputStreamRTMP.cpp         | 31 ++++++++++++++++++++++
- .../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h |  1 +
- 2 files changed, 32 insertions(+)
-
-diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
-index 324eadb..5d45448 100644
---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
-+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
-@@ -122,6 +122,19 @@ bool CDVDInputStreamRTMP::IsEOF()
- #undef AVC
- #define AVC(str)  {(char *)str,sizeof(str)-1}
- 
-+/* librtmp option names are slightly different */
-+static const struct {
-+ const char *name;
-+ AVal key;
-+} options[] = {
-+ { "SWFPlayer", AVC("swfUrl") },
-+ { "PageURL", AVC("pageUrl") },
-+ { "PlayPath", AVC("playpath") },
-+ { "TcUrl", AVC("tcUrl") },
-+ { "IsLive", AVC("live") },
-+ { NULL }
-+};
-+
- bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string& content)
- {
-   if (m_sStreamPlaying)
-@@ -160,6 +173,23 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string& content)
-   }
-   CLog::Log(LOGDEBUG, "RTMP canseek: %s", m_canSeek ? "true" : "false");
- 
-+  /* SetOpt and SetAVal copy pointers to the value. librtmp doesn't use the values until the Connect() call,
-+   * so value objects must stay allocated until then. To be extra safe, keep the values around until Close(),
-+   * in case librtmp needs them again.
-+   */
-+  m_optionvalues.clear();
-+  for (int i=0; options[i].name; i++)
-+  {
-+    std::string tmp = m_item.GetProperty(options[i].name).asString();
-+    if (!tmp.empty())
-+    {
-+      m_optionvalues.push_back(tmp);
-+      AVal av_tmp;
-+      SetAVal(av_tmp, m_optionvalues.back());
-+      m_libRTMP.SetOpt(m_rtmp, &options[i].key, &av_tmp);
-+    }
-+  }
-+
-   if (!m_libRTMP.Connect(m_rtmp, NULL) || !m_libRTMP.ConnectStream(m_rtmp, 0))
-     return false;
- 
-@@ -177,6 +207,7 @@ void CDVDInputStreamRTMP::Close()
-   if (m_rtmp)
-     m_libRTMP.Close(m_rtmp);
- 
-+  m_optionvalues.clear();
-   m_eof = true;
-   m_bPaused = false;
- }
-diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
-index 5568c14..dd00e5a 100644
---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
-+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
-@@ -51,6 +51,7 @@ class CDVDInputStreamRTMP
-   bool       m_canSeek;
-   bool       m_canPause;
-   char*      m_sStreamPlaying;
-+  std::vector<std::string> m_optionvalues;
- 
-   RTMP       *m_rtmp;
-   DllLibRTMP m_libRTMP;