From 9161165338b0758f0559d623dbc77b76b4dd2944 Mon Sep 17 00:00:00 2001
From: viulian <viulian@hex.ro>
Date: Sun, 12 May 2019 19:35:32 +0200
Subject: [PATCH] tinkerboard: disable 5s polling for CEC adapters (solve
 kwiboo's reviews)

---
 packages/mediacenter/kodi/package.mk                |  4 ++++
 .../kodi-100.17-tinker-s-cec-disable-polling.patch  | 13 +++++++++++++
 .../kodi-100.17-tinker-s-cec-disable-polling.patch  | 13 -------------
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 packages/mediacenter/kodi/patches/cec-framework/kodi-100.17-tinker-s-cec-disable-polling.patch
 delete mode 100644 projects/Rockchip/devices/TinkerBoard/patches/kodi/kodi-100.17-tinker-s-cec-disable-polling.patch

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 4881ef017b3..c304825fe19 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -88,6 +88,10 @@ configure_package() {
     KODI_CEC="-DENABLE_CEC=OFF"
   fi
 
+  if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then
+    PKG_PATCH_DIRS+=" cec-framework"
+  fi
+
   if [ "$KODI_OPTICAL_SUPPORT" = yes ]; then
     KODI_OPTICAL="-DENABLE_OPTICAL=ON"
   else
diff --git a/packages/mediacenter/kodi/patches/cec-framework/kodi-100.17-tinker-s-cec-disable-polling.patch b/packages/mediacenter/kodi/patches/cec-framework/kodi-100.17-tinker-s-cec-disable-polling.patch
new file mode 100644
index 00000000000..3a9ba8adc90
--- /dev/null
+++ b/packages/mediacenter/kodi/patches/cec-framework/kodi-100.17-tinker-s-cec-disable-polling.patch
@@ -0,0 +1,13 @@
+--- kodi-rockchip_18.2rc1-Leia.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp	2019-05-12 07:24:23.921984777 +0200
++++ kodi-rockchip_18.2rc1-Leia/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp	2019-05-12 07:03:41.221761552 +0200
+@@ -50,6 +50,10 @@
+       /** the Pi's adapter cannot be removed, no need to rescan */
+       m_bNeedsPolling = false;
+       break;
++    case ADAPTERTYPE_LINUX:
++      /** the Linux adapter cannot be removed, no need to rescan */
++      m_bNeedsPolling = false;
++      break;
+     default:
+       break;
+     }
diff --git a/projects/Rockchip/devices/TinkerBoard/patches/kodi/kodi-100.17-tinker-s-cec-disable-polling.patch b/projects/Rockchip/devices/TinkerBoard/patches/kodi/kodi-100.17-tinker-s-cec-disable-polling.patch
deleted file mode 100644
index 7b3bf8f8fde..00000000000
--- a/projects/Rockchip/devices/TinkerBoard/patches/kodi/kodi-100.17-tinker-s-cec-disable-polling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kodi-rockchip_18.2rc1-Leia/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp        2019-04-15 22:19:08.000000000 +0200
-+++ kodi-rockchip_18.2rc1-Leia.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp   2019-05-08 22:10:51.803079157 +0200
-@@ -38,6 +38,10 @@
-     result.m_strLocation = deviceList[iDevicePtr].strComName;
-     result.m_type        = PERIPHERAL_CEC;
- 
-+    // can't use the switch below, as on Asus Tinker S both the adapterType as well as the vendorId seem to be 0 (UNKNOWN) according to libcec
-+    // for now, hard code it to false, as the adapter can't be removed, just as on PI's case.
-+    m_bNeedsPolling = false;
-+
-     // override the bus type, so users don't have to reconfigure their adapters
-     switch(deviceList[iDevicePtr].adapterType)
-     {