diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index da92bc8171..6547e7dcda 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="13.alpha-ed1d9c7" +PKG_VERSION="13.alpha-ae6ca84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 1a38ae5c1c..0f3ceed2ad 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-ed1d9c7" +PKG_VERSION="13.alpha-ae6ca84" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-602-add_as.xml_busy_dialog_delay_control.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-602-add_as.xml_busy_dialog_delay_control.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-602-add_as.xml_busy_dialog_delay_control.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-995.01-fernetmenta-fixes-b17818b.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-995.01-fernetmenta-fixes-b17818b.patch similarity index 93% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-995.01-fernetmenta-fixes-b17818b.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-995.01-fernetmenta-fixes-b17818b.patch index b09b181f8c..ac90b9464b 100644 --- a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-995.01-fernetmenta-fixes-b17818b.patch +++ b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-995.01-fernetmenta-fixes-b17818b.patch @@ -1,7 +1,7 @@ -From 0fd9f31848fb8408f1948c1a62b4b82486b99fce Mon Sep 17 00:00:00 2001 +From d901c6ed6a3bd7f2520572d39fe9a6402d12e2cb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 12:59:07 +0200 -Subject: [PATCH 01/86] refactor audio settings page +Subject: [PATCH 01/90] refactor audio settings page --- language/English/strings.po | 66 +++++++--- @@ -721,10 +721,10 @@ index a8d82af..ca5131a 100644 1.8.4 -From b4f8e7fbdc27b3df17db2d948e5ef494239d7c6d Mon Sep 17 00:00:00 2001 +From 9e7e4639a4149610588b87903df6edd03a5091e9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:01:14 +0200 -Subject: [PATCH 02/86] dvdplayer: adapt to changes in audio settings +Subject: [PATCH 02/90] dvdplayer: adapt to changes in audio settings --- .../DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp | 28 ++++---------------- @@ -905,10 +905,10 @@ index 38a53e7..df3df14 100644 1.8.4 -From bf05df7ac6ec1a81e89c4e9a05216d9c1abcc88c Mon Sep 17 00:00:00 2001 +From 6497c1caa631e7206c9629b258a16d90177e96c5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:02:24 +0200 -Subject: [PATCH 03/86] paplayer: adapt to changes in audio settings +Subject: [PATCH 03/90] paplayer: adapt to changes in audio settings --- xbmc/cores/paplayer/DVDPlayerCodec.cpp | 3 +-- @@ -930,7 +930,7 @@ index 355589f..5bd7ec1 100644 { CLog::Log(LOGERROR, "%s: Could not create audio codec", __FUNCTION__); diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp -index 6b0294a..11a6519 100644 +index 8e7a0f5..16319b9 100644 --- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp +++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp @@ -37,6 +37,7 @@ @@ -961,10 +961,10 @@ index 6b0294a..11a6519 100644 1.8.4 -From 38235df493e42490d6e8b19762a216c6ed8431ab Mon Sep 17 00:00:00 2001 +From 4b0eab849f50ad1fa310783bb013a015602baa6b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:03:27 +0200 -Subject: [PATCH 04/86] GUIDialogAudioSettings: adapt to changes in audio +Subject: [PATCH 04/90] GUIDialogAudioSettings: adapt to changes in audio settings --- @@ -1031,10 +1031,10 @@ index ad5f3f1..f8c578e 100644 1.8.4 -From 7660533a1a9fe24339cc51ed2219b9172969b533 Mon Sep 17 00:00:00 2001 +From 609d7063ae620921108c2475c444478f1cdece12 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:05:07 +0200 -Subject: [PATCH 05/86] ActiveAE: adapt to changes in audio settings +Subject: [PATCH 05/90] ActiveAE: adapt to changes in audio settings --- .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 75 +++++++++++++++------- @@ -1317,10 +1317,10 @@ index 59bad57..2aebbf6 100644 1.8.4 -From 7a5e5c5388363a386f35093f295aef64cf57a88f Mon Sep 17 00:00:00 2001 +From ca3ea65a752510f3881d7329e6199c9f45617b83 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:12:01 +0200 -Subject: [PATCH 06/86] SoftAE: farewell! +Subject: [PATCH 06/90] SoftAE: farewell! --- xbmc/cores/AudioEngine/AEFactory.cpp | 5 - @@ -4257,10 +4257,10 @@ index c2d7ffa..c1d53f5 100644 1.8.4 -From e428540125df499e522c4feb506b932b2864fdce Mon Sep 17 00:00:00 2001 +From 2cf5ba29037728a048ccc258865d729a844571e5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 13:25:23 +0200 -Subject: [PATCH 07/86] adapt toggle passthrough to change in audio settings +Subject: [PATCH 07/90] adapt toggle passthrough to change in audio settings --- xbmc/Application.cpp | 11 +++-------- @@ -4299,10 +4299,10 @@ index 6a3fbdb..f2d7ed4 100644 1.8.4 -From 17dff7a768dcfac1146e87e1519e84e4d2c46dfb Mon Sep 17 00:00:00 2001 +From 679b6a4e665ff0edd3c038e5bafa17a154a670a0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 14:21:39 +0200 -Subject: [PATCH 08/86] update VS project after removal of SoftAE +Subject: [PATCH 08/90] update VS project after removal of SoftAE --- project/VS2010Express/XBMC.vcxproj | 8 +------- @@ -4380,10 +4380,10 @@ index 570fb6f..74e82c4 100644 1.8.4 -From 2282b27613c504fa0f002259a0873f51fc545411 Mon Sep 17 00:00:00 2001 +From d952f2ec23c1c9a331e7d89aecf5fdea1e14bc72 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 18 Oct 2013 14:23:19 +0200 -Subject: [PATCH 09/86] fix linker error on Windows after removal of SoftAE +Subject: [PATCH 09/90] fix linker error on Windows after removal of SoftAE --- xbmc/cores/AudioEngine/Utils/AEWAVLoader.cpp | 4 ++++ @@ -4408,10 +4408,10 @@ index c8a521c..de9029b 100644 1.8.4 -From 9785ee640cc48217e27c71d47fccd0e3ca66193b Mon Sep 17 00:00:00 2001 +From cd709d258e91879565acc9c10e500bea9ef28a52 Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 18 Oct 2013 17:06:18 +0200 -Subject: [PATCH 10/86] AudioSettings: Remove AAC Setting for passthrough +Subject: [PATCH 10/90] AudioSettings: Remove AAC Setting for passthrough --- language/English/strings.po | 10 ++-------- @@ -4565,10 +4565,10 @@ index ca5131a..e998caa 100644 1.8.4 -From 78f3245a46b8f44c84ebcbc80577a8c82773b472 Mon Sep 17 00:00:00 2001 +From c2016883f91675fc0d4b9b33936ad78d44d610f5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 19 Oct 2013 19:20:40 +0100 -Subject: [PATCH 11/86] [rbp] Update to work with new audio settings +Subject: [PATCH 11/90] [rbp] Update to work with new audio settings --- system/settings/rbp.xml | 94 +++++++++++++--------- @@ -4950,10 +4950,431 @@ index 394f309..685a686 100644 1.8.4 -From 4dc697377555fb46ea556f9db467b7542264f9fa Mon Sep 17 00:00:00 2001 +From 6aaba4df64b187c95491a4c27c8404df24807079 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sun, 20 Oct 2013 13:54:45 +0200 +Subject: [PATCH 12/90] remove a bunch of obsolete advanced settings related to + audio + +--- + xbmc/cores/AudioEngine/AESinkFactory.cpp | 6 ++---- + xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp | 18 +++--------------- + xbmc/settings/AdvancedSettings.cpp | 14 -------------- + xbmc/settings/AdvancedSettings.h | 7 ------- + 4 files changed, 5 insertions(+), 40 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp +index 906a824..e7fb9a3 100644 +--- a/xbmc/cores/AudioEngine/AESinkFactory.cpp ++++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp +@@ -101,8 +101,7 @@ IAESink *CAESinkFactory::Create(std::string &device, AEAudioFormat &desiredForma + + + #if defined(TARGET_WINDOWS) +- if ((driver.empty() || +- driver == "WASAPI") && !g_advancedSettings.m_audioForceDirectSound) ++ if (driver == "WASAPI") + TRY_SINK(WASAPI) + else + TRY_SINK(DirectSound) // always fall back to DirectSound +@@ -141,8 +140,7 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list, bool force) + { + #if defined(TARGET_WINDOWS) + ENUMERATE_SINK(DirectSound, force); +- if (!g_advancedSettings.m_audioForceDirectSound) +- ENUMERATE_SINK(WASAPI, force); ++ ENUMERATE_SINK(WASAPI, force); + #elif defined(TARGET_ANDROID) + ENUMERATE_SINK(AUDIOTRACK, force); + #elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD) +diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp +index 623c035..94e2c5b 100644 +--- a/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp ++++ b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp +@@ -500,12 +500,7 @@ unsigned int CAESinkWASAPI::AddPackets(uint8_t *data, unsigned int frames, bool + return INT_MAX; + } + +- /* Inject one buffer of silence if sink has just opened */ +- /* to avoid losing start of stream or GUI sound */ +- if (g_advancedSettings.m_streamSilence) +- memcpy(buf, data, NumFramesRequested * m_format.m_frameSize); //fill buffer with audio +- else +- memset(buf, 0, NumFramesRequested * m_format.m_frameSize); //fill buffer with silence ++ memset(buf, 0, NumFramesRequested * m_format.m_frameSize); //fill buffer with silence + + hr = m_pRenderClient->ReleaseBuffer(NumFramesRequested, flags); //pass back to audio driver + if (FAILED(hr)) +@@ -520,7 +515,7 @@ unsigned int CAESinkWASAPI::AddPackets(uint8_t *data, unsigned int frames, bool + if (FAILED(hr)) + CLog::Log(LOGERROR, __FUNCTION__": AudioClient Start Failed"); + m_running = true; //signal that we're processing frames +- return g_advancedSettings.m_streamSilence ? NumFramesRequested : 0U; ++ return 0U; + } + + #ifndef _DEBUG +@@ -545,15 +540,8 @@ unsigned int CAESinkWASAPI::AddPackets(uint8_t *data, unsigned int frames, bool + { + if(eventAudioCallback != WAIT_OBJECT_0 || !&buf) + { +- /* Event handle timed out - flag sink as dirty for re-initializing */ + CLog::Log(LOGERROR, __FUNCTION__": Endpoint Buffer timed out"); +- if (g_advancedSettings.m_streamSilence) +- { +- m_isDirty = true; //flag new device or re-init needed +- Deinitialize(); +- m_running = false; +- return INT_MAX; +- } ++ return INT_MAX; + } + } + +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index ac18c02..8e769bf 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -112,12 +112,6 @@ void CAdvancedSettings::Initialize() + m_ac3Gain = 12.0f; + m_audioApplyDrc = true; + m_dvdplayerIgnoreDTSinWAV = false; +- m_audioResample = 0; +- m_allowTranscode44100 = false; +- m_audioForceDirectSound = false; +- m_audioAudiophile = false; +- m_allChannelStereo = false; +- m_streamSilence = false; + + //default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted + m_limiterHold = 0.025f; +@@ -495,14 +489,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) + XMLUtils::GetInt(pElement, "percentseekforwardbig", m_musicPercentSeekForwardBig, 0, 100); + XMLUtils::GetInt(pElement, "percentseekbackwardbig", m_musicPercentSeekBackwardBig, -100, 0); + +- XMLUtils::GetInt(pElement, "resample", m_audioResample, 0, 192000); +- XMLUtils::GetBoolean(pElement, "allowtranscode44100", m_allowTranscode44100); +- XMLUtils::GetBoolean(pElement, "forceDirectSound", m_audioForceDirectSound); +- XMLUtils::GetBoolean(pElement, "audiophile", m_audioAudiophile); +- XMLUtils::GetBoolean(pElement, "allchannelstereo", m_allChannelStereo); +- XMLUtils::GetBoolean(pElement, "streamsilence", m_streamSilence); +- XMLUtils::GetString(pElement, "transcodeto", m_audioTranscodeTo); +- + TiXmlElement* pAudioExcludes = pElement->FirstChildElement("excludefromlisting"); + if (pAudioExcludes) + GetCustomRegexps(pAudioExcludes, m_audioExcludeFromListingRegExps); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index e6e02ad..d46ee0b 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -138,13 +138,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler + CStdString m_audioDefaultPlayer; + float m_audioPlayCountMinimumPercent; + bool m_dvdplayerIgnoreDTSinWAV; +- int m_audioResample; +- bool m_allowTranscode44100; +- bool m_audioForceDirectSound; +- bool m_audioAudiophile; +- bool m_allChannelStereo; +- bool m_streamSilence; +- CStdString m_audioTranscodeTo; + float m_limiterHold; + float m_limiterRelease; + +-- +1.8.4 + + +From 45fe453dfd4c00ad1c221a04cffbc6aca975c3be Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Fri, 18 Oct 2013 22:01:55 +0200 +Subject: [PATCH 13/90] [osx/ios/atv2] - sync xcode project + +--- + XBMC.xcodeproj/project.pbxproj | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj +index 9da070b..1262789 100644 +--- a/XBMC.xcodeproj/project.pbxproj ++++ b/XBMC.xcodeproj/project.pbxproj +@@ -4180,7 +4180,6 @@ + DFB0F471161B747500D744F4 /* AddonsOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonsOperations.h; sourceTree = ""; }; + DFB15B2015F8FB8100CDF0DE /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = ""; }; + DFB15B2115F8FB8100CDF0DE /* SDLMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SDLMain.mm; sourceTree = ""; }; +- DFB65F6415373AE7006B8FF1 /* AEAudioFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEAudioFormat.h; sourceTree = ""; }; + DFB65F6515373AE7006B8FF1 /* AEFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AEFactory.cpp; sourceTree = ""; }; + DFB65F6615373AE7006B8FF1 /* AEFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFactory.h; sourceTree = ""; }; + DFB65F6A15373AE7006B8FF1 /* AEEncoderFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AEEncoderFFmpeg.cpp; sourceTree = ""; }; +@@ -7015,7 +7014,6 @@ + DFB65F6C15373AE7006B8FF1 /* Engines */, + DFB65F8815373AE7006B8FF1 /* Interfaces */, + DFB65FA215373AE7006B8FF1 /* Utils */, +- DFB65F6415373AE7006B8FF1 /* AEAudioFormat.h */, + DFB65F6515373AE7006B8FF1 /* AEFactory.cpp */, + DFB65F6615373AE7006B8FF1 /* AEFactory.h */, + ); +-- +1.8.4 + + +From 7b18dc61dc5cdc3fef46051d7c8b438f5e5f42b6 Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Sun, 20 Oct 2013 13:37:37 +0200 +Subject: [PATCH 14/90] [AE/CA] - fix hidden settings for darwin + +--- + system/settings/darwin.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml +index 2cf4df6..ba56a25 100644 +--- a/system/settings/darwin.xml ++++ b/system/settings/darwin.xml +@@ -7,7 +7,7 @@ + + + +- ++ + + false + +-- +1.8.4 + + +From 81ee74d3a96770ff765a6728261af5eddf34c4dc Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Fri, 18 Oct 2013 22:11:31 +0200 +Subject: [PATCH 15/90] [AE/CA] - adapt to new audiosettings page + +--- + .../AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp | 58 ++++++++++++++-------- + .../AudioEngine/Engines/CoreAudio/CoreAudioAE.h | 6 +-- + .../Engines/CoreAudio/CoreAudioAEHALOSX.cpp | 2 +- + .../DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp | 7 ++- + 4 files changed, 45 insertions(+), 28 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp +index 990163c..f067343 100644 +--- a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp +@@ -240,17 +240,14 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw, + case 10: m_stdChLayout = AE_CH_LAYOUT_7_1; break; + } + #endif +- // force optical/coax to 2.0 output channels +- if (!m_rawPassthrough && !m_transcode && CSettings::Get().GetInt("audiooutput.mode") == AUDIO_IEC958) +- m_stdChLayout = AE_CH_LAYOUT_2_0; + + // setup the desired format + m_format.m_channelLayout = CAEChannelInfo(m_stdChLayout); + + // if there is an audio resample rate set, use it. +- if (g_advancedSettings.m_audioResample && !m_rawPassthrough) ++ if (CSettings::Get().GetInt("audiooutput.config") == AE_CONFIG_FIXED && !m_rawPassthrough) + { +- sampleRate = g_advancedSettings.m_audioResample; ++ sampleRate = CSettings::Get().GetInt("audiooutput.samplerate"); + CLog::Log(LOGINFO, "CCoreAudioAE::passthrough - Forcing samplerate to %d", sampleRate); + } + +@@ -406,11 +403,13 @@ void CCoreAudioAE::OnSettingsChange(const std::string& setting) + setting == "audiooutput.custompassthrough" || + setting == "audiooutput.audiodevice" || + setting == "audiooutput.customdevice" || +- setting == "audiooutput.mode" || + setting == "audiooutput.ac3passthrough" || ++ setting == "audiooutput.eac3passthrough" || + setting == "audiooutput.dtspassthrough" || +- setting == "audiooutput.channels" || +- setting == "audiooutput.multichannellpcm") ++ setting == "audiooutput.channels" || ++ setting == "audiooutput.samplerate" || ++ setting == "audiooutput.config" || ++ setting == "audiooutput.passthrough" ) + { + // only reinit the engine if we not + // suspended (resume will initialize +@@ -508,8 +507,30 @@ void CCoreAudioAE::SetSoundMode(const int mode) + StopAllSounds(); + } + +-bool CCoreAudioAE::SupportsRaw() ++bool CCoreAudioAE::SupportsRaw(AEDataFormat format) + { ++ switch(format) ++ { ++ case AE_FMT_AC3: ++ case AE_FMT_DTS: ++ case AE_FMT_EAC3: ++ case AE_FMT_LPCM: ++ return true; ++ default: ++ return false; ++ } ++} ++ ++bool CCoreAudioAE::IsSettingVisible(const std::string &settingId) ++{ ++ if (settingId == "audiooutput.samplerate") ++ { ++ if (CSettings::Get().GetInt("audiooutput.config") == AE_CONFIG_FIXED) ++ return true; ++ else ++ return false; ++ } ++ + return true; + } + +@@ -534,20 +555,17 @@ IAEStream* CCoreAudioAE::MakeStream(enum AEDataFormat dataFormat, + CLog::Log(LOGINFO, "CCoreAudioAE::MakeStream - %s, %u, %u, %s", + CAEUtil::DataFormatToStr(dataFormat), sampleRate, encodedSamplerate, ((std::string)channelInfo).c_str()); + ++ bool multichannelpcm = CSettings::Get().GetInt("audiooutput.channels") > AE_CH_LAYOUT_2_0; //if more then 2 channels are set - assume lpcm capability ++#if defined(TARGET_DARWIN_IOS) ++ multichannelpcm = false; ++#endif + // determine if we need to transcode this audio + // when we're called, we'll either get the audio in an encoded form (COREAUDIO_IS_RAW==true) + // that we can passthrough based on user options, or we'll get it unencoded + // if it's unencoded, and is 5.1, we'll transcode it to AC3 if possible +- bool transcode = CSettings::Get().GetBool("audiooutput.ac3passthrough") && +- ( +- (CSettings::Get().GetInt("audiooutput.mode") == AUDIO_IEC958) || +- ( +- (CSettings::Get().GetInt("audiooutput.mode") == AUDIO_HDMI) && +- !CSettings::Get().GetBool("audiooutput.multichannellpcm") +- ) +- ) && +- !COREAUDIO_IS_RAW(dataFormat) && +- (channelInfo.Count() == 6); ++ bool transcode = CSettings::Get().GetBool("audiooutput.passthrough") && CSettings::Get().GetBool("audiooutput.ac3passthrough") && !multichannelpcm && ++ !COREAUDIO_IS_RAW(dataFormat) && ++ (channelInfo.Count() == 6); + + CCoreAudioAEStream *stream = new CCoreAudioAEStream(dataFormat, sampleRate, encodedSamplerate, channelLayout, options, transcode); + CSingleLock streamLock(m_streamLock); +@@ -748,7 +766,7 @@ void CCoreAudioAE::MixSounds(float *buffer, unsigned int samples) + void CCoreAudioAE::GarbageCollect() + { + #if defined(TARGET_DARWIN_OSX) +- if (g_advancedSettings.m_streamSilence) ++ if (CSettings::Get().GetBool("audiooutput.streamsilence")) + return; + + if (!m_streamsPlaying && m_playing_sounds.empty()) +diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h +index 5e9d694..f31dada 100644 +--- a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h ++++ b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h +@@ -91,9 +91,9 @@ class CCoreAudioAE : public IAE, public ICoreAudioSource + virtual void SetMute(const bool enabled); + virtual bool IsMuted(); + virtual void SetSoundMode(const int mode); +- +- +- virtual bool SupportsRaw(); ++ virtual bool SupportsRaw(AEDataFormat format); ++ virtual bool IsSettingVisible(const std::string &settingId); ++ virtual bool SupportsDrain() { return true; } + + CCoreAudioAEHAL* GetHAL(); + +diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp +index 52b2272..3728d5f 100644 +--- a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp ++++ b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp +@@ -95,7 +95,7 @@ bool CCoreAudioAEHALOSX::InitializePCM(ICoreAudioSource *pSource, AEAudioFormat + + AudioChannelLayoutTag layout = g_LayoutMap[ CSettings::Get().GetInt("audiooutput.channels") ]; + // force optical/coax to 2.0 output channels +- if (!m_Passthrough && CSettings::Get().GetInt("audiooutput.mode") == AUDIO_IEC958) ++ if (!m_Passthrough && CSettings::Get().GetInt("audiooutput.channels") == AE_CH_LAYOUT_2_0) + layout = g_LayoutMap[1]; + + if (!m_audioGraph->Open(pSource, format, outputDevice, allowMixing, layout, m_initVolume )) +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp +index ae3916b..69992cc 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp +@@ -74,10 +74,9 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options + return false; + } + +-#if defined(TARGET_DARWIN) +- int audioMode = CSettings::Get().GetInt("audiooutput.mode"); +- if (audioMode == AUDIO_HDMI) +- m_bLpcmMode = CSettings::Get().GetBool("audiooutput.multichannellpcm"); ++#if defined(TARGET_DARWIN_OSX) ++ if (CSettings::Get().GetInt("audiooutput.channels") > AE_CH_LAYOUT_2_0) ++ m_bLpcmMode = true; + #endif + + m_pCodecContext = m_dllAvCodec.avcodec_alloc_context3(pCodec); +-- +1.8.4 + + +From f42df8b7d2d7b2a78ea03cab5cc2afb8ded4ff2d Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Fri, 18 Oct 2013 22:14:06 +0200 +Subject: [PATCH 16/90] [translation] - add a note to channel config help + message about spdif + +--- + language/English/strings.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/language/English/strings.po b/language/English/strings.po +index 256e47e..136a5d0 100755 +--- a/language/English/strings.po ++++ b/language/English/strings.po +@@ -14210,7 +14210,7 @@ msgstr "" + + #: system/settings/settings.xml + msgctxt "#36362" +-msgid "PCM channel configuration (does not apply for passthrough)." ++msgid "PCM channel configuration (does not apply for passthrough). If you are using an spdif/optical/coax output - this has to be 2.0! (5.1 will work via passthrough anyways)" + msgstr "" + + #: system/settings/settings.xml +-- +1.8.4 + + +From 7271d1648e35b285f1261a9a9899bab3916b2d92 Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Sun, 20 Oct 2013 13:38:36 +0200 +Subject: [PATCH 17/90] [AE] - don't allow DTS if it is disabled in settings + +--- + xbmc/cores/AudioEngine/AEFactory.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp +index b63466c..4c1dc86 100644 +--- a/xbmc/cores/AudioEngine/AEFactory.cpp ++++ b/xbmc/cores/AudioEngine/AEFactory.cpp +@@ -247,6 +247,8 @@ bool CAEFactory::SupportsRaw(AEDataFormat format) + // check if the format is enabled in settings + if (format == AE_FMT_AC3 && !CSettings::Get().GetBool("audiooutput.ac3passthrough")) + return false; ++ if (format == AE_FMT_DTS && !CSettings::Get().GetBool("audiooutput.dtspassthrough")) ++ return false; + if (format == AE_FMT_EAC3 && !CSettings::Get().GetBool("audiooutput.eac3passthrough")) + return false; + if (format == AE_FMT_TRUEHD && !CSettings::Get().GetBool("audiooutput.truehdpassthrough")) +-- +1.8.4 + + +From bd9b7f8b00537ef250b87520a86014c344898c8f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 12/86] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 18/90] videoplayer: adapt lateness detection and dropping to buffering --- @@ -5109,10 +5530,10 @@ index baee6e0..8a88c0d 100644 + virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 59dc781..60f572c 100644 +index 143675a..b53c17a 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -175,6 +175,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx +@@ -167,6 +167,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx m_iLastKeyframe = 0; m_dts = DVD_NOPTS_VALUE; m_started = false; @@ -5120,7 +5541,7 @@ index 59dc781..60f572c 100644 } CDVDVideoCodecFFmpeg::~CDVDVideoCodecFFmpeg() -@@ -361,6 +362,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) +@@ -353,6 +354,14 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) { if( m_pCodecContext ) { @@ -5135,7 +5556,7 @@ index 59dc781..60f572c 100644 // i don't know exactly how high this should be set // couldn't find any good docs on it. think it varies // from codec to codec on what it does -@@ -562,6 +571,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p +@@ -554,6 +563,7 @@ int CDVDVideoCodecFFmpeg::Decode(uint8_t* pData, int iSize, double dts, double p void CDVDVideoCodecFFmpeg::Reset() { m_started = false; @@ -5143,7 +5564,7 @@ index 59dc781..60f572c 100644 m_iLastKeyframe = m_pCodecContext->has_b_frames; m_dllAvCodec.avcodec_flush_buffers(m_pCodecContext); -@@ -671,6 +681,22 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) +@@ -663,6 +673,22 @@ bool CDVDVideoCodecFFmpeg::GetPictureCommon(DVDVideoPicture* pDvdVideoPicture) else pDvdVideoPicture->pts = DVD_NOPTS_VALUE; @@ -5166,7 +5587,7 @@ index 59dc781..60f572c 100644 if(!m_started) pDvdVideoPicture->iFlags |= DVP_FLAG_DROPPED; -@@ -932,3 +958,8 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() +@@ -924,3 +950,8 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() else return 0; } @@ -5534,10 +5955,10 @@ index f8ad541..186e271 100644 1.8.4 -From ab2e9f465fea35f371e8b834f8454df109c02832 Mon Sep 17 00:00:00 2001 +From 050daff1dd863f4b5704801120942f02ac4b23c3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 13/86] video player: present correct pts to user for a/v sync +Subject: [PATCH 19/90] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -5605,10 +6026,10 @@ index 186e271..59c7f09 100644 1.8.4 -From 7b6eafa7d352c321f9f15bac2b597089ccbc7fc3 Mon Sep 17 00:00:00 2001 +From dc66afc29d8d4cffe69bfd6fb9b6fa75be645e53 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 14/86] videoplayer: some rework and documentation +Subject: [PATCH 20/90] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -5668,10 +6089,10 @@ index 8a88c0d..b898491 100644 virtual void SetCodecControl(int flags) {} }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 60f572c..b585461 100644 +index b53c17a..9f1fc03 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -959,6 +959,17 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() +@@ -951,6 +951,17 @@ unsigned CDVDVideoCodecFFmpeg::GetAllowedReferences() return 0; } @@ -5719,10 +6140,10 @@ index 752a291..0aef5ee 100644 1.8.4 -From 9224a4ca23f741701a1d1f51f869693678a8f24c Mon Sep 17 00:00:00 2001 +From 7fb6911356fbe14d62dd035bf16721e09a8f88d1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 15/86] renderer: bump buffers to 5 +Subject: [PATCH 21/90] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -5745,10 +6166,10 @@ index a61d3cf..df5fe0e 100644 1.8.4 -From 068b764611416d03286f92f1d52e32b28d3be7da Mon Sep 17 00:00:00 2001 +From 9064ed15a89f411beae6d29bca99575cfbd8f838 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 16/86] videoplayer: update frametime, it might change due to +Subject: [PATCH 22/90] videoplayer: update frametime, it might change due to fps detection --- @@ -5772,10 +6193,10 @@ index 0aef5ee..e7e5097 100644 1.8.4 -From b0620530d3716a2b620faae7865e326a3e7df3a5 Mon Sep 17 00:00:00 2001 +From 859942bd8709455a2a0d5daa30a0f8f0dea7d293 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 17/86] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 23/90] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -5799,10 +6220,10 @@ index e7e5097..c40d193 100644 1.8.4 -From 468dffa9f2f243250db48d62a3f32df10cd42e60 Mon Sep 17 00:00:00 2001 +From 9807cd0d70d95caf73e57dfe1b67db5342b334e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 18/86] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 24/90] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -5839,10 +6260,10 @@ index c412b9f..437276b 100644 1.8.4 -From d477de437d15a860928f1a6bcd2dba4d3444038b Mon Sep 17 00:00:00 2001 +From c854a419071da8637e6088d1e77cf6ae034c4052 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 19/86] X11: ditch SDL for video and window events +Subject: [PATCH 25/90] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -7380,10 +7801,10 @@ index 2454fb1..f5e5731 100644 1.8.4 -From 5405f0e5a408f1aeb296a21a414f6eecfa42ad9b Mon Sep 17 00:00:00 2001 +From c0fe0ae223cd327ee28252a16c4b39eed50f254d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 20/86] X11: Add xbmc icon +Subject: [PATCH 26/90] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -7573,10 +7994,10 @@ index f5e5731..6953b68 100644 1.8.4 -From 98500ce6fb0fab1f09218d5f5e9bb11daaeae856 Mon Sep 17 00:00:00 2001 +From c0f81a0e9ce72032cc110f9f560f7ba8af03b4df Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 21/86] X11: add SDL joystick until we have a better solution +Subject: [PATCH 27/90] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -7630,10 +8051,10 @@ index ad58aad..6f57a87 100644 1.8.4 -From de90bbc6ea9da674a463b1ef912222998212a9cd Mon Sep 17 00:00:00 2001 +From cb6542bc5113a59a6f9d9972fd7a4aad5c5f0758 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 22/86] X11: factor out code handling device reset notification +Subject: [PATCH 28/90] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -7696,10 +8117,10 @@ index 6953b68..d60d04a 100644 1.8.4 -From 3a7a5591590bc38032b72ffa7a3d01e98ea40d59 Mon Sep 17 00:00:00 2001 +From deacc6178699dca0a16e9f4cf5c4861fcab53e31 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 23/86] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 29/90] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -7843,10 +8264,10 @@ index b3be9fc..7259674 100644 1.8.4 -From 3e910cba64fd65f0031fb38f73d3dda018a27406 Mon Sep 17 00:00:00 2001 +From 60221e416d8272591daf486f0d289159cf458945 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 24/86] xrandr: remove method RestoreState +Subject: [PATCH 30/90] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -7925,10 +8346,10 @@ index 0aec487..00b49dc 100644 1.8.4 -From e619d9ad81a86813704e921e006dd4a892c1e84a Mon Sep 17 00:00:00 2001 +From 57237851098a3d858e7d62d1f15c83b2206f5b31 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 25/86] xrandr: observe orientation +Subject: [PATCH 31/90] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -8143,10 +8564,10 @@ index 00b49dc..508604d 100644 1.8.4 -From 43cc7230623cbd20d064d3bd78fb9c676ad9e1c1 Mon Sep 17 00:00:00 2001 +From 67e76af50e468d618b3fdb1a31b02fc1997e7878 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 26/86] xrandr: allow getting info for multiple screen's +Subject: [PATCH 32/90] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -8321,10 +8742,10 @@ index 508604d..d37838a 100644 1.8.4 -From 3e55835eb65d307dfe8518108f13787fb51e1393 Mon Sep 17 00:00:00 2001 +From ca2e3de907770c62c7e940a21378d514dcaa7064 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 27/86] X11: fix multi-head setups +Subject: [PATCH 33/90] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -8339,7 +8760,7 @@ Subject: [PATCH 27/86] X11: fix multi-head setups 9 files changed, 229 insertions(+), 116 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 256e47e..a48da84 100755 +index 136a5d0..ce446a1 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -9093,10 +9514,10 @@ index eb8005e..7d53d36 100644 1.8.4 -From 8053f0eb44d1b3ec7b7ad11f1b92315143830aca Mon Sep 17 00:00:00 2001 +From d8f65e931a12eba9da0e4adc6e64b7f1302f7463 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 28/86] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 34/90] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -9164,10 +9585,10 @@ index 81c6800..8a8ff83 100644 1.8.4 -From daecb38d82a4a54a69b8f85958bb2d24d228f67e Mon Sep 17 00:00:00 2001 +From 11d7dffdb72ef6df2c196e12f7d9cf929c27d2e5 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 29/86] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 35/90] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -9239,10 +9660,10 @@ index 3ba991a..7eecd40 100644 1.8.4 -From acc074d616761d0379fc66bd878f8b556c294430 Mon Sep 17 00:00:00 2001 +From f55503eda8400d4aa3b32d94397de46ae94e1d92 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 30/86] X11: recreate gl context after output has changed +Subject: [PATCH 36/90] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -9393,10 +9814,10 @@ index 8a8ff83..8707467 100644 1.8.4 -From 0362ab69bb7e0ea6337a79d1a6412e748d06cf9d Mon Sep 17 00:00:00 2001 +From 0d5003d795941c51ac15f3c375b8616d5e9ea4a1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 31/86] X11: hook video reference clock in windowing +Subject: [PATCH 37/90] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -9601,10 +10022,10 @@ index dd65a1b..afd71fc 100644 1.8.4 -From 04437d6006001ee7ccae53962651c2120789cf00 Mon Sep 17 00:00:00 2001 +From 284db4f89c604552e58b1527294e2cb2d6dd877b Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 32/86] X11: fix video calibrations +Subject: [PATCH 38/90] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -9696,10 +10117,10 @@ index 2868707..282bb9a 100644 1.8.4 -From dee668a6e23b34d350cec93c63187193c3396e88 Mon Sep 17 00:00:00 2001 +From f2db926b64b917fd287c1af64ff7301c8a26babe Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 33/86] X11: deactivate screen saver on startup +Subject: [PATCH 39/90] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -9769,10 +10190,10 @@ index 282bb9a..32f90da 100644 1.8.4 -From add8a89ae771bb24bb6043d655a15bef857e14f4 Mon Sep 17 00:00:00 2001 +From 8f75db8e3bd0ba46b28f1e9768f090d60b428ea5 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 34/86] X11: change method of going full-screen +Subject: [PATCH 40/90] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -9816,10 +10237,10 @@ index e1fd4e5..acd6497 100644 1.8.4 -From ec3caf7c98a238b3fdf94a2a5c0f9c620a3ad132 Mon Sep 17 00:00:00 2001 +From 898421bf12f4340fca7f7ba52f81a9d8d78d8ff4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 35/86] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 41/90] X11: reset key repeat and key modifier on focus lost and gain --- @@ -9851,10 +10272,10 @@ index d98f12f..743aca9 100644 1.8.4 -From 1fadabedc48838da8bff83ca774f79c29394419d Mon Sep 17 00:00:00 2001 +From 44f9448d041b58ea776468ca89dface8e989f668 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 36/86] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 42/90] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -10071,10 +10492,10 @@ index a412f32..9a8a912 100644 1.8.4 -From 99cb30413a1f334e7e0cd45966ab7e6bb5367c55 Mon Sep 17 00:00:00 2001 +From 8885d86887d91510b23fd6974114660ebdebe114 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 37/86] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 43/90] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -10138,10 +10559,10 @@ index 9a8a912..c69169c 100644 1.8.4 -From d88156bdc4e702f67e6ceead481238cfd5c32e3a Mon Sep 17 00:00:00 2001 +From 3ae8c9e3b10726c55233f7faa14fc05a4b4974e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 38/86] add missing keys to xbmc keytable +Subject: [PATCH 44/90] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -10164,10 +10585,10 @@ index b430f55..246164b 100644 1.8.4 -From fe448fa0ab6ca6537a086f6549688ff179b88f46 Mon Sep 17 00:00:00 2001 +From aaeb5e36da9672d13c4bf2d6e76f1ed71c3af33c Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 39/86] videorefclock: temp deactivate of nv settings +Subject: [PATCH 45/90] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -10190,10 +10611,10 @@ index 4071ff0..b9afc09 100644 1.8.4 -From b64bb92f0308e35b259be7454046d4792ce0a8c2 Mon Sep 17 00:00:00 2001 +From 2c7a7b5a1c41946564ceee0ed38daea59ff16071 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 40/86] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 46/90] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -10224,10 +10645,10 @@ index b9afc09..2f6c7de 100644 1.8.4 -From ccd93e30d7b62e6096389d1fd487c799c3e25bd8 Mon Sep 17 00:00:00 2001 +From b0c53c3ac9929e6db489d332f6044d54d1e7711b Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 41/86] X11: fix icon texture after +Subject: [PATCH 47/90] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -10335,10 +10756,10 @@ index acd6497..805eed7 100644 1.8.4 -From 8d5d2b237856e7e8e2ba280b82a9afc8d8a43641 Mon Sep 17 00:00:00 2001 +From 4d831d60d7703d70ec1c2860f7578702251b51e6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 42/86] X11: check for window manager +Subject: [PATCH 48/90] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -10459,10 +10880,10 @@ index 32f90da..28d9d03 100644 1.8.4 -From ddf034e7ba06aea092cd9701714a23b75f4def61 Mon Sep 17 00:00:00 2001 +From ff0722c7fbb7aaf09e4555cb13ab61fc55142488 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 43/86] X11: dont set window on xrandr if no mode available +Subject: [PATCH 49/90] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -10499,10 +10920,10 @@ index b103248..45741d7 100644 1.8.4 -From 0f0e0780757aa0dba801775514a555fe6739ba40 Mon Sep 17 00:00:00 2001 +From c9178b0d46b5e0fa0feef7e98768f73cb6caf2ec Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 44/86] X11: fix crash after a resolution change on startup +Subject: [PATCH 50/90] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -10526,10 +10947,10 @@ index 45741d7..a6cb67f 100644 1.8.4 -From b3113141719e46946d0d86b5ff9aa5dab01ed2eb Mon Sep 17 00:00:00 2001 +From 9d2e55a52487841d71c1e0b2646afed3944c2c6a Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 45/86] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 51/90] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -10552,10 +10973,10 @@ index a6cb67f..70b5f10 100644 1.8.4 -From a7fd8275509f6af1acebad0578291c488f72c2c5 Mon Sep 17 00:00:00 2001 +From 83547f7165771c8fa1d0596631930eda67b11aad Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 46/86] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 52/90] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -10601,10 +11022,10 @@ index 0016c0b..3514856 100644 1.8.4 -From eadcbc6d43d123f1ff086cf7cd6c347a1e257b77 Mon Sep 17 00:00:00 2001 +From f6b2ca5cd2d7dc3257b58e537382b2bd80be6c22 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 47/86] dvdplayer: observe pts counter overflow +Subject: [PATCH 53/90] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -10891,10 +11312,10 @@ index aef5ab1..35abbdf 100644 1.8.4 -From 299eff8935aee82464a95f0aa8138f9dc110216b Mon Sep 17 00:00:00 2001 +From 8a43785c28483a45e266e34d33fd85aa4603e9f8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 48/86] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 54/90] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -10927,10 +11348,10 @@ index c40d193..6419951 100644 1.8.4 -From e5ce1003977212bcb66239a70b0d33286062330f Mon Sep 17 00:00:00 2001 +From 24d83dbe87d4dca310ddd2bf074d27027a97b3fa Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 49/86] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 55/90] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -10939,10 +11360,10 @@ Subject: [PATCH 49/86] vdpau: advanced settings for auto deinterlacing 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index f57935e..7ee2ed9 100644 +index f026c92..73c9b50 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1949,10 +1949,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) +@@ -1959,10 +1959,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) if (method == VS_INTERLACEMETHOD_AUTO) { int deint = -1; @@ -10958,10 +11379,10 @@ index f57935e..7ee2ed9 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index ac18c02..ecf2313 100644 +index 8e769bf..b96674c 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp -@@ -168,6 +168,8 @@ void CAdvancedSettings::Initialize() +@@ -162,6 +162,8 @@ void CAdvancedSettings::Initialize() m_videoAllowMpeg4VAAPI = false; m_videoDisableBackgroundDeinterlace = false; m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect @@ -10970,7 +11391,7 @@ index ac18c02..ecf2313 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -609,6 +611,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -595,6 +597,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); @@ -10980,10 +11401,10 @@ index ac18c02..ecf2313 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index e6e02ad..70a8e9a 100644 +index d46ee0b..8f031ba 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h -@@ -167,6 +167,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler +@@ -160,6 +160,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler int m_videoPercentSeekBackwardBig; CStdString m_videoPPFFmpegDeint; CStdString m_videoPPFFmpegPostProc; @@ -10996,10 +11417,10 @@ index e6e02ad..70a8e9a 100644 1.8.4 -From c8ce4e5de9aa520b68974b8e3fee18db44c3e647 Mon Sep 17 00:00:00 2001 +From e004800642be56dd0390e84ccd526fbac231882c Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 50/86] player: fix rewind +Subject: [PATCH 56/90] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -11214,10 +11635,10 @@ index 59c7f09..65dea76 100644 1.8.4 -From cfb51b16656c46420a8bb318046e5b9dad0bb01d Mon Sep 17 00:00:00 2001 +From 01fe10260ebecb82ba75d015b3ed044d1d68b3bc Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 51/86] xrandr: fix query for multiple screens +Subject: [PATCH 57/90] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -11258,10 +11679,10 @@ index 9e181f2..ce0a02b 100644 1.8.4 -From c4a02cec0e0a97163c2b9403dab6e30179d5bd2e Mon Sep 17 00:00:00 2001 +From d05eaaa9f28502bb16a7f07fa1d33196c425ac3f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 52/86] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 58/90] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -11288,10 +11709,10 @@ index 70b5f10..64d5730 100644 1.8.4 -From ca7f95ae2fdc8b77450fa706c8dcfb00e95ea8ce Mon Sep 17 00:00:00 2001 +From 0b83ec2c342bf31b91cccc19be572fa9a56f9434 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 53/86] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 59/90] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -11316,10 +11737,10 @@ index 64d5730..edc81c8 100644 1.8.4 -From 0f3d1bc85939212fafe1890f8fc41b10ad860684 Mon Sep 17 00:00:00 2001 +From af2027c6b3eae6f81d286875264185303dc1dfc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 -Subject: [PATCH 54/86] x11: support for multiple x screens +Subject: [PATCH 60/90] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -11342,10 +11763,10 @@ index ce0a02b..aa27d2b 100644 1.8.4 -From 7e1e7e6cbb105a3f27bd4641d8b98b84eff8466e Mon Sep 17 00:00:00 2001 +From 0b8687fc54d40195541a8aae014f1db849285145 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 55/86] pvr: increase changes counter of stream on stream +Subject: [PATCH 61/90] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -11379,10 +11800,10 @@ index b96d520..df89f6f 100644 1.8.4 -From aae22b74edfea53a4291fc378c68b66927a39230 Mon Sep 17 00:00:00 2001 +From e7ae765615c8b56ec042a662e23e28c41007ce20 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 56/86] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 62/90] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -11404,10 +11825,10 @@ index a62521f..263cb5a 100644 1.8.4 -From 32733eaa36e9c5aa357094f7e30056eaeabce30e Mon Sep 17 00:00:00 2001 +From 923e513a605b53fa9afa309f4b6bc1406813b08d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 57/86] X11: remove toggle full screen after resume +Subject: [PATCH 63/90] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -11433,10 +11854,10 @@ index 2033574..c79bbc1 100644 1.8.4 -From 970b6e7acad94efe23ff671e1f9b22b5f8c36964 Mon Sep 17 00:00:00 2001 +From b1b98cdb313993c13dc151d6a91e2e1278cd24a0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 58/86] xrandr: set screen on mode change command +Subject: [PATCH 64/90] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -11459,10 +11880,10 @@ index aa27d2b..67bf6ca 100644 1.8.4 -From 0ae35a6b4c892338c1064d643037787b7170f358 Mon Sep 17 00:00:00 2001 +From 4d64599cb3156aaf40600f1a51404fb0a5a17234 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 59/86] X11: recreate glx context when output changes +Subject: [PATCH 65/90] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -11513,10 +11934,10 @@ index 28d9d03..5a21b00 100644 1.8.4 -From 3191e66f9fb6d4de00e561a28c55d744fecbfb1e Mon Sep 17 00:00:00 2001 +From b3380a75082ac0f73510fde734229b7e75c368e3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 60/86] pvr: do not show selection dialog for a single menu +Subject: [PATCH 66/90] pvr: do not show selection dialog for a single menu hook --- @@ -11524,7 +11945,7 @@ Subject: [PATCH 60/86] pvr: do not show selection dialog for a single menu 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp -index aab6345..a880778 100644 +index 5aaf881..4c64877 100644 --- a/xbmc/pvr/addons/PVRClients.cpp +++ b/xbmc/pvr/addons/PVRClients.cpp @@ -729,6 +729,7 @@ void CPVRClients::ProcessMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, const CF @@ -11554,10 +11975,10 @@ index aab6345..a880778 100644 1.8.4 -From c696584526c4fafd99ed0e181d24bc76084f4d41 Mon Sep 17 00:00:00 2001 +From 30146a167d6788741624ece91bfdbc142e5edf72 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 61/86] X11: use default screen parameters if no output +Subject: [PATCH 67/90] X11: use default screen parameters if no output connected --- @@ -11661,10 +12082,10 @@ index c6aa51a..f481ea4 100644 1.8.4 -From 3ec8f414b2674985e7a324f32b18ee616ee09585 Mon Sep 17 00:00:00 2001 +From fffcfc8c04f4c8004c2c4f8f9b1d7daeec72814a Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 62/86] X11: create parent window +Subject: [PATCH 68/90] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -11930,10 +12351,10 @@ index 5a21b00..b866d52 100644 1.8.4 -From 1a1a85897bd928bc18e5bbd9dc2065240bd196ad Mon Sep 17 00:00:00 2001 +From 34ec39386333591d4109c57abf1a9df9b080219d Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 63/86] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 69/90] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -12135,10 +12556,10 @@ index c69169c..6429291 100644 1.8.4 -From f963e46d3c57a0b4b35623cb7f397acf38918d16 Mon Sep 17 00:00:00 2001 +From 95e8dee1cd7b0d4d933628e13bfe3fb5d548a917 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 64/86] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 70/90] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -12176,10 +12597,10 @@ index c06b8c5..4390d2e 100644 1.8.4 -From 82c6272313d108dcbd00abc0306e6f5d226f142c Mon Sep 17 00:00:00 2001 +From 187ebfac6087c6d621e5b5f7b59366a813f1c57c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 65/86] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 71/90] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- @@ -12203,10 +12624,10 @@ index 56099fe..fc1d725 100644 1.8.4 -From a52ceb74973e0a12977ffb388e429e062daad8ff Mon Sep 17 00:00:00 2001 +From 57420e37d301e2938219c062dcc945ce1ecfa939 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 66/86] fix incorrect display of fps when dr kicks in +Subject: [PATCH 72/90] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- @@ -12233,10 +12654,10 @@ index 8278740..ca1cfa0 100644 1.8.4 -From 4eea944e480097efe8ce3ee481b9fb394441dfb9 Mon Sep 17 00:00:00 2001 +From 8275208c5d7927b326031c89f2680a04857519fd Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 67/86] X11: fix mouse coverage +Subject: [PATCH 73/90] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -12302,10 +12723,10 @@ index b866d52..3f1b5f8 100644 1.8.4 -From 93b58ac58c012ea0e851baed64c2400d7197207e Mon Sep 17 00:00:00 2001 +From 374efbeed41678daabf00387f379e3cc9d23512b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 68/86] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 74/90] X11: fix incorrectly used screen num in desktop resolution --- @@ -12340,10 +12761,10 @@ index 7987cc2..b13f1a5 100644 1.8.4 -From 8f2eb8b5fc1cef333ff3bfb6efb3cdcc0a9bd8e0 Mon Sep 17 00:00:00 2001 +From 8f975858b7f68cc63292f6e197cd79061f855204 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 69/86] X11: do not overwrite user selected monitor with +Subject: [PATCH 75/90] X11: do not overwrite user selected monitor with fallback --- @@ -12468,10 +12889,10 @@ index 3f1b5f8..ed70d9c 100644 1.8.4 -From f53d2f9479a2171a3fc7f8e847673d6203c1de06 Mon Sep 17 00:00:00 2001 +From 7a0fdb7bf5828744f9b8906897999eeeae023e15 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 70/86] xrandr: add turn on/off to wrapper +Subject: [PATCH 76/90] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -12637,10 +13058,10 @@ index d37838a..059062f 100644 1.8.4 -From 2fdd4246809702a5bba7a33ccd2127506546c86b Mon Sep 17 00:00:00 2001 +From d052d7e2f65207f2c1c1467415e851826cf89bd5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 71/86] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 77/90] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -12697,10 +13118,10 @@ index 059062f..ab7cc63 100644 1.8.4 -From 7cf2de0f690b89e91997bb93df344f09b29649cd Mon Sep 17 00:00:00 2001 +From 4d708adcf6b8db95ab25022988403aff0441cc6d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 72/86] X11: multi-head improvement - poll for desired output +Subject: [PATCH 78/90] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -12715,7 +13136,7 @@ Subject: [PATCH 72/86] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index a48da84..c792f9b 100755 +index ce446a1..bcea324 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6432,7 +6432,7 @@ msgctxt "#14071" @@ -12981,10 +13402,10 @@ index 4809821..1ad26b2 100644 1.8.4 -From 98d33e25a4a22dcd5ea24fd5119ab96a600c0662 Mon Sep 17 00:00:00 2001 +From dfad0811b5dd56abc901f1dd4f9372982fb9aad5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 73/86] X11: ignore mouse move event form other windows +Subject: [PATCH 79/90] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -13016,10 +13437,10 @@ index 908c8b6..938ad26 100644 1.8.4 -From 75653e53df5de54a23b908f887a914f9c52e553d Mon Sep 17 00:00:00 2001 +From 7462198285f83681de66f9e801a6fc4e1a1eb202 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 74/86] renderer: allow some lateness within vblank interval +Subject: [PATCH 80/90] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -13079,10 +13500,10 @@ index befd851..27283ec 100644 1.8.4 -From f93de3d41e3aba6963ba1d093b264c46bc1fe9ef Mon Sep 17 00:00:00 2001 +From e3135f094dc6f3c33af014e6ade13f2471bce584 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 75/86] X11: another fix for mouse coverage +Subject: [PATCH 81/90] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -13115,10 +13536,10 @@ index 938ad26..e4ca56d 100644 1.8.4 -From 5b39530c677395c920d91f2c8692c5f5ffb449c5 Mon Sep 17 00:00:00 2001 +From 5efa5d1fbcea7de2257a14ae12396979631cabbc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 76/86] X11: set windows class name +Subject: [PATCH 82/90] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -13160,17 +13581,17 @@ index cbb56bf..e74f2b0 100644 1.8.4 -From b5000c0456fd8d4d24a4771be89cb110c1e915d0 Mon Sep 17 00:00:00 2001 +From d9a0f0dfc6a928f4afd6146cdcb942b9d7de7ba8 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 77/86] fixed: typo +Subject: [PATCH 83/90] fixed: typo --- language/English/strings.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index c792f9b..cb7a58a 100755 +index bcea324..66a96db 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6566,7 +6566,7 @@ msgstr "" @@ -13186,10 +13607,10 @@ index c792f9b..cb7a58a 100755 1.8.4 -From 10c25779282770a6cd7e70cf5dcadc8edd2f949c Mon Sep 17 00:00:00 2001 +From cf557b92023049f301f937b62bc66dff2d7b92a8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 78/86] ActiveAE: slightly reduce buffer size +Subject: [PATCH 84/90] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- @@ -13214,10 +13635,10 @@ index 6a3f700..543670b 100644 1.8.4 -From a15f3b944ee60b417b1df368d9e8d64885d99dcf Mon Sep 17 00:00:00 2001 +From 1ed247bac6dfb81ba4262902d43459847b7933ca Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 79/86] Revert "vdpau: comment some features that will be added +Subject: [PATCH 85/90] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -13226,10 +13647,10 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 7ee2ed9..7201c21 100644 +index 73c9b50..1ac0978 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -1074,8 +1074,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) +@@ -1084,8 +1084,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) m_bufferStats.IncDecoded(); m_vdpauOutput.m_dataPort.SendOutMessage(COutputDataProtocol::NEWFRAME, &pic, sizeof(pic)); @@ -13239,7 +13660,7 @@ index 7ee2ed9..7201c21 100644 } int retval = 0; -@@ -2273,8 +2272,7 @@ void CMixer::InitCycle() +@@ -2283,8 +2282,7 @@ void CMixer::InitCycle() int flags; uint64_t latency; m_config.stats->GetParams(latency, flags); @@ -13249,7 +13670,7 @@ index 7ee2ed9..7201c21 100644 SetPostProcFeatures(false); else SetPostProcFeatures(true); -@@ -2285,8 +2283,7 @@ void CMixer::InitCycle() +@@ -2295,8 +2293,7 @@ void CMixer::InitCycle() EINTERLACEMETHOD method = GetDeinterlacingMethod(); bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED; @@ -13259,7 +13680,7 @@ index 7ee2ed9..7201c21 100644 (mode == VS_DEINTERLACEMODE_FORCE || (mode == VS_DEINTERLACEMODE_AUTO && interlaced))) { -@@ -2308,8 +2305,7 @@ void CMixer::InitCycle() +@@ -2318,8 +2315,7 @@ void CMixer::InitCycle() m_config.stats->SetCanSkipDeint(true); } @@ -13273,10 +13694,10 @@ index 7ee2ed9..7201c21 100644 1.8.4 -From 0a8823480f217c8dafb4866789f24ab2c9684728 Mon Sep 17 00:00:00 2001 +From a2c93824cb24065adf80029c8eec58552e2912fa Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 80/86] X11: fix keysyms +Subject: [PATCH 86/90] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -13299,10 +13720,10 @@ index e4ca56d..b20130c 100644 1.8.4 -From 0b9163c082446552e09a9bc45d76c7eb0ca33b8a Mon Sep 17 00:00:00 2001 +From 946fd134fae037296b079a72677a2bd48459e424 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 81/86] X11: fix keysym for non-IM +Subject: [PATCH 87/90] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -13325,10 +13746,10 @@ index b20130c..a38890c 100644 1.8.4 -From 7333834e636f7678def8e6a957c6502b57381482 Mon Sep 17 00:00:00 2001 +From 6187eac740ef1b2d98cdd06c613de3f143d9c721 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 82/86] add some missing multi media keys +Subject: [PATCH 88/90] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -13383,10 +13804,10 @@ index ee6bb69..364b45a 100644 1.8.4 -From 98e20f5d928c04b5e89a2ba0675a525e1eda21aa Mon Sep 17 00:00:00 2001 +From c1eaca4f648f0c567d091587c2a649c211411185 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 83/86] X11: squash multi +Subject: [PATCH 89/90] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -13409,10 +13830,10 @@ index e74f2b0..480efb3 100644 1.8.4 -From 1ce6d0c399cd11a0a49c3b2fde447c010810569a Mon Sep 17 00:00:00 2001 +From bb42b1cdf58d66c331861c0ed8bf3f6e0b6696e5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 84/86] X11: do not poll default monitor +Subject: [PATCH 90/90] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -13434,97 +13855,3 @@ index 480efb3..dd04357 100644 -- 1.8.4 - -From 31237c342d0de251c8c6f5c2754cc3db954f107d Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Fri, 11 Oct 2013 09:01:57 +0200 -Subject: [PATCH 85/86] vdpau: check for GL_NV_vdpau_interop in open - ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 23 ++++++++++------------- - 1 file changed, 10 insertions(+), 13 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 7201c21..1ac0978 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -485,6 +485,16 @@ int CVideoSurfaces::Size() - - bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat, unsigned int surfaces) - { -+#ifndef GL_NV_vdpau_interop -+ CLog::Log(LOGNOTICE, "VDPAU: compilation without required extension GL_NV_vdpau_interop"); -+ return false; -+#endif -+ if (!g_Windowing.IsExtSupported("GL_NV_vdpau_interop")) -+ { -+ CLog::Log(LOGNOTICE, "VDPAU: required extension GL_NV_vdpau_interop not found"); -+ return false; -+ } -+ - if(avctx->coded_width == 0 - || avctx->coded_height == 0) - { -@@ -3351,8 +3361,6 @@ bool COutput::GLInit() - #endif - - #ifdef GL_NV_vdpau_interop -- if (glewIsSupported("GL_NV_vdpau_interop")) -- { - if (!glVDPAUInitNV) - glVDPAUInitNV = (PFNGLVDPAUINITNVPROC)glXGetProcAddress((GLubyte *) "glVDPAUInitNV"); - if (!glVDPAUFiniNV) -@@ -3374,17 +3382,6 @@ bool COutput::GLInit() - if (!glVDPAUGetSurfaceivNV) - glVDPAUGetSurfaceivNV = (PFNGLVDPAUGETSURFACEIVNVPROC)glXGetProcAddress((GLubyte *) "glVDPAUGetSurfaceivNV"); - -- CLog::Log(LOGNOTICE, "VDPAU::COutput GL interop supported"); -- } -- else --#endif -- { -- // TODO should be detected before vdpau is opened, though very unlikely -- // that this code is hit -- CLog::Log(LOGERROR, "VDPAU::COutput driver does not support GL_NV_vdpau_interop"); -- } -- --#ifdef GL_NV_vdpau_interop - while (glGetError() != GL_NO_ERROR); - glVDPAUInitNV(reinterpret_cast(m_config.context->GetDevice()), reinterpret_cast(m_config.context->GetProcs().vdp_get_proc_address)); - if (glGetError() != GL_NO_ERROR) --- -1.8.4 - - -From 95a90fe620d1219fda8f5d2ecd9c748296bece06 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Tue, 15 Oct 2013 07:54:33 +0200 -Subject: [PATCH 86/86] Revert "dvdplayer: disallow hw accel of SD mpeg2's" - -This reverts commit 99243803fc0c13051f44040dc5081e5a98634252. ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index b585461..9f1fc03 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -71,14 +71,6 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx - if(!ctx->IsHardwareAllowed()) - return ctx->m_dllAvCodec.avcodec_default_get_format(avctx, fmt); - -- /* there are many corrupt mpeg2 rips from dvd's which don't * -- * follow profile spec properly, they go corrupt on hw, so * -- * keep those running in software for the time being. */ -- if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO -- && avctx->height <= 576 -- && avctx->width <= 720) -- return ctx->m_dllAvCodec.avcodec_default_get_format(avctx, fmt); -- - const PixelFormat * cur = fmt; - while(*cur != PIX_FMT_NONE) - { --- -1.8.4 - diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-995.10-disable-minimize.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-995.10-disable-minimize.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-995.10-disable-minimize.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-995.10-disable-minimize.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch diff --git a/packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch b/packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/13.alpha-ed1d9c7/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch rename to packages/mediacenter/xbmc/patches/13.alpha-ae6ca84/xbmc-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch