From fc01075457da5fc7a00f70af93b4abccdd10a818 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Fri, 7 May 2010 21:30:34 +0200
Subject: [PATCH] xorg-server: - add profile configfile for setting $DISPLAY -
 add init script to start xorg

---
 .../x11/xserver/xorg-server/init.d/15_xorg    | 43 +++++++++++++++++++
 .../xorg-server/profile.d/display.conf        | 10 +++++
 2 files changed, 53 insertions(+)
 create mode 100644 packages/x11/xserver/xorg-server/init.d/15_xorg
 create mode 100644 packages/x11/xserver/xorg-server/profile.d/display.conf

diff --git a/packages/x11/xserver/xorg-server/init.d/15_xorg b/packages/x11/xserver/xorg-server/init.d/15_xorg
new file mode 100644
index 0000000000..512c5e1bf1
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/init.d/15_xorg
@@ -0,0 +1,43 @@
+# starting xorg
+#
+# runlevels: openelec
+
+. /etc/profile
+
+  XORG_DEFAULT_CONF="/etc/X11/xorg.conf"
+  XORG_NVIDIA_CONF="/etc/X11/xorg-nvidia.conf"
+  XORG_USER_CONF="/storage/.config/xorg.conf"
+  XORG_ARGS="-s 0 -nr -noreset -allowMouseOpenFail -nocursor -nolisten tcp"
+
+  [ "$DEBUG" = yes ] && XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
+
+(
+  progress "creating directories needed for Xorg"
+
+    mkdir -p /var/cache/xkb
+    mkdir -p /var/lib
+    mkdir -m 1777 -p /tmp/.ICE-unix
+    chown root:root /tmp/.ICE-unix
+
+    if lspci -n | grep 0300 | grep -q 10de; then
+
+      ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
+      ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
+      XORG_ARGS="$XORG_ARGS -ignoreABI"
+      XORG_CONF="$XORG_NVIDIA_CONF"
+
+    else
+
+      ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
+      ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
+      XORG_CONF="$XORG_DEFAULT_CONF"
+
+    fi
+
+    [ -f $XORG_USER_CONF ] && XORG_CONF="$XORG_USER_CONF"
+
+  progress "starting xorg"
+
+    XORG_ARGS="$XORG_ARGS -config $XORG_CONF"
+    Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1
+)&
\ No newline at end of file
diff --git a/packages/x11/xserver/xorg-server/profile.d/display.conf b/packages/x11/xserver/xorg-server/profile.d/display.conf
new file mode 100644
index 0000000000..447ecc7d02
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/profile.d/display.conf
@@ -0,0 +1,10 @@
+################################################################################
+# Xorg environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+DISPLAY=":0.0"
+
+export DISPLAY