Move again away from X.Org

This time, for good

4 files changed, 6 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 902aa1a84b89..7ef2b20c7bde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,17 +12,12 @@ pkgbase = retroarch-standalone-service
 	depends = retroarch
 	depends = retroarch-assets-xmb
 	depends = retroarch-autoconfig-udev
-	depends = xorg-server
-	depends = xorg-xinit
-	depends = unclutter
 	source = retroarch-standalone.service
 	source = retroarch-standalone.sysuser
 	source = retroarch-standalone.cfg
-	source = retroarch-standalone.xinitrc
 	md5sums = 8dd1a467e961630eff4f1d532fe7763a
 	md5sums = dff58d483453816a80dcdbc8d272e8b8
 	md5sums = ac40311816ee094e98f957db77cea241
-	md5sums = 3999db10036381e2cba57c21a62186c8
 
 pkgname = retroarch-standalone-service
 
diff --git a/PKGBUILD b/PKGBUILD
index 952790f22e53..c67979e07085 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,16 @@ pkgdesc="Systemd service and user to run Retroarch in stand-alone mode"
 url=""
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('MIT')
-depends=('retroarch' 'retroarch-assets-xmb' 'retroarch-autoconfig-udev' 'xorg-server' 'xorg-xinit' 'unclutter')
+depends=('retroarch' 'retroarch-assets-xmb' 'retroarch-autoconfig-udev')
 install='retroarch-standalone.install'
 source=('retroarch-standalone.service'
         'retroarch-standalone.sysuser'
-        'retroarch-standalone.cfg'
-        'retroarch-standalone.xinitrc')
+        'retroarch-standalone.cfg')
 md5sums=('8dd1a467e961630eff4f1d532fe7763a'
          'dff58d483453816a80dcdbc8d272e8b8'
-         'ac40311816ee094e98f957db77cea241'
-         '3999db10036381e2cba57c21a62186c8')
+         'ac40311816ee094e98f957db77cea241')
 
 package() {
-  # Copy autorun script
-  install -Dm644 ${srcdir}/retroarch-standalone.xinitrc "$pkgdir/home/retroarch/.xinitrc"
-
   # Copy additional configuration file to /etc
   install -Dm644 ${srcdir}/retroarch-standalone.cfg "$pkgdir/etc/retroarch-standalone.cfg"
 
diff --git a/retroarch-standalone.service b/retroarch-standalone.service
index 8adfc4f980e3..f3d700290dae 100644
--- a/retroarch-standalone.service
+++ b/retroarch-standalone.service
@@ -1,17 +1,14 @@
 [Unit]
 Description=Systemd service and user to run Retroarch in stand-alone mode
-After=systemd-user-sessions.service network.target sound.target
-Conflicts=getty@tty1.service
 
 [Service]
 User=retroarch
 Group=retroarch
 PAMName=login
-TTYPath=/dev/tty1
-ExecStartPre=/usr/bin/sleep 2s
-ExecStart=/usr/bin/xinit -- :0 -nolisten tcp vt1
+Type=simple
+ExecStart=/usr/bin/retroarch --appendconfig=/etc/retroarch-standalone.cfg
+TimeoutStopSec=30
 Restart=always
-StandardInput=tty
 
 [Install]
 WantedBy=multi-user.target
diff --git a/retroarch-standalone.xinitrc b/retroarch-standalone.xinitrc
deleted file mode 100644
index 28b84f78bd88..000000000000
--- a/retroarch-standalone.xinitrc
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Disable all energy save features, and leave the monitor always on
-xset s off         # don't activate screensaver
-xset -dpms         # disable DPMS (Energy Star) features.
-xset s noblank     # don't blank the video device
-
-# Hide mouse cursor
-unclutter -display :0.0 -noevents -grab -root -reset &
-
-# Autostart Retroarch
-exec /usr/bin/retroarch --appendconfig=/etc/retroarch-standalone.cfg