projects/WeTek_Core: Update Kodi patches

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 <alex@codesnake.com>
 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
+@@ -162,7 +162,11 @@ CActiveAEBufferPoolResample::CActiveAEBufferPoolResample(AEAudioFormat inputForm
-   if (AE_IS_RAW(m_inputFormat.m_dataFormat))
+     m_inputFormat.m_channelLayout += AE_CH_FC;
-     m_inputFormat.m_dataFormat = AE_FMT_S16NE;
+   }
    m_resampler = NULL;
 +#ifdef HAS_LIBAMCODEC
 +  m_fillPackets = true;

projects/WeTek_Core/patches/kodi/0002-aml-Ugly-workaround-to-show-DTS-AC3-caps.patch

@@ -1,19 +1,18 @@
-From 5ccfb2e9498a30641104ff3c2c393e62a173017c Mon Sep 17 00:00:00 2001
+From 4b3958857f85df99dece4faffd42b15a9445e5cb Mon Sep 17 00:00:00 2001
 From: Alex Deryskyba <alex@codesnake.com>
 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
+Subject: [PATCH 2/5] [aml] Ugly workaround to show DTS/AC3 caps
- into multi channel issues as we can only open 2 pcm
- channels
 
+... 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 6a9066b..7abf119 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)
+@@ -1301,6 +1301,12 @@ void CAESinkALSA::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
  
  AEDeviceType CAESinkALSA::AEDeviceTypeFromName(const std::string &name)
  {

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 <alex@codesnake.com>
 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/utils/AMLUtils.cpp                     |   16 ++++++++--------
- xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp |   81 +++++++++++++++++++++------
+ xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp |   23 +++++++++++++++++++----
- xbmc/windowing/egl/EGLNativeTypeAmlogic.h   |    2 +
+ xbmc/windowing/egl/EGLNativeTypeAmlogic.h   |    2 ++
- 3 files changed, 73 insertions(+), 26 deletions(-)
+ 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;

projects/WeTek_Core/patches/kodi/0004-keyboard-Make-Escape-key-execute-back-action.patch

@@ -1,33 +0,0 @@
-From 993592beebd6502a192eace6f52d0d45bfd10e6d Mon Sep 17 00:00:00 2001
-From: Alex Deryskyba <alex@codesnake.com>
-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 @@
-       <m>Menu</m>
-       <m mod="ctrl">ActivateWindow(PlayerControls)</m>
-       <s>ActivateWindow(shutdownmenu)</s>
--      <escape>PreviousMenu</escape>
-+      <escape>Back</escape>
-       <i>Info</i>
-       <menu>ContextMenu</menu>
-       <menu mod="longpress">Menu</menu>
-@@ -209,6 +209,7 @@
-       <backspace>Backspace</backspace>
-       <browser_back>Backspace</browser_back>
-       <browser_back mod="longpress">PreviousMenu</browser_back>
-+      <escape>PreviousMenu</escape>
-     </keyboard>
-   </VirtualKeyboard>
-   <MyTVChannels>
--- 
-1.7.10.4
-

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 <alex@codesnake.com>
 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 ++--

projects/WeTek_Core/patches/kodi/0005-aml-FIX-renderer-hide-meaningless-skips-from-users.patch

@@ -0,0 +1,26 @@
+From 90f9b85847f5e3d81ee6ddbbf303fec19a8e778a Mon Sep 17 00:00:00 2001
+From: "Chris \\\\\\\"Koying\\\\\\\" Browet" <cbro@semperpax.com>
+Date: Fri, 19 Dec 2014 12:30:04 +0100
+Subject: [PATCH 5/5] [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
+