From e4760a881c640cbcf78c26af681c51d8811e015d Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 1 Nov 2020 07:41:33 +0100
Subject: [PATCH] kodi: add appliance.xml for gbm windowing

default to settings from old gbm.xml: enable drmprime decoding
with default direct-to-plane rendering and show drmprime and
keyboard settings.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 .../mediacenter/kodi/config/appliance-gbm.xml | 25 +++++++++++++++++++
 packages/mediacenter/kodi/package.mk          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 packages/mediacenter/kodi/config/appliance-gbm.xml

diff --git a/packages/mediacenter/kodi/config/appliance-gbm.xml b/packages/mediacenter/kodi/config/appliance-gbm.xml
new file mode 100644
index 0000000000..82b8ba64ae
--- /dev/null
+++ b/packages/mediacenter/kodi/config/appliance-gbm.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings version="1">
+  <section id="player">
+    <category id="videoplayer">
+      <group id="3">
+        <setting id="videoplayer.useprimedecoder">
+          <default>true</default>
+        </setting>
+        <setting id="videoplayer.useprimedecoderforhw">
+          <visible>true</visible>
+        </setting>
+        <setting id="videoplayer.useprimerenderer">
+          <default>0</default>
+        </setting>
+      </group>
+    </category>
+    <category id="input">
+      <group id="4">
+        <setting id="input.libinputkeyboardlayout">
+          <visible>true</visible>
+        </setting>
+      </group>
+    </category>
+  </section>
+</settings>
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 46ce96995c..1ac76507af 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -175,6 +175,7 @@ configure_package() {
       KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm -DGBM_RENDER_SYSTEM=gles"
       CFLAGS="$CFLAGS -DEGL_NO_X11"
       CXXFLAGS="$CXXFLAGS -DEGL_NO_X11"
+      PKG_APPLIANCE_XML="$PKG_DIR/config/appliance-gbm.xml"
     fi
   fi
 
@@ -309,6 +310,7 @@ post_makeinstall_target() {
                                 > $INSTALL/usr/share/kodi/system/advancedsettings.xml
 
   $PKG_DIR/scripts/xml_merge.py $PKG_DIR/config/appliance.xml \
+                                $PKG_APPLIANCE_XML \
                                 $PROJECT_DIR/$PROJECT/kodi/appliance.xml \
                                 $PROJECT_DIR/$PROJECT/devices/$DEVICE/kodi/appliance.xml \
                                 > $INSTALL/usr/share/kodi/system/settings/appliance.xml