diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index b0554011a4..646db65d53 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.2-83bda98" +PKG_VERSION="12.2-18397e1" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-0efa87e" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 9b4cc3506f..02956393ce 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.2-83bda98" +PKG_VERSION="12.2-18397e1" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-0efa87e" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-990.27-PR2232.patch.bk b/packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-990.27-PR2232.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-990.27-PR2232.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-990.27-PR2232.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-18397e1/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.11-enable-vpp-deinterlacing.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.11-enable-vpp-deinterlacing.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.11-enable-vpp-deinterlacing.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.11-enable-vpp-deinterlacing.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.13-vpp-fix-skipping.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.13-vpp-fix-skipping.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-995.13-vpp-fix-skipping.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.13-vpp-fix-skipping.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch b/packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-999-dualaudiofix.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-999-dualaudiofix.patch rename to packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-999-dualaudiofix.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch deleted file mode 100644 index fe17220717..0000000000 --- a/packages/mediacenter/xbmc/patches/12.2-83bda98/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch +++ /dev/null @@ -1,206 +0,0 @@ -diff -rupN xbmc-upstream/xbmc/Application.cpp xbmc-vbs/xbmc/Application.cpp ---- xbmc-upstream/xbmc/Application.cpp 2013-06-12 00:24:40.486262597 +0200 -+++ xbmc-vbs/xbmc/Application.cpp 2013-06-12 01:23:11.948400122 +0200 -@@ -5907,3 +5907,37 @@ CPerformanceStats &CApplication::GetPerf - } - #endif - -+void CApplication::CloseNetworkShares() -+{ -+ CLog::Log(LOGDEBUG,"CApplication::CloseNetworkShares: Closing all network shares"); -+ -+#if defined(HAS_FILESYSTEM_SMB) && !defined(_WIN32) -+ smb.Deinit(); -+#endif -+ -+#if defined(HAS_FILESYSTEM_NFS) -+ gNfsConnection.Deinit(); -+#endif -+} -+ -+void CApplication::StopAddonServices() -+{ -+ CLog::Log(LOGDEBUG,"CApplication::StopAddonServices"); -+ CAddonMgr::Get().StopServices(false); -+} -+ -+void CApplication::StartAddonServices() -+{ -+ CLog::Log(LOGDEBUG,"CApplication::StartAddonServices - before login services"); -+ -+ //we start all services that run before login -+ CAddonMgr::Get().StartServices(true); -+ -+ //this is meant to find out if we are logged in already -+ //so only start after-login services if we are not seeing the login screen -+ if (g_windowManager.GetActiveWindow() != WINDOW_LOGIN_SCREEN) -+ { -+ CLog::Log(LOGDEBUG,"CApplication::StartAddonServices - No login screen? So starting after-login-services also"); -+ CAddonMgr::Get().StartServices(false); -+ } -+} -diff -rupN xbmc-upstream/xbmc/Application.h xbmc-vbs/xbmc/Application.h ---- xbmc-upstream/xbmc/Application.h 2013-06-12 00:24:40.494262695 +0200 -+++ xbmc-vbs/xbmc/Application.h 2013-06-12 01:15:31.530852337 +0200 -@@ -204,6 +204,9 @@ public: - void CheckPlayingProgress(); - void CheckAudioScrobblerStatus(); - void ActivateScreenSaver(bool forceType = false); -+ void CloseNetworkShares(); -+ void StartAddonServices(); -+ void StopAddonServices(); - - virtual void Process(); - void ProcessSlow(); -diff -rupN xbmc-upstream/xbmc/filesystem/SmbFile.cpp xbmc-vbs/xbmc/filesystem/SmbFile.cpp ---- xbmc-upstream/xbmc/filesystem/SmbFile.cpp 2013-06-12 00:24:40.962268274 +0200 -+++ xbmc-vbs/xbmc/filesystem/SmbFile.cpp 2013-06-12 01:23:11.948400122 +0200 -@@ -92,6 +92,7 @@ void CSMB::Deinit() - void CSMB::Init() - { - CSingleLock lock(*this); -+ - if (!m_context) - { - #ifdef TARGET_POSIX -diff -rupN xbmc-upstream/xbmc/filesystem/NFSFile.cpp xbmc-vbs/xbmc/filesystem/NFSFile.cpp ---- xbmc-upstream/xbmc/filesystem/NFSFile.cpp 2013-07-12 22:18:51.062605410 +0200 -+++ xbmc-vbs/xbmc/filesystem/NFSFile.cpp 2013-07-12 22:19:27.069861082 +0200 -@@ -308,6 +308,8 @@ - - void CNfsConnection::Deinit() - { -+ CLog::Log(LOGNOTICE,"CNfsConnection::Deinit"); -+ - if(m_pNfsContext && m_pLibNfs->IsLoaded()) - { - destroyOpenContexts(); -diff -rupN xbmc-upstream/xbmc/powermanagement/PowerManager.cpp xbmc-vbs/xbmc/powermanagement/PowerManager.cpp ---- xbmc-upstream/xbmc/powermanagement/PowerManager.cpp 2013-06-12 00:24:41.634276292 +0200 -+++ xbmc-vbs/xbmc/powermanagement/PowerManager.cpp 2013-06-12 01:15:32.166859998 +0200 -@@ -23,6 +23,7 @@ - #include "Application.h" - #include "cores/AudioEngine/AEFactory.h" - #include "input/KeyboardStat.h" -+#include "network/Network.h" - #include "settings/GUISettings.h" - #include "windowing/WindowingFactory.h" - #include "utils/log.h" -@@ -32,6 +33,7 @@ - #include "guilib/LocalizeStrings.h" - #include "guilib/GraphicContext.h" - #include "dialogs/GUIDialogKaiToast.h" -+#include "settings/AdvancedSettings.h" - - #ifdef HAS_LCD - #include "utils/LCDFactory.h" -@@ -146,12 +148,22 @@ bool CPowerManager::Powerdown() - - bool CPowerManager::Suspend() - { -- return CanSuspend() ? m_instance->Suspend() : false; -+ if (!CanSuspend()) -+ return false; -+ -+ OnPrepareSleep(); -+ -+ return m_instance->Suspend(); - } - - bool CPowerManager::Hibernate() - { -- return CanHibernate() ? m_instance->Hibernate() : false; -+ if (!CanHibernate()) -+ return false; -+ -+ OnPrepareSleep(); -+ -+ return m_instance->Hibernate(); - } - bool CPowerManager::Reboot() - { -@@ -188,6 +200,16 @@ void CPowerManager::ProcessEvents() - m_instance->PumpPowerEvents(this); - } - -+void CPowerManager::OnPrepareSleep() -+{ -+ CLog::Log(LOGNOTICE, "%s: Preparing sleep", __FUNCTION__); -+ -+ //stop all addon services here -+ //we do this here instead in OnSleep cause according to DBUS specification we only have 1 second of time in OnSleep -+ //so shutdowns that may potentially take longer should be issued in here -+ g_application.StopAddonServices(); -+} -+ - void CPowerManager::OnSleep() - { - CAnnouncementManager::Announce(System, "xbmc", "OnSleep"); -@@ -207,13 +229,41 @@ void CPowerManager::OnSleep() - g_application.StopPlaying(); - g_application.StopShutdownTimer(); - g_application.StopScreenSaverTimer(); -+ g_application.CloseNetworkShares(); - CAEFactory::Suspend(); - } - -+void CPowerManager::WaitForNet() -+{ -+ CLog::Log(LOGDEBUG, "%s: Waithing for first NIC to come up", __FUNCTION__); -+ -+ const unsigned maxLoopCount = 50u; -+ const unsigned sleepTimeMs = 200u; -+ -+ for(unsigned i=0; i < 50; ++i) -+ { -+ CNetworkInterface* pIface = g_application.getNetwork().GetFirstConnectedInterface(); -+ if (pIface && pIface->IsEnabled() && pIface->IsConnected()) -+ { -+ CLog::Log(LOGDEBUG, "%s: NIC is up after waiting %d ms", __FUNCTION__, i * sleepTimeMs); -+ return; -+ } -+ -+ Sleep(sleepTimeMs); -+ } -+ -+ CLog::Log(LOGDEBUG, "%s: NIC did not come up within %d ms... Lets give up...", __FUNCTION__, maxLoopCount * sleepTimeMs); -+} -+ - void CPowerManager::OnWake() - { - CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__); - -+ WaitForNet(); -+ -+ //re-start addon services -+ g_application.StartAddonServices(); -+ - // reset out timers - g_application.ResetShutdownTimers(); - -@@ -248,6 +298,7 @@ void CPowerManager::OnWake() - #endif - - CAEFactory::Resume(); -+ - g_application.UpdateLibraries(); - g_weatherManager.Refresh(); - -diff -rupN xbmc-upstream/xbmc/powermanagement/PowerManager.h xbmc-vbs/xbmc/powermanagement/PowerManager.h ---- xbmc-upstream/xbmc/powermanagement/PowerManager.h 2013-06-12 00:24:41.634276292 +0200 -+++ xbmc-vbs/xbmc/powermanagement/PowerManager.h 2013-06-12 01:15:32.166859998 +0200 -@@ -67,11 +67,14 @@ public: - - void ProcessEvents(); - private: -+ void OnPrepareSleep(); - void OnSleep(); - void OnWake(); - - void OnLowBattery(); - -+ void WaitForNet(); -+ - IPowerSyscall *m_instance; - }; -