diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 83ad1e6e6c..dad8ae8621 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd xorg-launch-helper" PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver" diff --git a/packages/x11/xserver/xorg-server/system.d/xorg.service b/packages/x11/xserver/xorg-server/system.d/xorg.service index bc1b45fe9b..faa5ca9b2a 100644 --- a/packages/x11/xserver/xorg-server/system.d/xorg.service +++ b/packages/x11/xserver/xorg-server/system.d/xorg.service @@ -6,9 +6,10 @@ After=multi-user.target ConditionPathExists=/run/openelec/xorg-settings.conf [Service] +Type=notify EnvironmentFile=/run/openelec/xorg-settings.conf EnvironmentFile=-/run/openelec/debug/xorg.conf -ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG +ExecStart=/usr/bin/xorg-launch-helper vt01 $XORG_ARGS $XORG_DEBUG Restart=always RestartSec=2 StartLimitInterval=0