From 8d62ad42c5cfc769cc21fbf13997e7b5751114e4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 25 Apr 2013 00:46:45 +0200 Subject: [PATCH] xbmc: update to xbmc-12.1.8 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.7/xbmc-990.33-607cc54.patch | 423 ------------------ ...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-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 tools/mkpkg/mkpkg_xbmc-frodo | 2 +- 20 files changed, 3 insertions(+), 426 deletions(-) rename packages/mediacenter/xbmc-theme-Confluence/patches/{12.1.7 => 12.1.8}/xbmc-theme-Confluence-990.07-PR2449-2.patch (100%) delete mode 100644 packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-452-change_lcd_content-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-601-add_multithread_support_for_hi10p-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.00-remove-windowed-display-mode.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.01-PR1934.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.02-PR2193.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.03-PR2449-1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.04-PR2231.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.05-PR2403-01.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.07-PR2435.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-990.08-PR2637.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-995.01-xvba_support-39f578c.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch (100%) rename packages/mediacenter/xbmc/patches/{12.1.7 => 12.1.8}/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 467a1faa4b..26f12e0ab8 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.7" +PKG_VERSION="12.1.8" if [ "$XBMC" = "master" ]; then PKG_VERSION="83b16d0" fi diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.7/xbmc-theme-Confluence-990.07-PR2449-2.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/12.1.8/xbmc-theme-Confluence-990.07-PR2449-2.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/12.1.7/xbmc-theme-Confluence-990.07-PR2449-2.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/12.1.8/xbmc-theme-Confluence-990.07-PR2449-2.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 42cffd00d4..7214585f8a 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.1.7" +PKG_VERSION="12.1.8" if [ "$XBMC" = "master" ]; then PKG_VERSION="83b16d0" fi diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch b/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch deleted file mode 100644 index a05e3bc156..0000000000 --- a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.33-607cc54.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 607cc54ab54a53a96999d0fab31fabde93f02c65 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Thu, 11 Apr 2013 00:33:45 +0100 -Subject: [PATCH] [rbp] Don't block waiting for EOS in audio/video players - -Currently we block in OMXPlayerAudio/OMXPlayerVideo from the point we see EOF from demuxer, -until the last frame/audio sample has been played out. This can be a few seconds. -It means no more messages (such as abort) can be received during this period. -This results in a bug where if you press stop after the demuxer EOF has occurred it takes -a long time to stop. You would expect this to be the few seconds of queued data, -but it actually turns out to be 30 seconds, as the clocks get stopped by the stop message, -but the players never find out and we hit a timeout. -It also stops seek/pause working during the playout period. -It also stops (graphical) subtitles from being rendered during this time. -The fix involves not blocking for the EOS, but allowing the polling from OMXPlayer to catch it. ---- - xbmc/cores/omxplayer/OMXAudio.cpp | 50 +++++++++------------------------ - xbmc/cores/omxplayer/OMXAudio.h | 3 +- - xbmc/cores/omxplayer/OMXPlayer.cpp | 2 +- - xbmc/cores/omxplayer/OMXPlayerAudio.cpp | 35 +++++++++++++++++++---- - xbmc/cores/omxplayer/OMXPlayerAudio.h | 4 +-- - xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 24 +++++++++------- - xbmc/cores/omxplayer/OMXPlayerVideo.h | 6 ++-- - xbmc/cores/omxplayer/OMXVideo.cpp | 36 +++++++++--------------- - xbmc/cores/omxplayer/OMXVideo.h | 5 +++- - 9 files changed, 81 insertions(+), 84 deletions(-) - -diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp -index aad480b..273d0b2 100644 ---- a/xbmc/cores/omxplayer/OMXAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXAudio.cpp -@@ -330,6 +330,8 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock * - if(!m_omx_render->Initialize((const std::string)componentName, OMX_IndexParamAudioInit)) - return false; - -+ m_omx_render->ResetEos(); -+ - OMX_CONFIG_BRCMAUDIODESTINATIONTYPE audioDest; - OMX_INIT_STRUCTURE(audioDest); - strncpy((char *)audioDest.sName, device.c_str(), strlen(device.c_str())); -@@ -1135,6 +1137,8 @@ void COMXAudio::UnRegisterAudioCallback() - - unsigned int COMXAudio::GetAudioRenderingLatency() - { -+ CSingleLock lock (m_critSection); -+ - if(!m_Initialized) - return 0; - -@@ -1155,7 +1159,7 @@ unsigned int COMXAudio::GetAudioRenderingLatency() - return param.nU32; - } - --void COMXAudio::WaitCompletion() -+void COMXAudio::SubmitEOS() - { - CSingleLock lock (m_critSection); - -@@ -1183,43 +1187,15 @@ void COMXAudio::WaitCompletion() - CLog::Log(LOGERROR, "%s::%s - OMX_EmptyThisBuffer() failed with result(0x%x)\n", CLASSNAME, __func__, omx_err); - return; - } -+} - -- unsigned int nTimeOut = AUDIO_BUFFER_SECONDS * 1000; -- while(nTimeOut) -- { -- if(m_omx_render->IsEOS()) -- { -- CLog::Log(LOGDEBUG, "%s::%s - got eos\n", CLASSNAME, __func__); -- break; -- } -- -- if(nTimeOut == 0) -- { -- CLog::Log(LOGERROR, "%s::%s - wait for eos timed out\n", CLASSNAME, __func__); -- break; -- } -- Sleep(50); -- nTimeOut -= 50; -- } -- -- nTimeOut = AUDIO_BUFFER_SECONDS * 1000; -- while(nTimeOut) -- { -- if(!GetAudioRenderingLatency()) -- break; -- -- if(nTimeOut == 0) -- { -- CLog::Log(LOGERROR, "%s::%s - wait for GetAudioRenderingLatency timed out\n", CLASSNAME, __func__); -- break; -- } -- Sleep(50); -- nTimeOut -= 50; -- } -- -- m_omx_render->ResetEos(); -- -- return; -+bool COMXAudio::IsEOS() -+{ -+ if(!m_Initialized || m_Pause) -+ return true; -+ unsigned int latency = GetAudioRenderingLatency(); -+ CSingleLock lock (m_critSection); -+ return m_omx_decoder.IsEOS() && latency <= 0; - } - - void COMXAudio::SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers) -diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h -index 4b08722..9537d9e 100644 ---- a/xbmc/cores/omxplayer/OMXAudio.h -+++ b/xbmc/cores/omxplayer/OMXAudio.h -@@ -76,7 +76,8 @@ class COMXAudio - bool SetCurrentVolume(float fVolume); - void SetDynamicRangeCompression(long drc) { m_drc = drc; } - int SetPlaySpeed(int iSpeed); -- void WaitCompletion(); -+ void SubmitEOS(); -+ bool IsEOS(); - void SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers); - - void Flush(); -diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -index e148311..3834444 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp -@@ -77,7 +77,6 @@ class COMXMsgAudioCodecChange : public CDVDMsg - m_nChannels = 0; - m_DecoderOpen = false; - m_freq = CurrentHostFrequency(); -- m_send_eos = false; - m_bad_state = false; - m_hints_current.Clear(); - -@@ -168,7 +167,6 @@ void OMXPlayerAudio::OpenStream(CDVDStreamInfo &hints, COMXAudioCodecOMX *codec) - m_stalled = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET) == 0; - m_use_passthrough = (g_guiSettings.GetInt("audiooutput.mode") == AUDIO_HDMI) ? true : false ; - m_use_hw_decode = g_advancedSettings.m_omxHWAudioDecode; -- m_send_eos = false; - } - - bool OMXPlayerAudio::CloseStream(bool bWaitForBuffers) -@@ -604,7 +602,7 @@ void OMXPlayerAudio::Process() - else if (pMsg->IsType(CDVDMsg::GENERAL_EOF)) - { - CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::GENERAL_EOF"); -- WaitCompletion(); -+ SubmitEOS(); - } - else if (pMsg->IsType(CDVDMsg::GENERAL_DELAY)) - { -@@ -821,11 +819,36 @@ double OMXPlayerAudio::GetCacheTime() - return m_omxAudio.GetCacheTime(); - } - -+void OMXPlayerAudio::SubmitEOS() -+{ -+ if(!m_bad_state) -+ m_omxAudio.SubmitEOS(); -+} -+ -+bool OMXPlayerAudio::IsEOS() -+{ -+ return m_bad_state || m_omxAudio.IsEOS(); -+} -+ - void OMXPlayerAudio::WaitCompletion() - { -- if(!m_send_eos && !m_bad_state) -- m_omxAudio.WaitCompletion(); -- m_send_eos = true; -+ unsigned int nTimeOut = AUDIO_BUFFER_SECONDS * 1000; -+ while(nTimeOut) -+ { -+ if(IsEOS()) -+ { -+ CLog::Log(LOGDEBUG, "%s::%s - got eos\n", CLASSNAME, __func__); -+ break; -+ } -+ -+ if(nTimeOut == 0) -+ { -+ CLog::Log(LOGERROR, "%s::%s - wait for eos timed out\n", CLASSNAME, __func__); -+ break; -+ } -+ Sleep(50); -+ nTimeOut -= 50; -+ } - } - - void OMXPlayerAudio::RegisterAudioCallback(IAudioCallback *pCallback) -diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h -index 7a749dd..21d42c0 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerAudio.h -+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h -@@ -88,7 +88,6 @@ class OMXPlayerAudio : public CThread - bool m_DecoderOpen; - - DllBcmHost m_DllBcmHost; -- bool m_send_eos; - bool m_bad_state; - - virtual void OnStartup(); -@@ -106,7 +105,7 @@ class OMXPlayerAudio : public CThread - bool IsInited() const { return m_messageQueue.IsInited(); } - int GetLevel() const { return m_messageQueue.GetLevel(); } - bool IsStalled() { return m_stalled; } -- bool IsEOS() { return m_send_eos; }; -+ bool IsEOS(); - void WaitForBuffers(); - bool CloseStream(bool bWaitForBuffers); - bool CodecChange(); -@@ -121,6 +120,7 @@ class OMXPlayerAudio : public CThread - double GetCacheTime(); - double GetCurrentPTS() { return m_audioClock; }; - void WaitCompletion(); -+ void SubmitEOS(); - void RegisterAudioCallback(IAudioCallback* pCallback); - void UnRegisterAudioCallback(); - void SetCurrentVolume(float fVolume); -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -index 76fec79..bd5711c 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp -@@ -93,7 +93,6 @@ class COMXMsgVideoCodecChange : public CDVDMsg - m_dropbase = 0.0; - m_autosync = 1; - m_fForcedAspectRatio = 0.0f; -- m_send_eos = false; - m_messageQueue.SetMaxDataSize(10 * 1024 * 1024); - m_messageQueue.SetMaxTimeSize(8.0); - -@@ -129,8 +128,6 @@ bool OMXPlayerVideo::OpenStream(CDVDStreamInfo &hints) - // force SetVideoRect to be called initially - m_dst_rect.SetRect(0, 0, 0, 0); - -- m_audio_count = m_av_clock->HasAudio(); -- - if (!m_DllBcmHost.Load()) - return false; - -@@ -160,7 +157,6 @@ bool OMXPlayerVideo::OpenStream(CDVDStreamInfo &hints) - */ - - m_open = true; -- m_send_eos = false; - - return true; - } -@@ -506,10 +502,10 @@ void OMXPlayerVideo::Process() - OpenStream(msg->m_hints, msg->m_codec); - msg->m_codec = NULL; - } -- else if (pMsg->IsType(CDVDMsg::GENERAL_EOF) && !m_audio_count) -+ else if (pMsg->IsType(CDVDMsg::GENERAL_EOF)) - { - CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::GENERAL_EOF"); -- WaitCompletion(); -+ SubmitEOS(); - } - else if (pMsg->IsType(CDVDMsg::DEMUXER_PACKET)) - { -@@ -673,11 +669,19 @@ int OMXPlayerVideo::GetDecoderFreeSpace() - return m_omxVideo.GetFreeSpace(); - } - --void OMXPlayerVideo::WaitCompletion() -+void OMXPlayerVideo::SubmitEOS() -+{ -+ m_omxVideo.SubmitEOS(); -+} -+ -+bool OMXPlayerVideo::SubmittedEOS() -+{ -+ return m_omxVideo.SubmittedEOS(); -+} -+ -+bool OMXPlayerVideo::IsEOS() - { -- if(!m_send_eos) -- m_omxVideo.WaitCompletion(); -- m_send_eos = true; -+ return m_omxVideo.IsEOS(); - } - - void OMXPlayerVideo::SetSpeed(int speed) -diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h -index 9c4aa55..064ff66 100644 ---- a/xbmc/cores/omxplayer/OMXPlayerVideo.h -+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.h -@@ -78,7 +78,6 @@ class OMXPlayerVideo : public CThread - int m_view_mode; - - DllBcmHost m_DllBcmHost; -- bool m_send_eos; - - CDVDOverlayContainer *m_pOverlayContainer; - CDVDMessageQueue &m_messageParent; -@@ -105,7 +104,7 @@ class OMXPlayerVideo : public CThread - void WaitForBuffers() { m_messageQueue.WaitUntilEmpty(); } - int GetLevel() const { return m_messageQueue.GetLevel(); } - bool IsStalled() { return m_stalled; } -- bool IsEOS() { return m_send_eos; }; -+ bool IsEOS(); - bool CloseStream(bool bWaitForBuffers); - void Output(int iGroupId, double pts, bool bDropPacket); - void Flush(); -@@ -114,7 +113,8 @@ class OMXPlayerVideo : public CThread - int GetDecoderFreeSpace(); - double GetCurrentPTS() { return m_iCurrentPts; }; - double GetFPS() { return m_fFrameRate; }; -- void WaitCompletion(); -+ void SubmitEOS(); -+ bool SubmittedEOS(); - void SetDelay(double delay) { m_iVideoDelay = delay; } - double GetDelay() { return m_iVideoDelay; } - void SetSpeed(int iSpeed); -diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp -index 0b10a85..8e2e3da 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.cpp -+++ b/xbmc/cores/omxplayer/OMXVideo.cpp -@@ -92,6 +92,7 @@ - m_video_codec_name = ""; - m_deinterlace = false; - m_hdmi_clock_sync = false; -+ m_submitted_eos = false; - } - - COMXVideo::~COMXVideo() -@@ -169,6 +170,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b - m_decoded_height = hints.height; - - m_hdmi_clock_sync = hdmi_clock_sync; -+ m_submitted_eos = false; - - if(!m_decoded_width || !m_decoded_height) - return false; -@@ -324,6 +326,8 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b - if(!m_omx_render.Initialize((const std::string)componentName, OMX_IndexParamVideoInit)) - return false; - -+ m_omx_render.ResetEos(); -+ - componentName = "OMX.broadcom.video_scheduler"; - if(!m_omx_sched.Initialize((const std::string)componentName, OMX_IndexParamVideoInit)) - return false; -@@ -1035,11 +1039,13 @@ int COMXVideo::GetInputBufferSize() - return m_omx_decoder.GetInputBufferSize(); - } - --void COMXVideo::WaitCompletion() -+void COMXVideo::SubmitEOS() - { - if(!m_is_open) - return; - -+ m_submitted_eos = true; -+ - OMX_ERRORTYPE omx_err = OMX_ErrorNone; - OMX_BUFFERHEADERTYPE *omx_buffer = m_omx_decoder.GetInputBuffer(); - -@@ -1061,27 +1067,11 @@ void COMXVideo::WaitCompletion() - CLog::Log(LOGERROR, "%s::%s - OMX_EmptyThisBuffer() failed with result(0x%x)\n", CLASSNAME, __func__, omx_err); - return; - } -+} - -- unsigned int nTimeOut = 30000; -- -- while(nTimeOut) -- { -- if(m_omx_render.IsEOS()) -- { -- CLog::Log(LOGDEBUG, "%s::%s - got eos\n", CLASSNAME, __func__); -- break; -- } -- -- if(nTimeOut == 0) -- { -- CLog::Log(LOGERROR, "%s::%s - wait for eos timed out\n", CLASSNAME, __func__); -- break; -- } -- Sleep(50); -- nTimeOut -= 50; -- } -- -- m_omx_render.ResetEos(); -- -- return; -+bool COMXVideo::IsEOS() -+{ -+ if(!m_is_open) -+ return true; -+ return m_omx_render.IsEOS(); - } -diff --git a/xbmc/cores/omxplayer/OMXVideo.h b/xbmc/cores/omxplayer/OMXVideo.h -index 037f155..19d7206 100644 ---- a/xbmc/cores/omxplayer/OMXVideo.h -+++ b/xbmc/cores/omxplayer/OMXVideo.h -@@ -59,7 +59,9 @@ class COMXVideo - std::string GetDecoderName() { return m_video_codec_name; }; - void SetVideoRect(const CRect& SrcRect, const CRect& DestRect); - int GetInputBufferSize(); -- void WaitCompletion(); -+ void SubmitEOS(); -+ bool IsEOS(); -+ bool SubmittedEOS() { return m_submitted_eos; } - bool BadState() { return m_omx_decoder.BadState(); }; - protected: - // Video format -@@ -95,6 +97,7 @@ class COMXVideo - uint32_t m_history_valid_pts; - ResolutionUpdateCallBackFn m_res_callback; - void *m_res_ctx; -+ bool m_submitted_eos; - bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize); - }; - --- -1.8.1.6 - diff --git a/packages/mediacenter/xbmc/patches/12.1.7/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk b/packages/mediacenter/xbmc/patches/12.1.8/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk rename to packages/mediacenter/xbmc/patches/12.1.8/todo/xbmc-995.02-only_free_unused_textures_after_a_flip.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-601-add_multithread_support_for_hi10p-0.1.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-601-add_multithread_support_for_hi10p-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-601-add_multithread_support_for_hi10p-0.1.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-601-add_multithread_support_for_hi10p-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.01-PR1934.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.01-PR1934.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.01-PR1934.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.01-PR1934.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.02-PR2193.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.02-PR2193.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.02-PR2193.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.02-PR2193.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.03-PR2449-1.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.03-PR2449-1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.03-PR2449-1.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.03-PR2449-1.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.04-PR2231.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.04-PR2231.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.04-PR2231.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.04-PR2231.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.05-PR2403-01.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.05-PR2403-01.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.05-PR2403-01.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.05-PR2403-01.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.07-PR2435.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.07-PR2435.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.07-PR2435.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.07-PR2435.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.08-PR2637.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.08-PR2637.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-990.08-PR2637.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-990.08-PR2637.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.01-xvba_support-39f578c.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.01-xvba_support-39f578c.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.01-xvba_support-39f578c.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.01-xvba_support-39f578c.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch diff --git a/packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.10-disable-alt-tab.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.1.7/xbmc-995.10-disable-alt-tab.patch rename to packages/mediacenter/xbmc/patches/12.1.8/xbmc-995.10-disable-alt-tab.patch diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo index 56230fbc1f..4820f777e9 100755 --- a/tools/mkpkg/mkpkg_xbmc-frodo +++ b/tools/mkpkg/mkpkg_xbmc-frodo @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.1.7" +PKG_VERSION="12.1.8" GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git" DEST_DIR="$PKG_NAME-frodo"