From cdeb32fa13d829f841baf4106debd76787a895a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 24 Apr 2013 20:09:09 +0200 Subject: [PATCH] xbmc: update to xbmc-2.1.7 Signed-off-by: Stephan Raue --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- ...bmc-theme-Confluence-990.07-PR2449-2.patch | 0 packages/mediacenter/xbmc/meta | 2 +- .../patches/12.1.6/xbmc-990.11-PR2591.patch | 59 ------------ .../patches/12.1.6/xbmc-990.12-PR2593.patch | 91 ------------------- .../patches/12.1.6/xbmc-990.13-PR2641.patch | 28 ------ ...free_unused_textures_after_a_flip.patch.bk | 0 .../xbmc-452-change_lcd_content-0.1.patch | 0 ...dd_multithread_support_for_hi10p-0.1.patch | 0 ...-990.00-remove-windowed-display-mode.patch | 0 .../xbmc-990.01-PR1934.patch | 0 .../xbmc-990.02-PR2193.patch | 0 .../xbmc-990.03-PR2449-1.patch | 0 .../xbmc-990.04-PR2231.patch | 0 .../xbmc-990.05-PR2403-01.patch | 0 .../xbmc-990.07-PR2435.patch | 0 .../xbmc-990.08-PR2637.patch | 0 .../xbmc-990.33-607cc54.patch | 0 .../xbmc-995.01-xvba_support-39f578c.patch | 0 ...o-fix_incorrect_usage_of_flag_talled.patch | 0 ...OMXPlayer-some_caching_fixes_for_pvr.patch | 0 .../xbmc-995.10-disable-alt-tab.patch | 0 22 files changed, 2 insertions(+), 180 deletions(-) rename packages/mediacenter/xbmc-theme-Confluence/patches/{12.1.6 => 12.1.7}/xbmc-theme-Confluence-990.07-PR2449-2.patch (100%) delete mode 100644 packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.11-PR2591.patch delete mode 100644 packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.12-PR2593.patch delete mode 100644 packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.13-PR2641.patch rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-452-change_lcd_content-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-601-add_multithread_support_for_hi10p-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.00-remove-windowed-display-mode.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.01-PR1934.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.02-PR2193.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.03-PR2449-1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.04-PR2231.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.05-PR2403-01.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.07-PR2435.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.08-PR2637.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-990.33-607cc54.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-995.01-xvba_support-39f578c.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.6 => 12.1.7}/xbmc-995.10-disable-alt-tab.patch (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index cefea3bfb4..467a1faa4b 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/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 diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.6/xbmc-theme-Confluence-990.07-PR2449-2.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.7/xbmc-theme-Confluence-990.07-PR2449-2.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/12.1.6/xbmc-theme-Confluence-990.07-PR2449-2.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/12.1.7/xbmc-theme-Confluence-990.07-PR2449-2.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index af41b21085..42cffd00d4 100644 --- a/packages/mediacenter/xbmc/meta +++ b/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 diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.11-PR2591.patch b/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.11-PR2591.patch deleted file mode 100644 index 07e2cba179..0000000000 --- a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.11-PR2591.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0ce48acad58271f8313a88132ff84a4724907686 Mon Sep 17 00:00:00 2001 -From: huceke -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 -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 - diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.12-PR2593.patch b/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.12-PR2593.patch deleted file mode 100644 index db50fe04a3..0000000000 --- a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.12-PR2593.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 3ce0c7a096d497d24d41bf5d908e62f92281f1da Mon Sep 17 00:00:00 2001 -From: popcornmix -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 - diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.13-PR2641.patch b/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.13-PR2641.patch deleted file mode 100644 index 87545b961c..0000000000 --- a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.13-PR2641.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 067058c557dde84300efe56e8881aed3a6caf75b Mon Sep 17 00:00:00 2001 -From: popcornmix -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 - diff --git a/packages/mediacenter/xbmc/patches/12.1.6/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk b/packages/mediacenter/xbmc/patches/12.1.7/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk rename to packages/mediacenter/xbmc/patches/12.1.7/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-601-add_multithread_support_for_hi10p-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-601-add_multithread_support_for_hi10p-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-601-add_multithread_support_for_hi10p-0.1.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-601-add_multithread_support_for_hi10p-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.01-PR1934.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.01-PR1934.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.01-PR1934.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.01-PR1934.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.02-PR2193.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.02-PR2193.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.02-PR2193.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.02-PR2193.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.03-PR2449-1.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.03-PR2449-1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.03-PR2449-1.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.03-PR2449-1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.04-PR2231.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.04-PR2231.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.04-PR2231.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.04-PR2231.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.05-PR2403-01.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.05-PR2403-01.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.05-PR2403-01.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.05-PR2403-01.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.07-PR2435.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.07-PR2435.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.07-PR2435.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.07-PR2435.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.08-PR2637.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.08-PR2637.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.08-PR2637.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.08-PR2637.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.33-607cc54.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-990.33-607cc54.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.01-xvba_support-39f578c.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.01-xvba_support-39f578c.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.01-xvba_support-39f578c.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.01-xvba_support-39f578c.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.6/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.10-disable-alt-tab.patch