From dfb2ab2e88f52da04f0daa0a8e3c84f2ade94fe6 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Mon, 28 Sep 2009 14:36:04 +0200
Subject: [PATCH] xinit: - replace xinit app to an script that start Xorg
 faster

---
 packages/x11/app/xinit/build                  | 17 -----------
 packages/x11/app/xinit/install                |  6 +---
 packages/x11/app/xinit/scripts/xinit          | 28 +++++++++++++++++++
 packages/x11/app/xinit/url                    |  1 -
 .../other/openbox/xinitrc.d/20_windowmanager  |  1 +
 5 files changed, 30 insertions(+), 23 deletions(-)
 delete mode 100755 packages/x11/app/xinit/build
 create mode 100644 packages/x11/app/xinit/scripts/xinit
 delete mode 100644 packages/x11/app/xinit/url

diff --git a/packages/x11/app/xinit/build b/packages/x11/app/xinit/build
deleted file mode 100755
index 1cf2c88259..0000000000
--- a/packages/x11/app/xinit/build
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-
-make
-
-$STRIP $1
diff --git a/packages/x11/app/xinit/install b/packages/x11/app/xinit/install
index 744b44cc8f..72532d6ac0 100755
--- a/packages/x11/app/xinit/install
+++ b/packages/x11/app/xinit/install
@@ -5,8 +5,4 @@
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/usr/bin
-cp -PR $PKG_BUILD/$1 $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/lib/X11/xinit/
-cp -PR $PKG_DIR/scripts/xinitrc $INSTALL/usr/lib/X11/xinit/
-cp -PR $PKG_DIR/scripts/xserverrc $INSTALL/usr/lib/X11/xinit/
+cp -PR $PKG_DIR/scripts/$1 $INSTALL/usr/bin
diff --git a/packages/x11/app/xinit/scripts/xinit b/packages/x11/app/xinit/scripts/xinit
new file mode 100644
index 0000000000..b50d4e6056
--- /dev/null
+++ b/packages/x11/app/xinit/scripts/xinit
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /etc/sysconfig
+
+# 'vt02' starts X on virtual terminal 2.
+# '-logverbose 6' enables useful troubleshooting output in /var/log/Xorg.0.0.log.
+
+args="-s 0 -br -allowMouseOpenFail "
+
+if /usr/bin/test "${MOOVIDA_DEBUG}" = "yes" ; then
+    args="${args} -logverbose 6 -verbose 0"
+fi
+
+mkdir -p /var/cache/xkb
+
+exec /usr/bin/X :0.0 vt$TTY ${args} > /dev/null 2>&1 &
+
+while true; do 
+  if [ -f /tmp/.X0-lock ]; then
+    for file in /usr/etc/xinitrc.d/* ; do
+      . ${file}
+    done
+    break
+  fi
+done 
+
+
+
diff --git a/packages/x11/app/xinit/url b/packages/x11/app/xinit/url
deleted file mode 100644
index d6bdf37964..0000000000
--- a/packages/x11/app/xinit/url
+++ /dev/null
@@ -1 +0,0 @@
-http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.1.tar.bz2
diff --git a/packages/x11/other/openbox/xinitrc.d/20_windowmanager b/packages/x11/other/openbox/xinitrc.d/20_windowmanager
index 2f40fefbd0..01037e678e 100644
--- a/packages/x11/other/openbox/xinitrc.d/20_windowmanager
+++ b/packages/x11/other/openbox/xinitrc.d/20_windowmanager
@@ -1,3 +1,4 @@
+#!/bin/sh
 ################################################################################
 # windowmanager
 #