From 5dd09ad04e654826c4c6cb65b38845dca0d5be19 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Sun, 16 Aug 2009 18:53:00 +0200
Subject: [PATCH] various fixes to xorg-server for building the new version,
 various cleanups

---
 packages/virtual/Xorg/install            | 35 +++++++-----------------
 packages/x11/xserver/xorg-server/build   |  2 +-
 packages/x11/xserver/xorg-server/install |  7 +----
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/packages/virtual/Xorg/install b/packages/virtual/Xorg/install
index 8b98978745..392e761280 100755
--- a/packages/virtual/Xorg/install
+++ b/packages/virtual/Xorg/install
@@ -25,31 +25,16 @@ for drv in $XORG_DRIVERS; do
   $SCRIPTS/install xf86-video-$drv
 done
 
-
-#$SCRIPTS/install xf86-video-openchrome
-#$SCRIPTS/install xf86-video-vesa
-#$SCRIPTS/install xf86-video-nv
-
-#+for drv in `ls $INSTALL/usr/lib/xorg/modules/drivers/*_drv.so`; do
-#+  echo "$drv"|sed -e 's,.*/,,;s,_drv.so,,' >> $INSTALL/etc/X11/drivers
-#+done
-
 #Tools
-#$SCRIPTS/install xrandr
-#$SCRIPTS/install xresprobe
-#$SCRIPTS/install read-edid
-$SCRIPTS/install xinit
-#+$SCRIPTS/install pciutils
-#$SCRIPTS/install evilwm-ewmh
-#$SCRIPTS/install ratpoison
-$SCRIPTS/install openbox
-
-mkdir -p $INSTALL/usr/bin
-#cp $PKG_DIR/scripts/oe_wrapper $INSTALL/usr/bin
-#cp $PKG_DIR/scripts/startx $INSTALL/usr/bin
-
-#+mkdir -p $INSTALL/etc/X11
-#+cp $PKG_DIR/config/X.cfg.sample $INSTALL/etc/X11
-#+cp $PKG_DIR/config/xorg.default $INSTALL/etc/X11
+   #$SCRIPTS/install xrandr
+   #$SCRIPTS/install xresprobe
+   #$SCRIPTS/install read-edid
+   $SCRIPTS/install xinit
+   #+$SCRIPTS/install pciutils
+   #$SCRIPTS/install evilwm-ewmh
+   #$SCRIPTS/install ratpoison
+   $SCRIPTS/install openbox
+   #[ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt
+   [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm
 
 exit 0
diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 68b5040f5a..de4afe9a13 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -107,7 +107,7 @@ cd $PKG_BUILD
 
 make
 
-$STRIP hw/xfree86/.libs/Xorg
+$STRIP hw/xfree86/Xorg
 $STRIP hw/xfree86/utils/gtf/gtf
 
 make DESTDIR=$SYSROOT_PREFIX install
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index e2914ab2bf..762f91daff 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -6,9 +6,7 @@ $SCRIPTS/install libpciaccess
 $SCRIPTS/install freetype
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
-#$SCRIPTS/install libXinerama
 $SCRIPTS/install libXv
-#$SCRIPTS/install libXvMC
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
@@ -19,16 +17,13 @@ XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 
 mkdir -p $INSTALL/usr/bin
-cp $XORG_SRC/.libs/Xorg $INSTALL/usr/bin
+cp $XORG_SRC/Xorg $INSTALL/usr/bin
 ln -sf /usr/bin/Xorg $INSTALL/usr/bin/X
 cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin
 
 #opt:
 cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin
 
-mkdir -p $INSTALL/usr/lib
-cp -PR $XORG_SRC/parser/.libs/libxf86config.so* $INSTALL/usr/lib
-
 mkdir -p $XORG_DST
 cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
 cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST