From e700732e373808a6b425694e9e0e4bd2641cf77b Mon Sep 17 00:00:00 2001
From: kszaq <kszaquitto@gmail.com>
Date: Thu, 28 Apr 2016 06:30:42 +0200
Subject: [PATCH] projects/WeTek_Core: Fix build with Kodi 17

1. dvdplayer changed to VideoPlayer, fix path in "Fix compiler badness" patch.
2. After https://github.com/xbmc/xbmc/pull/9050 it is not needed to modify SetNativeResolution to get 4k.
---
 ...3-aml-Add-support-for-4k-resolutions.patch | 93 -------------------
 ...-badness-when-compiling-with-amcodec.patch |  8 +-
 2 files changed, 4 insertions(+), 97 deletions(-)

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 f662832e77..e0782c17d1 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
@@ -97,99 +97,6 @@ index 21256ef..2103f0b 100644
    m_nativeWindow = nativeWindow;
  
    SetFramebufferResolution(nativeWindow->width, nativeWindow->height);
-@@ -142,48 +157,78 @@ bool CEGLNativeTypeAmlogic::SetNativeResolution(const RESOLUTION_INFO &res)
-   }
- #endif
- 
--  switch((int)(0.5 + res.fRefreshRate))
-+  switch((int)(res.fRefreshRate*10))
-   {
-     default:
--    case 60:
-+    case 600:
-       switch(res.iScreenWidth)
-       {
-         default:
-         case 1280:
--          SetDisplayResolution("720p");
-+          return SetDisplayResolution("720p");
-           break;
-         case 1920:
-           if (res.dwFlags & D3DPRESENTFLAG_INTERLACED)
--            SetDisplayResolution("1080i");
-+            return SetDisplayResolution("1080i");
-           else
--            SetDisplayResolution("1080p");
-+            return SetDisplayResolution("1080p");
-           break;
-       }
-       break;
--    case 50:
-+    case 500:
-       switch(res.iScreenWidth)
-       {
-         default:
-         case 1280:
--          SetDisplayResolution("720p50hz");
-+          return SetDisplayResolution("720p50hz");
-           break;
-         case 1920:
-           if (res.dwFlags & D3DPRESENTFLAG_INTERLACED)
--            SetDisplayResolution("1080i50hz");
-+            return SetDisplayResolution("1080i50hz");
-           else
--            SetDisplayResolution("1080p50hz");
-+            return SetDisplayResolution("1080p50hz");
-           break;
-       }
-       break;
--    case 30:
--      SetDisplayResolution("1080p30hz");
-+    case 300:
-+      switch(res.iScreenWidth)
-+      {
-+        case 3840:
-+          return SetDisplayResolution("4k2k30hz");
-+          break;
-+        default:
-+          return SetDisplayResolution("1080p30hz");
-+          break;
-+      }
-       break;
--    case 24:
--      SetDisplayResolution("1080p24hz");
-+    case 250:
-+      switch(res.iScreenWidth)
-+      {
-+        case 3840:
-+          return SetDisplayResolution("4k2k25hz");
-+          break;
-+        default:
-+          return SetDisplayResolution("1080p25hz");
-+          break;
-+      }
-+      break;
-+    case 240:
-+      switch(res.iScreenWidth)
-+      {
-+        case 3840:
-+          return SetDisplayResolution("4k2k24hz");
-+          break;
-+        case 4096:
-+          return SetDisplayResolution("4k2ksmpte");
-+          break;
-+        default:
-+          return SetDisplayResolution("1080p24hz");
-+          break;
-+      }
-       break;
-   }
- 
--  return true;
-+  return false;
- }
- 
- bool CEGLNativeTypeAmlogic::ProbeResolutions(std::vector<RESOLUTION_INFO> &resolutions)
 @@ -280,8 +325,8 @@ void CEGLNativeTypeAmlogic::SetFramebufferResolution(int width, int height) cons
      {
        vinfo.xres = width;
diff --git a/projects/WeTek_Core/patches/kodi/0005-aml-Fix-compiler-badness-when-compiling-with-amcodec.patch b/projects/WeTek_Core/patches/kodi/0005-aml-Fix-compiler-badness-when-compiling-with-amcodec.patch
index c91e070598..8b0d09c477 100644
--- a/projects/WeTek_Core/patches/kodi/0005-aml-Fix-compiler-badness-when-compiling-with-amcodec.patch
+++ b/projects/WeTek_Core/patches/kodi/0005-aml-Fix-compiler-badness-when-compiling-with-amcodec.patch
@@ -4,13 +4,13 @@ Date: Sat, 12 Dec 2015 02:15:15 +0100
 Subject: [PATCH 5/6] [aml] Fix compiler badness when compiling with amcodec
 
 ---
- xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in |    2 --
+ xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in |    2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in
 index 56ec6a3..52fa07e 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
+--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in
++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in
 @@ -26,8 +26,6 @@ endif
  ifeq (@USE_LIBAMCODEC@,1)
  SRCS += AMLCodec.cpp