From 511b1d2b2796e0b18bca445a639c6422a37f3dbf Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 14 Oct 2017 22:46:20 +0200
Subject: [PATCH 1/3] kodi: fix appliance.xml merge

Only combine elements with matching attributes,
fixes merge of appliance.xml
---
 packages/mediacenter/kodi/scripts/xml_merge.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/mediacenter/kodi/scripts/xml_merge.py b/packages/mediacenter/kodi/scripts/xml_merge.py
index a64c35c5a8..f7fd547f36 100755
--- a/packages/mediacenter/kodi/scripts/xml_merge.py
+++ b/packages/mediacenter/kodi/scripts/xml_merge.py
@@ -11,6 +11,10 @@ from xml.etree import ElementTree as et
 def printerr(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
+class hashabledict(dict):
+    def __hash__(self):
+        return hash(tuple(sorted(self.items())))
+
 class XMLCombiner(object):
     def __init__(self, filenames):
         if len(filenames) == 0:
@@ -32,19 +36,19 @@ class XMLCombiner(object):
         return self.prettyPrint(self.roots[0])
 
     def combine_element(self, one, other):
-        mapping = {el.tag: el for el in one}
+        mapping = {(el.tag, hashabledict(el.attrib)): el for el in one}
         for el in other:
             if len(el) == 0:
                 try:
-                    mapping[el.tag].text = el.text
+                    mapping[(el.tag, hashabledict(el.attrib))].text = el.text
                 except KeyError:
-                    mapping[el.tag] = el
+                    mapping[(el.tag, hashabledict(el.attrib))] = el
                     one.append(el)
             else:
                 try:
-                    self.combine_element(mapping[el.tag], el)
+                    self.combine_element(mapping[(el.tag, hashabledict(el.attrib))], el)
                 except KeyError:
-                    mapping[el.tag] = el
+                    mapping[(el.tag, hashabledict(el.attrib))] = el
                     one.append(el)
 
 if __name__ == '__main__':

From 1a2cc860bbd67fe00332a53fb460a35d588233f2 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 14 Oct 2017 22:46:20 +0200
Subject: [PATCH 2/3] kodi: set default screenshotpath using appliance.xml

---
 packages/mediacenter/kodi/config/appliance.xml   | 7 +++++++
 packages/mediacenter/kodi/config/guisettings.xml | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
index 6459825bb1..830fab65f2 100644
--- a/packages/mediacenter/kodi/config/appliance.xml
+++ b/packages/mediacenter/kodi/config/appliance.xml
@@ -24,6 +24,13 @@
         </setting>
       </group>
     </category>
+    <category id="logging">
+      <group id="1">
+        <setting id="debug.screenshotpath">
+          <default>/storage/screenshots/</default>
+        </setting>
+      </group>
+    </category>
   </section>
 
   <section id="services">
diff --git a/packages/mediacenter/kodi/config/guisettings.xml b/packages/mediacenter/kodi/config/guisettings.xml
index 8599258e30..39d322489e 100755
--- a/packages/mediacenter/kodi/config/guisettings.xml
+++ b/packages/mediacenter/kodi/config/guisettings.xml
@@ -1,7 +1,4 @@
 <settings>
-  <debug>
-    <screenshotpath pathversion="1">/storage/screenshots/</screenshotpath>
-  </debug>
   <general>
     <settinglevel>2</settinglevel>
   </general>

From 5703376d3c008be0bd70a33b84510187dd718f31 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 14 Oct 2017 22:46:20 +0200
Subject: [PATCH 3/3] projects/imx6: remove guisettings merged from kodi
 package

---
 projects/imx6/kodi/guisettings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/projects/imx6/kodi/guisettings.xml b/projects/imx6/kodi/guisettings.xml
index 7a123f8f11..68634f252d 100644
--- a/projects/imx6/kodi/guisettings.xml
+++ b/projects/imx6/kodi/guisettings.xml
@@ -1,10 +1,4 @@
 <settings>
-  <debug>
-    <screenshotpath pathversion="1">/storage/screenshots/</screenshotpath>
-  </debug>
-  <general>
-    <settinglevel>3</settinglevel>
-  </general>
   <audiooutput>
     <audiodevice>ALSA:hdmi:CARD=imxhdmisoc,DEV=0</audiodevice>
   </audiooutput>