xbmc: update to xbmc-2.1.7

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

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.1.6"
+PKG_VERSION="12.1.7"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="83b16d0"
 fi

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.1.6"
+PKG_VERSION="12.1.7"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="83b16d0"
 fi

packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.11-PR2591.patch

@@ -1,59 +0,0 @@
-From 0ce48acad58271f8313a88132ff84a4724907686 Mon Sep 17 00:00:00 2001
-From: huceke <gimli>
-Date: Wed, 10 Apr 2013 08:36:58 +0200
-Subject: [PATCH 1/2] [rbp/omxplayer] make sure we can also abort the open of a
- ffmpeg input stream
-
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 7de531b..0b7954f 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -525,6 +525,9 @@ bool COMXPlayer::CloseFile()
-   if(m_pSubtitleDemuxer)
-     m_pSubtitleDemuxer->Abort();
- 
-+  if(m_pInputStream)
-+    m_pInputStream->Abort();
-+
-   CLog::Log(LOGDEBUG, "COMXPlayer: waiting for threads to exit");
- 
-   // wait for the main thread to finish up
--- 
-1.8.1.6
-
-
-From 2583f13dd42e7a6f0acf6ddcdfae68e784764de8 Mon Sep 17 00:00:00 2001
-From: huceke <gimli>
-Date: Wed, 10 Apr 2013 08:39:03 +0200
-Subject: [PATCH 2/2] [rbp/omxplayer] reevaluate HasVideo/Audio after a stream
- change
-
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 0b7954f..f39ab6f 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -815,6 +815,13 @@ bool COMXPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
-         m_SelectionStreams.Clear(STREAM_NONE, STREAM_SOURCE_DEMUX);
-         m_SelectionStreams.Update(m_pInputStream, m_pDemuxer);
-         OpenDefaultStreams(false);
-+
-+        // reevaluate HasVideo/Audio, we may have switched from/to a radio channel
-+        if(m_CurrentVideo.id < 0)
-+          m_HasVideo = false;
-+        if(m_CurrentAudio.id < 0)
-+          m_HasAudio = false;
-+
-         return true;
-     }
- 
--- 
-1.8.1.6
-

packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.12-PR2593.patch

@@ -1,91 +0,0 @@
-From 3ce0c7a096d497d24d41bf5d908e62f92281f1da Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Thu, 11 Apr 2013 00:48:10 +0100
-Subject: [PATCH] [rbp] Fix elapsed time not updating near end of file
-
-Currently, once demuxer has reached EOF, we send the EOF messages to audio/video players
-and set their inited/started flags to false. But if started is false we ignore any
-PLAYER_DISPLAYTIME coming back from players, which stops the elapsed time from updating.
-This can affect the final ~8 seconds of the file.
-
-The fix delays changing these flags until audio/video players have signalled EOS.
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 46 +++++++++++++++++++++-----------------
- 1 file changed, 26 insertions(+), 20 deletions(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 7de531b..419bb0e 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -937,6 +937,7 @@ void COMXPlayer::Process()
- {
-   bool bOmxWaitVideo = false;
-   bool bOmxWaitAudio = false;
-+  bool bOmxSentEOFs = false;
- 
-   if (!OpenInputStream())
-   {
-@@ -1222,28 +1223,24 @@ void COMXPlayer::Process()
-       }
- 
-       // make sure we tell all players to finish it's data
--      if(m_CurrentAudio.inited)
-+      if (!bOmxSentEOFs)
-       {
--        m_player_audio.SendMessage   (new CDVDMsg(CDVDMsg::GENERAL_EOF));
--        bOmxWaitAudio = true;
--      }
--      if(m_CurrentVideo.inited)
--      {
--        m_player_video.SendMessage   (new CDVDMsg(CDVDMsg::GENERAL_EOF));
--        bOmxWaitVideo = true;
-+        if(m_CurrentAudio.inited)
-+        {
-+          m_player_audio.SendMessage   (new CDVDMsg(CDVDMsg::GENERAL_EOF));
-+          bOmxWaitAudio = true;
-+        }
-+        if(m_CurrentVideo.inited)
-+        {
-+          m_player_video.SendMessage   (new CDVDMsg(CDVDMsg::GENERAL_EOF));
-+          bOmxWaitVideo = true;
-+        }
-+        if(m_CurrentSubtitle.inited)
-+          m_player_subtitle.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
-+        if(m_CurrentTeletext.inited)
-+          m_player_teletext.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
-+        bOmxSentEOFs = true;
-       }
--      if(m_CurrentSubtitle.inited)
--        m_player_subtitle.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
--      if(m_CurrentTeletext.inited)
--        m_player_teletext.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
--      m_CurrentAudio.inited    = false;
--      m_CurrentVideo.inited    = false;
--      m_CurrentSubtitle.inited = false;
--      m_CurrentTeletext.inited = false;
--      m_CurrentAudio.started    = false;
--      m_CurrentVideo.started    = false;
--      m_CurrentSubtitle.started = false;
--      m_CurrentTeletext.started = false;
- 
-       // if we are caching, start playing it again
-       SetCaching(CACHESTATE_DONE);
-@@ -1271,6 +1268,15 @@ void COMXPlayer::Process()
-       if (!m_pInputStream->IsEOF())
-         CLog::Log(LOGINFO, "%s - eof reading from demuxer", __FUNCTION__);
- 
-+      m_CurrentAudio.inited    = false;
-+      m_CurrentVideo.inited    = false;
-+      m_CurrentSubtitle.inited = false;
-+      m_CurrentTeletext.inited = false;
-+      m_CurrentAudio.started    = false;
-+      m_CurrentVideo.started    = false;
-+      m_CurrentSubtitle.started = false;
-+      m_CurrentTeletext.started = false;
-+
-       break;
-     }
- 
--- 
-1.8.1.5
-

packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.13-PR2641.patch

@@ -1,28 +0,0 @@
-From 067058c557dde84300efe56e8881aed3a6caf75b Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Thu, 18 Apr 2013 01:30:05 +0100
-Subject: [PATCH] [rbp/omxplayer] Fix audio volume jumps when switching tracks
-
-When the global volume has been set low, and a sequence of tracks are being played, there are complaints of occasional jumps to full volume.
-This is down to a race condition where the volume request can arrive at OMXAudio before it has been initialised.
-The fix is simple, don't send the volume change until m_CurrentAudio.started.
----
- xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
-index 313833e..1b6cb52 100644
---- a/xbmc/cores/omxplayer/OMXPlayer.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
-@@ -1302,7 +1302,7 @@ void COMXPlayer::Process()
-     if (IsBetterStream(m_CurrentSubtitle, pStream)) OpenSubtitleStream(pStream->iId, pStream->source);
-     if (IsBetterStream(m_CurrentTeletext, pStream)) OpenTeletextStream(pStream->iId, pStream->source);
- 
--    if(m_change_volume)
-+    if(m_change_volume && m_CurrentAudio.started)
-     {
-       m_player_audio.SetCurrentVolume(m_current_mute ? VOLUME_MINIMUM : m_current_volume);
-       m_change_volume = false;
--- 
-1.8.1.6
-