[oe-commits] Thomas Zimmermann : xserver-kdrive-common: Fix parameters for Xorg

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: d8d39af6463d571191a138d02f63e5c0a99ab3b8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d8d39af6463d571191a138d02f63e5c0a99ab3b8

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Sun Sep 20 06:59:49 2009 +0000

xserver-kdrive-common: Fix parameters for Xorg

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../xserver-kdrive-common/shr/Xserver              |   23 +++++++++++++------
 .../xserver-kdrive-common_0.1.bb                   |    2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
index 78995d2..98912e3 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/Xserver
@@ -113,13 +113,22 @@ case `module_id` in
                 fi 
                 ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" ;;
        "GTA02")
-                if [ `screen_width` -gt 330 ] ; then
-                     DPI=285
-                else 
-                     DPI=140
-                fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" 
-		XSERVER=/usr/bin/Xglamo 
+		if [ -f /usr/bin/Xorg ]; then
+			if [ `screen_width` -gt 330 ] ; then
+				DPI=280
+			else 
+				DPI=140
+			fi 
+			ARGS="$ARGS -dpi ${DPI} vt1" 
+		else
+			if [ `screen_width` -gt 330 ] ; then
+				DPI=285
+			else 
+				DPI=140
+			fi 
+			ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" 
+			XSERVER=/usr/bin/Xglamo 
+		fi
 		;;
 	"Nokia N770")
                 ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index abd7191..33c0a40 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r37"
+PR = "r38"
 
 SRC_URI = "\
   file://Xdefaults \