diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-VideoPlayer_Fix_build_after_dropping_deinterlacing_mode.patch b/packages/mediacenter/kodi/patches/kodi-999.99-VideoPlayer_Fix_build_after_dropping_deinterlacing_mode.patch new file mode 100644 index 0000000000..1cb247df17 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-999.99-VideoPlayer_Fix_build_after_dropping_deinterlacing_mode.patch @@ -0,0 +1,75 @@ +From 9fe38dcb04d89770e12d374880b3115acd9da4f1 Mon Sep 17 00:00:00 2001 +From: Christian Fetzer +Date: Tue, 2 Aug 2016 07:54:15 +0200 +Subject: [PATCH] [VideoPlayer] Fix build after dropping deinterlacing mode + +25718f4ccebd227eaf63f0f8b53f0552f89f01e5 forgot to remove some methods +that still use EDEINTERLACEMODE. +--- + .../VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp | 10 ---------- + .../cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h | 1 - + .../VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.cpp | 5 ----- + .../VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.h | 1 - + 4 files changed, 17 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp +index d0baa27..d8674c8 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp +@@ -81,16 +81,6 @@ bool CRendererAML::Supports(EINTERLACEMETHOD method) + return false; + } + +-bool CRendererAML::Supports(EDEINTERLACEMODE mode) +-{ +- if(mode == VS_DEINTERLACEMODE_OFF +- || mode == VS_DEINTERLACEMODE_AUTO +- || mode == VS_DEINTERLACEMODE_FORCE) +- return true; +- +- return false; +-} +- + bool CRendererAML::Supports(ESCALINGMETHOD method) + { + return false; +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h +index 819f6e3..828f584a 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h +@@ -41,7 +41,6 @@ class CRendererAML : public CLinuxRendererGLES + + // Feature support + virtual bool Supports(EINTERLACEMETHOD method); +- virtual bool Supports(EDEINTERLACEMODE mode); + virtual bool Supports(ESCALINGMETHOD method); + virtual bool Supports(ERENDERFEATURE feature); + +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.cpp +index 0fb0312..ba05557 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.cpp ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.cpp +@@ -71,11 +71,6 @@ bool CRendererOMX::Supports(EINTERLACEMETHOD method) + return false; + } + +-bool CRendererOMX::Supports(EDEINTERLACEMODE mode) +-{ +- return false; +-} +- + bool CRendererOMX::Supports(ESCALINGMETHOD mode) + { + return false; +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.h +index 5f18452..6e84cb2 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.h ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererOpenMax.h +@@ -38,7 +38,6 @@ class CRendererOMX : public CLinuxRendererGLES + + // Feature support + virtual bool Supports(EINTERLACEMETHOD method); +- virtual bool Supports(EDEINTERLACEMODE mode); + virtual bool Supports(ESCALINGMETHOD method); + + diff --git a/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch b/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch index 140734044f..a829e77600 100644 --- a/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch +++ b/projects/WeTek_Core/patches/kodi/0001-aml-Fill-audio-packets-completely-when-resampling-to.patch @@ -1,7 +1,7 @@ -From 2cb772cdb3f42bed6932570d38c6881de73e58d2 Mon Sep 17 00:00:00 2001 +From 58415a1c26a1d0f41bc45ff66471c2a41b705edf Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Sat, 20 Sep 2014 04:43:52 +0300 -Subject: [PATCH 1/6] [aml] Fill audio packets completely when resampling to +Subject: [PATCH 1/5] [aml] Fill audio packets completely when resampling to prevent 'audio data unaligned' kernel warnings --- @@ -9,12 +9,12 @@ Subject: [PATCH 1/6] [aml] Fill audio packets completely when resampling to 1 file changed, 4 insertions(+) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -index 1e38b4e..4bcd331 100644 +index 3ca667c..304cff8 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -@@ -144,7 +144,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm - if (AE_IS_RAW(m_inputFormat.m_dataFormat)) - m_inputFormat.m_dataFormat = AE_FMT_S16NE; +@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm + m_inputFormat.m_channelLayout += AE_CH_FC; + } m_resampler = NULL; +#ifdef HAS_LIBAMCODEC + m_fillPackets = true; diff --git a/projects/WeTek_Play/patches/kodi/0019-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch b/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch similarity index 74% rename from projects/WeTek_Play/patches/kodi/0019-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch rename to projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch index 6d8d4a23b5..dbea3feb33 100644 --- a/projects/WeTek_Play/patches/kodi/0019-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch +++ b/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch @@ -1,18 +1,18 @@ -From 11435d47a5351c55ef12661baf1adb167da513ef Mon Sep 17 00:00:00 2001 +From 4b3958857f85df99dece4faffd42b15a9445e5cb Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Tue, 30 Jun 2015 11:19:57 +0200 -Subject: [PATCH] [aml] Ugly workaround to show DTS/AC3 caps +Subject: [PATCH 2/5] [aml] Ugly workaround to show DTS/AC3 caps ... but don't run into multi channel issues as we can only open 2 pcm channels --- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++ + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 32ab888..d4eb0be 100644 +index 6a9066b..7abf119 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1336,6 +1336,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) +@@ -1301,6 +1301,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) { @@ -25,3 +25,6 @@ index 32ab888..d4eb0be 100644 if (name.substr(0, 4) == "hdmi") return AE_DEVTYPE_HDMI; else if (name.substr(0, 6) == "iec958" || name.substr(0, 5) == "spdif") +-- +1.7.10.4 + diff --git a/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch b/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch index e0782c17d1..535c377f8b 100644 --- a/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch +++ b/projects/WeTek_Core/patches/kodi/0003-aml-Add-support-for-4k-resolutions.patch @@ -1,21 +1,19 @@ -From 836bee21cad8c5259f24972fc2b55f93dc712486 Mon Sep 17 00:00:00 2001 +From 46aab0b0856eeaa855c430ddd36ac97203afa43b Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Wed, 1 Jul 2015 23:37:11 +0200 -Subject: [PATCH 3/6] [aml] Add support for 4k resolutions +Subject: [PATCH 3/5] [aml] Add support for 4k resolutions -Conflicts: - xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp --- - xbmc/utils/AMLUtils.cpp | 16 +++--- - xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp | 81 +++++++++++++++++++++------ - xbmc/windowing/egl/EGLNativeTypeAmlogic.h | 2 + - 3 files changed, 73 insertions(+), 26 deletions(-) + xbmc/utils/AMLUtils.cpp | 16 ++++++++-------- + xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp | 23 +++++++++++++++++++---- + xbmc/windowing/egl/EGLNativeTypeAmlogic.h | 2 ++ + 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/xbmc/utils/AMLUtils.cpp b/xbmc/utils/AMLUtils.cpp -index 1b54435..05f2cd0 100644 +index 80fb453..65286de 100644 --- a/xbmc/utils/AMLUtils.cpp +++ b/xbmc/utils/AMLUtils.cpp -@@ -449,8 +449,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) +@@ -463,8 +463,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) } else if (StringUtils::EqualsNoCase(fromMode, "4k2ksmpte") || StringUtils::EqualsNoCase(fromMode, "smpte24hz")) { @@ -26,7 +24,7 @@ index 1b54435..05f2cd0 100644 res->iScreenWidth = 4096; res->iScreenHeight= 2160; res->fRefreshRate = 24; -@@ -467,8 +467,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) +@@ -481,8 +481,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) } else if (StringUtils::EqualsNoCase(fromMode, "4k2k24hz") || StringUtils::EqualsNoCase(fromMode, "2160p24hz")) { @@ -37,7 +35,7 @@ index 1b54435..05f2cd0 100644 res->iScreenWidth = 3840; res->iScreenHeight= 2160; res->fRefreshRate = 24; -@@ -476,8 +476,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) +@@ -490,8 +490,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) } else if (StringUtils::EqualsNoCase(fromMode, "4k2k25hz") || StringUtils::EqualsNoCase(fromMode, "2160p25hz")) { @@ -48,7 +46,7 @@ index 1b54435..05f2cd0 100644 res->iScreenWidth = 3840; res->iScreenHeight= 2160; res->fRefreshRate = 25; -@@ -494,8 +494,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) +@@ -508,8 +508,8 @@ bool aml_mode_to_resolution(const char *mode, RESOLUTION_INFO *res) } else if (StringUtils::EqualsNoCase(fromMode, "4k2k30hz") || StringUtils::EqualsNoCase(fromMode, "2160p30hz")) { @@ -60,10 +58,10 @@ index 1b54435..05f2cd0 100644 res->iScreenHeight= 2160; res->fRefreshRate = 30; diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp -index 21256ef..2103f0b 100644 +index 88cd385..3bfb0c6 100644 --- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp +++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp -@@ -65,7 +65,22 @@ void CEGLNativeTypeAmlogic::Initialize() +@@ -64,7 +64,22 @@ void CEGLNativeTypeAmlogic::Initialize() { aml_permissions(); DisableFreeScale(); @@ -86,7 +84,7 @@ index 21256ef..2103f0b 100644 void CEGLNativeTypeAmlogic::Destroy() { return; -@@ -84,8 +99,8 @@ bool CEGLNativeTypeAmlogic::CreateNativeWindow() +@@ -83,8 +98,8 @@ bool CEGLNativeTypeAmlogic::CreateNativeWindow() if (!nativeWindow) return false; @@ -97,7 +95,7 @@ index 21256ef..2103f0b 100644 m_nativeWindow = nativeWindow; SetFramebufferResolution(nativeWindow->width, nativeWindow->height); -@@ -280,8 +325,8 @@ void CEGLNativeTypeAmlogic::SetFramebufferResolution(int width, int height) cons +@@ -244,8 +259,8 @@ void CEGLNativeTypeAmlogic::SetFramebufferResolution(int width, int height) cons { vinfo.xres = width; vinfo.yres = height; @@ -109,10 +107,10 @@ index 21256ef..2103f0b 100644 vinfo.activate = FB_ACTIVATE_ALL; ioctl(fd0, FBIOPUT_VSCREENINFO, &vinfo); diff --git a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h -index 6867c38..9ca41d4 100644 +index cfb33ca..cf60134 100644 --- a/xbmc/windowing/egl/EGLNativeTypeAmlogic.h +++ b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h -@@ -55,6 +55,8 @@ protected: +@@ -58,6 +58,8 @@ protected: private: void SetFramebufferResolution(const RESOLUTION_INFO &res) const; void SetFramebufferResolution(int width, int height) const; diff --git a/projects/WeTek_Core/patches/kodi/0004-keyboard-Make-Escape-key-execute-back-action.patch b/projects/WeTek_Core/patches/kodi/0004-keyboard-Make-Escape-key-execute-back-action.patch deleted file mode 100644 index 698b1abbe9..0000000000 --- a/projects/WeTek_Core/patches/kodi/0004-keyboard-Make-Escape-key-execute-back-action.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 993592beebd6502a192eace6f52d0d45bfd10e6d Mon Sep 17 00:00:00 2001 -From: Alex Deryskyba -Date: Fri, 11 Dec 2015 23:44:42 +0100 -Subject: [PATCH 4/6] [keyboard] Make Escape key execute back action - ---- - system/keymaps/keyboard.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml -index f420c48..160abf1 100644 ---- a/system/keymaps/keyboard.xml -+++ b/system/keymaps/keyboard.xml -@@ -68,7 +68,7 @@ - Menu - ActivateWindow(PlayerControls) - ActivateWindow(shutdownmenu) -- PreviousMenu -+ Back - Info - ContextMenu - Menu -@@ -209,6 +209,7 @@ - Backspace - Backspace - PreviousMenu -+ PreviousMenu - - - --- -1.7.10.4 - diff --git a/projects/WeTek_Core/patches/kodi/0006-powermanagement-Perform-suspend-instead-of-powerdown.patch b/projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch similarity index 89% rename from projects/WeTek_Core/patches/kodi/0006-powermanagement-Perform-suspend-instead-of-powerdown.patch rename to projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch index 8f69077168..a2154837c7 100644 --- a/projects/WeTek_Core/patches/kodi/0006-powermanagement-Perform-suspend-instead-of-powerdown.patch +++ b/projects/WeTek_Core/patches/kodi/0004-powermanagement-Perform-suspend-instead-of-powerdown.patch @@ -1,7 +1,7 @@ -From ef479f5e7a41ef5b79c676950770fe1973fd38a9 Mon Sep 17 00:00:00 2001 +From 5095bcfcb4bf235855f2474ff229a95c8f20fc2d Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Tue, 14 Jul 2015 16:02:35 +0300 -Subject: [PATCH 6/6] [powermanagement] Perform suspend instead of powerdown +Subject: [PATCH 4/5] [powermanagement] Perform suspend instead of powerdown --- xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- diff --git a/projects/WeTek_Play/patches/kodi/1012-hide-meaningless-skips-from-users.patch b/projects/WeTek_Core/patches/kodi/0005-aml-FIX-renderer-hide-meaningless-skips-from-users.patch similarity index 51% rename from projects/WeTek_Play/patches/kodi/1012-hide-meaningless-skips-from-users.patch rename to projects/WeTek_Core/patches/kodi/0005-aml-FIX-renderer-hide-meaningless-skips-from-users.patch index 6a82519bec..df710fae32 100644 --- a/projects/WeTek_Play/patches/kodi/1012-hide-meaningless-skips-from-users.patch +++ b/projects/WeTek_Core/patches/kodi/0005-aml-FIX-renderer-hide-meaningless-skips-from-users.patch @@ -1,18 +1,18 @@ -From 0cdf5c043e783e8d956c5d59be8a9ec13a53fee3 Mon Sep 17 00:00:00 2001 -From: "Chris \\\"Koying\\\" Browet" +From 90f9b85847f5e3d81ee6ddbbf303fec19a8e778a Mon Sep 17 00:00:00 2001 +From: "Chris \\\\\\\"Koying\\\\\\\" Browet" Date: Fri, 19 Dec 2014 12:30:04 +0100 -Subject: [PATCH] [aml] FIX: [renderer] hide meaningless skips from users +Subject: [PATCH 5/5] [aml] FIX: [renderer] hide meaningless skips from users --- - xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++- + xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -index 70741be..15a484a 100644 +index 558a1f3..7e25e16 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp -@@ -1421,7 +1421,8 @@ void CRenderManager::PrepareNextRender() - while(m_queued.front() != idx) +@@ -1351,7 +1351,8 @@ void CRenderManager::PrepareNextRender() + while (m_queued.front() != idx) { requeue(m_discard, m_queued); - m_QueueSkip++; @@ -20,4 +20,7 @@ index 70741be..15a484a 100644 + m_QueueSkip++; } - m_presentstep = PRESENT_FLIP; + int lateframes = (renderPts - m_Queue[idx].pts) / frametime; +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch b/projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch similarity index 78% rename from projects/WeTek_Play/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch rename to projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch index 72c97da58d..0293fc38ae 100644 --- a/projects/WeTek_Play/patches/kodi/0001-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch +++ b/projects/WeTek_Play/patches/kodi/0001-aml-Fix-ALSA-sound-output-for-Amlogic-based-devices.patch @@ -1,17 +1,17 @@ -From fde3d3d609e570aa3a8691a4e66e07dce1c80b25 Mon Sep 17 00:00:00 2001 +From d692d81a72f47fa8fcc57063b0e54336399af811 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Wed, 16 Apr 2014 22:02:01 +0300 -Subject: [PATCH] [aml] Fix ALSA sound output for Amlogic-based devices. +Subject: [PATCH 01/10] [aml] Fix ALSA sound output for Amlogic-based devices. --- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 +++++++++++++++++++ + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index fbccce0..6bf2c53 100644 +index 6a9066b..75f2cf0 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -84,6 +84,17 @@ static unsigned int ALSASampleRateList[] = +@@ -88,6 +88,17 @@ static unsigned int ALSASampleRateList[] = 0 }; @@ -29,7 +29,7 @@ index fbccce0..6bf2c53 100644 CAESinkALSA::CAESinkALSA() : m_bufferSize(0), m_formatSampleRateMul(0.0), -@@ -748,12 +759,20 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig +@@ -752,12 +763,20 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig */ periodSize = std::min(periodSize, (snd_pcm_uframes_t) sampleRate / 20); bufferSize = std::min(bufferSize, (snd_pcm_uframes_t) sampleRate / 5); @@ -50,3 +50,6 @@ index fbccce0..6bf2c53 100644 CLog::Log(LOGDEBUG, "CAESinkALSA::InitializeHW - Request: periodSize %lu, bufferSize %lu", periodSize, bufferSize); +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0008-Reorder-libraries-in-configure-script-to-prevent-lin.patch b/projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch similarity index 78% rename from projects/WeTek_Play/patches/kodi/0008-Reorder-libraries-in-configure-script-to-prevent-lin.patch rename to projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch index 098407d013..7961307046 100644 --- a/projects/WeTek_Play/patches/kodi/0008-Reorder-libraries-in-configure-script-to-prevent-lin.patch +++ b/projects/WeTek_Play/patches/kodi/0002-aml-Reorder-libraries-in-configure-script-to-prevent.patch @@ -1,7 +1,7 @@ -From 0367076d263846832cff68052f3de362f27e5bc6 Mon Sep 17 00:00:00 2001 +From a1f4a5a74bb8e9fd48ec3d45bc908861dddb0296 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Mon, 8 Sep 2014 23:29:40 +0300 -Subject: [PATCH] [wetek] Reorder libraries in configure script to prevent +Subject: [PATCH 02/10] [aml] Reorder libraries in configure script to prevent linker errors when linking with libsmbclient Place libsmbclient before all other libraries to prevent linker errors when linking @@ -9,14 +9,14 @@ with libsmbclient if the libc that is currently used doesn't contain some functi such as dn_expand (which are often included in libc), but are actually included in libresolv. --- - configure.ac | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index fbe2766..c668729 100644 +index 5b8c04b..7869041 100644 --- a/configure.ac +++ b/configure.ac -@@ -1425,7 +1425,7 @@ fi +@@ -1305,7 +1305,7 @@ fi # samba if test "x$use_samba" != "xno"; then PKG_CHECK_MODULES([SAMBA], [smbclient], @@ -25,3 +25,6 @@ index fbe2766..c668729 100644 [AC_CHECK_LIB([smbclient], [main],, use_samba=no;AC_MSG_ERROR($missing_library)) USE_LIBSMBCLIENT=0 +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0009-aml-Change-the-sample-rates-that-are-supported-by-AL.patch b/projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch similarity index 72% rename from projects/WeTek_Play/patches/kodi/0009-aml-Change-the-sample-rates-that-are-supported-by-AL.patch rename to projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch index f24d6c80e1..74a111a4ac 100644 --- a/projects/WeTek_Play/patches/kodi/0009-aml-Change-the-sample-rates-that-are-supported-by-AL.patch +++ b/projects/WeTek_Play/patches/kodi/0003-aml-Change-the-sample-rates-that-are-supported-by-AL.patch @@ -1,18 +1,19 @@ -From 813e6f31c8006190615cbf8ab031db2362bcf553 Mon Sep 17 00:00:00 2001 +From 044271ec20fb82025c59fed81baddf766e28c28d Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Fri, 19 Sep 2014 01:55:12 +0300 -Subject: [PATCH] [aml] Change the sample rates that are supported by ALSA but - unsupported by HDMI to the closest supported value +Subject: [PATCH 03/10] [aml] Change the sample rates that are supported by + ALSA but unsupported by HDMI to the closest supported + value --- - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 20 ++++++++++++++++++++ + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index 6bf2c53..32ab888 100644 +index 75f2cf0..08777aa 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -673,6 +673,26 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig +@@ -677,6 +677,26 @@ bool CAESinkALSA::InitializeHW(const ALSAConfig &inconfig, ALSAConfig &outconfig snd_pcm_hw_params_set_access(m_pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); unsigned int sampleRate = inconfig.sampleRate; @@ -39,3 +40,6 @@ index 6bf2c53..32ab888 100644 snd_pcm_hw_params_set_rate_near (m_pcm, hw_params, &sampleRate, NULL); unsigned int channelCount = inconfig.channels; +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0010-aml-Fill-audio-packets-completely-when-resampling-to.patch b/projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch similarity index 68% rename from projects/WeTek_Play/patches/kodi/0010-aml-Fill-audio-packets-completely-when-resampling-to.patch rename to projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch index 634c68112e..f684b960a4 100644 --- a/projects/WeTek_Play/patches/kodi/0010-aml-Fill-audio-packets-completely-when-resampling-to.patch +++ b/projects/WeTek_Play/patches/kodi/0004-aml-Fill-audio-packets-completely-when-resampling-to.patch @@ -1,18 +1,18 @@ -From b97f9b069a98984109829badcdf8ead92a29ee38 Mon Sep 17 00:00:00 2001 +From a9be548866b1f01e5f467a6f92b731fa07f9ba9e Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Sat, 20 Sep 2014 04:43:52 +0300 -Subject: [PATCH] [aml] Fill audio packets completely when resampling to +Subject: [PATCH 04/10] [aml] Fill audio packets completely when resampling to prevent 'audio data unaligned' kernel warnings --- - xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 4 ++++ + xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -index dffded7..2f9dc47 100644 +index 3ca667c..304cff8 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp -@@ -157,7 +157,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm +@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm m_inputFormat.m_channelLayout += AE_CH_FC; } m_resampler = NULL; @@ -24,3 +24,6 @@ index dffded7..2f9dc47 100644 m_drain = false; m_empty = true; m_procSample = NULL; +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0013-Save-settings-only-if-they-were-modified-after-the-l.patch b/projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch similarity index 85% rename from projects/WeTek_Play/patches/kodi/0013-Save-settings-only-if-they-were-modified-after-the-l.patch rename to projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch index 34d91c79f2..a9372ebf55 100644 --- a/projects/WeTek_Play/patches/kodi/0013-Save-settings-only-if-they-were-modified-after-the-l.patch +++ b/projects/WeTek_Play/patches/kodi/0005-Save-settings-only-if-they-were-modified-after-the-l.patch @@ -1,8 +1,8 @@ -From 55a51ac4c992deaa1122ec8fccd21f8a336889e0 Mon Sep 17 00:00:00 2001 +From 9936eb795dc53b7681540c57263d175907ae45ac Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Sun, 19 Oct 2014 16:20:33 +0300 -Subject: [PATCH 13/17] Save settings only if they were modified after the last - save +Subject: [PATCH 05/10] Save settings only if they were modified after the + last save This prevents from multiple saving the same settings and helps to resolve the issue on Amlogic G18REF TV-boxes when setiings may be lost after a poweroff. @@ -20,14 +20,14 @@ note by seo: added utils/md5.h after kodi includes cleanup. however, this patch should not be needed at all. TODO remove --- - xbmc/settings/Settings.cpp | 12 ++++++++++++ + xbmc/settings/Settings.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 2e690e3..bd0200d 100644 +index a8114aa..e629e97 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp -@@ -72,6 +72,7 @@ +@@ -75,6 +75,7 @@ #include "threads/SingleLock.h" #include "utils/CharsetConverter.h" #include "utils/log.h" @@ -35,7 +35,7 @@ index 2e690e3..bd0200d 100644 #include "utils/RssManager.h" #include "utils/StringUtils.h" #include "utils/SystemInfo.h" -@@ -206,6 +207,17 @@ bool CSettings::Save(const std::string &file) +@@ -537,6 +538,17 @@ bool CSettings::Save(const std::string &file) if (!m_settingsManager->Save(root)) return false; @@ -54,5 +54,5 @@ index 2e690e3..bd0200d 100644 } -- -2.1.4 +1.7.10.4 diff --git a/projects/WeTek_Play/patches/kodi/0016-aml-Disable-deinterlacing-for-HD-content-while-video.patch b/projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch similarity index 71% rename from projects/WeTek_Play/patches/kodi/0016-aml-Disable-deinterlacing-for-HD-content-while-video.patch rename to projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch index 0bc4a80f05..caee12516e 100644 --- a/projects/WeTek_Play/patches/kodi/0016-aml-Disable-deinterlacing-for-HD-content-while-video.patch +++ b/projects/WeTek_Play/patches/kodi/0006-aml-Disable-deinterlacing-for-HD-content-while-video.patch @@ -1,19 +1,19 @@ -From a2adae2d6a5036b2af02448e6803175a02f368d1 Mon Sep 17 00:00:00 2001 +From 50833b2af0c7c9aab3593ec8abf8e237851fff61 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Tue, 3 Feb 2015 17:58:19 +0100 -Subject: [PATCH] [aml] Disable deinterlacing for HD content while video is - being played in a window +Subject: [PATCH 06/10] [aml] Disable deinterlacing for HD content while video + is being played in a window ... to prevent screen blinking in 1080p50/60hz display modes --- - xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 5 +++++ + xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp -index 5dc6592..2103042 100644 +index aa30474..1fb5e3e 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp -@@ -2259,6 +2259,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect) +@@ -2289,6 +2289,11 @@ void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect) CLog::Log(LOGDEBUG, "CAMLCodec::SetVideoRect:m_stereo_view(%d)", m_stereo_view); #endif @@ -25,3 +25,6 @@ index 5dc6592..2103042 100644 // goofy 0/1 based difference in aml axis coordinates. // fix them. dst_rect.x2--; +-- +1.7.10.4 + diff --git a/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps-but-don-t-r.patch b/projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch similarity index 73% rename from projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps-but-don-t-r.patch rename to projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch index 4102bbdb14..590ac2144e 100644 --- a/projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps-but-don-t-r.patch +++ b/projects/WeTek_Play/patches/kodi/0007-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch @@ -1,19 +1,18 @@ -From 5ccfb2e9498a30641104ff3c2c393e62a173017c Mon Sep 17 00:00:00 2001 +From bd6b4809c2fac4ef7393e96c3c8b72a7faea2f85 Mon Sep 17 00:00:00 2001 From: Alex Deryskyba Date: Tue, 30 Jun 2015 11:19:57 +0200 -Subject: [PATCH 2/6] [aml] Ugly workaround to show DTS/AC3 caps but don't run - into multi channel issues as we can only open 2 pcm - channels +Subject: [PATCH 07/10] [aml] Ugly workaround to show DTS/AC3 caps +... but don't run into multi channel issues as we can only open 2 pcm channels --- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index e22db7a..dcdaf2e 100644 +index 08777aa..c3f5fce 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1291,6 +1291,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) +@@ -1340,6 +1340,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name) { diff --git a/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch b/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch new file mode 100644 index 0000000000..b36cf9246a --- /dev/null +++ b/projects/WeTek_Play/patches/kodi/0008-Add-mapping-for-Browser-Home-key-on-Linux.patch @@ -0,0 +1,24 @@ +From 56dac3c356e8419205eae251e76982be9a0da688 Mon Sep 17 00:00:00 2001 +From: Alex Deryskyba +Date: Tue, 14 Jul 2015 15:55:20 +0300 +Subject: [PATCH 08/10] Add mapping for Browser Home key on Linux + +--- + xbmc/input/linux/LinuxInputDevices.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp +index 3875138..3643a96 100644 +--- a/xbmc/input/linux/LinuxInputDevices.cpp ++++ b/xbmc/input/linux/LinuxInputDevices.cpp +@@ -247,6 +247,7 @@ KeyMap keyMap[] = { + { KEY_RECORD , XBMCK_RECORD }, + { KEY_REWIND , XBMCK_REWIND }, + { KEY_PHONE , XBMCK_PHONE }, ++ { KEY_HOMEPAGE , XBMCK_BROWSER_HOME}, + { KEY_REFRESH , XBMCK_SHUFFLE }, + { KEY_SCROLLUP , XBMCK_PAGEUP }, + { KEY_SCROLLDOWN , XBMCK_PAGEDOWN }, +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0105-perform_suspend_instead_of_powerdown.patch b/projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch similarity index 77% rename from projects/WeTek_Play/patches/kodi/0105-perform_suspend_instead_of_powerdown.patch rename to projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch index d66d9f07a0..6a1f57fe10 100644 --- a/projects/WeTek_Play/patches/kodi/0105-perform_suspend_instead_of_powerdown.patch +++ b/projects/WeTek_Play/patches/kodi/0009-powermanagement-Perform-suspend-instead-of-powerdown.patch @@ -1,15 +1,15 @@ -From 55b3da7e97f6dc1e99724782253c35fe4c8b7c5a Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 7 Nov 2015 16:25:44 +0200 -Subject: [PATCH] [wetek] perform suspend instead of powerdown +From 72497ca4d29af8ac224b826a3993bfdb76a7f9f6 Mon Sep 17 00:00:00 2001 +From: Alex Deryskyba +Date: Tue, 14 Jul 2015 16:02:35 +0300 +Subject: [PATCH 09/10] [powermanagement] Perform suspend instead of powerdown --- - system/keymaps/keyboard.xml | 2 +- - xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- + system/keymaps/keyboard.xml | 2 +- + xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml -index 9833cff..0ce105e 100644 +index 90517af..62cc847 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -91,7 +91,7 @@ @@ -43,3 +43,6 @@ index 4e5bcc6..ad5847d 100644 } bool CLogindUPowerSyscall::Reboot() +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0010-aml-FIX-renderer-hide-meaningless-skips-from-users.patch b/projects/WeTek_Play/patches/kodi/0010-aml-FIX-renderer-hide-meaningless-skips-from-users.patch new file mode 100644 index 0000000000..54ff24a2bd --- /dev/null +++ b/projects/WeTek_Play/patches/kodi/0010-aml-FIX-renderer-hide-meaningless-skips-from-users.patch @@ -0,0 +1,27 @@ +From 138e586520c2085e0b0989041a6d75af2692bd93 Mon Sep 17 00:00:00 2001 +From: "Chris \\\\\\\"Koying\\\\\\\" Browet" +Date: Fri, 19 Dec 2014 12:30:04 +0100 +Subject: [PATCH 10/10] [aml] FIX: [renderer] hide meaningless skips from + users + +--- + xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +index 558a1f3..7e25e16 100644 +--- a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp ++++ b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp +@@ -1351,7 +1351,8 @@ void CRenderManager::PrepareNextRender() + while (m_queued.front() != idx) + { + requeue(m_discard, m_queued); +- m_QueueSkip++; ++ if (m_format != RENDER_FMT_AML) // skips scares users ;) ++ m_QueueSkip++; + } + + int lateframes = (renderPts - m_Queue[idx].pts) / frametime; +-- +1.7.10.4 + diff --git a/projects/WeTek_Play/patches/kodi/0017-enable-IEC958.patch b/projects/WeTek_Play/patches/kodi/0017-enable-IEC958.patch deleted file mode 100644 index 0d259f4756..0000000000 --- a/projects/WeTek_Play/patches/kodi/0017-enable-IEC958.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index e22db7a..dcdaf2e 100644 ---- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1342,6 +1342,12 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev - if (snd_card_get_name(cardNr, &cardName) == 0) - info.m_displayName = cardName; - -+ // ugly workaround to show DTS / AC3 caps -+ // but don't run into multi channel issues -+ // as we can only open 2 pcm channels -+ if (info.m_displayName == "AML-DUMMY-CODEC") -+ info.m_deviceType = AE_DEVTYPE_IEC958; -+ - if (info.m_deviceType == AE_DEVTYPE_HDMI && info.m_displayName.size() > 5 && - info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") - { diff --git a/projects/WeTek_Play/patches/kodi/0101-add_mapping_for_browser_home_key_on_linux.patch b/projects/WeTek_Play/patches/kodi/0101-add_mapping_for_browser_home_key_on_linux.patch deleted file mode 100644 index 720604245d..0000000000 --- a/projects/WeTek_Play/patches/kodi/0101-add_mapping_for_browser_home_key_on_linux.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur kodi-14-4606179/xbmc/input/linux/LinuxInputDevices.cpp kodi-14-4606179.patch/xbmc/input/linux/LinuxInputDevices.cpp ---- kodi-14-4606179/xbmc/input/linux/LinuxInputDevices.cpp 2015-03-06 19:47:27.000000000 +0100 -+++ kodi-14-4606179.patch/xbmc/input/linux/LinuxInputDevices.cpp 2015-03-07 14:42:33.260971676 +0100 -@@ -225,6 +225,7 @@ - { KEY_VOLUMEDOWN , XBMCK_VOLUME_DOWN }, - { KEY_VOLUMEUP , XBMCK_VOLUME_UP }, - { KEY_POWER , XBMCK_POWER }, -+ { KEY_COFFEE , XBMCK_VOLUME_MUTE }, - { KEY_KPEQUAL , XBMCK_KP_EQUALS }, - { KEY_PAUSE , XBMCK_PAUSE }, - { KEY_LEFTMETA , XBMCK_LMETA }, -@@ -242,6 +243,7 @@ - { KEY_RECORD , XBMCK_RECORD }, - { KEY_REWIND , XBMCK_REWIND }, - { KEY_PHONE , XBMCK_PHONE }, -+ { KEY_HOMEPAGE , XBMCK_BROWSER_HOME}, - { KEY_REFRESH , XBMCK_SHUFFLE }, - { KEY_SCROLLUP , XBMCK_PAGEUP }, - { KEY_SCROLLDOWN , XBMCK_PAGEDOWN }, diff --git a/projects/WeTek_Play/patches/kodi/0104-make_esc_key_execute_back_action.patch b/projects/WeTek_Play/patches/kodi/0104-make_esc_key_execute_back_action.patch deleted file mode 100644 index 7d1b008432..0000000000 --- a/projects/WeTek_Play/patches/kodi/0104-make_esc_key_execute_back_action.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml -index 89254b8..2eefa75 100644 ---- a/system/keymaps/keyboard.xml -+++ b/system/keymaps/keyboard.xml -@@ -67,7 +67,7 @@ - Menu - ActivateWindow(PlayerControls) - ActivateWindow(shutdownmenu) -- PreviousMenu -+ Back - Info - ContextMenu - Menu -@@ -201,6 +201,7 @@ - Backspace - PreviousMenu - PreviousMenu -+ PreviousMenu - - -