From 5e8489a74c9b935940aa13e549147d545e24ebc5 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 3 Oct 2020 18:36:48 +0200
Subject: [PATCH] bundles/kodi: add missing dependencies

---
 bundles/kodi/files/kodi.service | 2 +-
 bundles/kodi/items.py           | 7 ++++++-
 bundles/kodi/metadata.py        | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bundles/kodi/files/kodi.service b/bundles/kodi/files/kodi.service
index bf6f37f..8ecdd59 100644
--- a/bundles/kodi/files/kodi.service
+++ b/bundles/kodi/files/kodi.service
@@ -2,7 +2,6 @@
 Description=Kodi
 Conflicts=getty@tty7.service
 After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
-StartLimitIntervalSec=2
 
 [Service]
 User=kodi
@@ -13,6 +12,7 @@ WorkingDirectory=/home/kodi
 StandardOutput=journal
 Restart=always
 RestartSec=2
+StartLimitInterval=0
 
 [Install]
 WantedBy=graphical.target
diff --git a/bundles/kodi/items.py b/bundles/kodi/items.py
index 52e0751..6dacede 100644
--- a/bundles/kodi/items.py
+++ b/bundles/kodi/items.py
@@ -5,7 +5,11 @@ files = {
             'svc_systemd:kodi:restart',
         },
     },
-    '/etc/X11/Xwrapper.config': {},
+    '/etc/X11/Xwrapper.config': {
+        'needs': {
+            'pkg_apt:xserver-xorg-legacy',
+        },
+    },
 }
 
 svc_systemd = {
@@ -14,6 +18,7 @@ svc_systemd = {
             'file:/etc/systemd/system/kodi.service',
             'file:/etc/X11/Xwrapper.config',
             'pkg_apt:kodi',
+            'pkg_apt:xinit',
             'user:kodi',
         },
     },
diff --git a/bundles/kodi/metadata.py b/bundles/kodi/metadata.py
index dffa020..7ab3996 100644
--- a/bundles/kodi/metadata.py
+++ b/bundles/kodi/metadata.py
@@ -10,6 +10,8 @@ defaults = {
             'ttf-mscorefonts-installer': {},
             'tv-fonts': {},
             'xfonts-base': {},
+            'xinit': {},
+            'xserver-xorg': {},
             'xserver-xorg-legacy': {},
         },
     },