From 6dc9da07f77855cbb52bb2285fb2b47389fea0f4 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Mon, 19 Oct 2020 10:05:51 -0400
Subject: [PATCH] alarm/kodi-rbp4 to 18.8-2

Direct call to kodi-gbm allows systemd to correctly assign the MAINPID to that
rather than to kodi-standalone wrapper.  This change allows the kill signal to hit
the intended executable to enable a clean exit and internal updates to files on
exit such as ~/.kodi/userdata/settings.xml

Change can be propagated to other kodi packages after more extensive testing
---
 alarm/kodi-rbp4/PKGBUILD     | 4 ++--
 alarm/kodi-rbp4/kodi.service | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/alarm/kodi-rbp4/PKGBUILD b/alarm/kodi-rbp4/PKGBUILD
index 4f68ef746..71c85896c 100644
--- a/alarm/kodi-rbp4/PKGBUILD
+++ b/alarm/kodi-rbp4/PKGBUILD
@@ -26,7 +26,7 @@ _prefix=/usr
 pkgbase=kodi-rbp4
 pkgname=('kodi-rbp4' 'kodi-rbp4-eventclients' 'kodi-rbp4-tools-texturepacker' 'kodi-rbp4-dev')
 pkgver=18.8
-pkgrel=1
+pkgrel=2
 _codename=Leia
 _ffmpeg_version="4.2.2-Matrix-Alpha1"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
@@ -85,7 +85,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
 sha256sums=('135d1f47223d404095b88494da091cb2588c36a5ff3f337bd083a9017fbe1c71'
-            'd5384a1450d1ba16f7f2b2db1b858ad442b7398787e046623b16547c72a94b8e'
+            '2195262629b156fdc0d4cae79acbc77438897b2a764017b7553193effc43cf3b'
             '8e14cf455898246d11edd4ff7f4ed11a44c729fb40c34455a5b336a90ccc1f7b'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
             '0dba571f9809588cfbdc29d6a551dab4cd5736701653d9263847c9ac67bcde86'
diff --git a/alarm/kodi-rbp4/kodi.service b/alarm/kodi-rbp4/kodi.service
index c034b6bb8..b8e2b7fa3 100644
--- a/alarm/kodi-rbp4/kodi.service
+++ b/alarm/kodi-rbp4/kodi.service
@@ -10,7 +10,7 @@ Group=kodi
 PAMName=login
 TTYPath=/dev/tty1
 Environment=WINDOWING=gbm
-ExecStart=/usr/bin/kodi-standalone
+ExecStart=/usr/lib/kodi/kodi-gbm --standalone
 Restart=on-abort
 StandardInput=tty
 StandardOutput=journal