Fix-up services and Readme

* remove depracated WINDOWING= from all services
* fix kodi-gbm.service
* call out wayland dependency

README.md

@@ -19,6 +19,14 @@ Users of other distros can just run `make install` as the root user.  Then, as t
 
 Note that the kodi user's home directory is `/var/lib/kodi/` in this example, NOT `/home/kodi/` like a regular user.
 
+### Dependencies
+Note that I list some dependencies below that the Arch package already has listed as dependencies.  This is to help users of other distros whose kodi packages may not have these listed.  If you're installing this from the AUR package listed above, just pay attention to pacman's post-install message which calls out the Arch-specific `optdepends` needed for the various service files to work.
+
+* kodi (>=19.1 on Arch Linux, lower versions may work with other distros)
+* cage, libinput, and xorg-xwayland (for running wayland)
+* libinput (for running gbm)
+* xorg-server and xorg-xinit (for running x11)
+
 #### Notes for users of non-Arch Linux distros
 1. Users of Ubuntu ≥20.0 will need to copy the contents of [sysusers.conf](https://github.com/graysky2/kodi-standalone-service/blob/master/x86/init/sysusers.conf) to `/etc/sysusers.d/kodi.conf` and uncomment the line adding kodi user to the `render` group.
 
@@ -27,12 +35,6 @@ Note that the kodi user's home directory is `/var/lib/kodi/` in this example, NO
 ## Usage
 Simply [start/enable](https://wiki.archlinux.org/index.php/Systemd#Using_units) the requisite service.
 
-## Dependencies
-* kodi (x11 or wayland or gbm)
-* libinput and cage (for running wayland)
-* libinput (for running gbm)
-* xorg-server and xorg-xinit (for running x11)
-
 ## Passing environment variables to the service
 Certain use cases require environment variables to be passed to the service. Define these variables in `/etc/conf.d/kodi-standalone` and they will be passed along to the service.
 

arm/init/kodi.service

@@ -10,7 +10,6 @@ Group=kodi
 EnvironmentFile=-/etc/conf.d/kodi-standalone
 PAMName=login
 TTYPath=/dev/tty1
-Environment=WINDOWING=gbm
 ExecStart=/usr/bin/kodi-standalone
 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin
 Restart=on-abort

x86/init/kodi-gbm.service

@@ -11,8 +11,7 @@ EnvironmentFile=-/etc/conf.d/kodi-standalone
 SupplementaryGroups=input
 PAMName=login
 TTYPath=/dev/tty1
-Environment=WINDOWING=gbm
+ExecStart=/usr/bin/kodi-standalone
-ExecStart=/usr/lib/kodi/kodi-gbm
 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin
 Restart=on-abort
 StandardInput=tty

x86/init/kodi-wayland.service

@@ -12,7 +12,6 @@ Environment="XDG_RUNTIME_DIR=%t/kodi"
 EnvironmentFile=-/etc/conf.d/kodi-standalone
 PAMName=login
 TTYPath=/dev/tty1
-Environment=WINDOWING=wayland
 ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone
 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin
 Restart=on-abort

x86/init/kodi-x11.service

@@ -10,7 +10,6 @@ Group=kodi
 EnvironmentFile=-/etc/conf.d/kodi-standalone
 PAMName=login
 TTYPath=/dev/tty1
-Environment=WINDOWING=x11
 ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- :0 -quiet -nolisten tcp vt1
 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi.bin
 Restart=on-abort