[oe-commits] org.oe.dev xserver-kdrive-common: use Xglamo for gta02, remove some of the bogus Xserver checks

[koen commit]

xserver-kdrive-common: use Xglamo for gta02, remove some of the bogus Xserver checks
* if a Xserver is in /usr/bin doesn't mean the it's the right server for the job

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5e44ca0fbf18c98547d452fc98cef3371e4e9fc4
ViewMTN: http://monotone.openembedded.org/revision/info/5e44ca0fbf18c98547d452fc98cef3371e4e9fc4
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:

#
# mt diff -r576963d8c13674ef65224799b79729a06a811e5d -r5e44ca0fbf18c98547d452fc98cef3371e4e9fc4
#
# 
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
#  from [473b6b11c3369931734f425031fc872ae47cc29e]
#    to [054fed5a57c4139a63a685584f92fce6afd962f5]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [4abf1bd215ad1d5f7d4b8b4c52e6e2d28eb829a4]
#    to [1348fb70d489f2643a4d5de2587579265505ceeb]
# 
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver	473b6b11c3369931734f425031fc872ae47cc29e
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver	054fed5a57c4139a63a685584f92fce6afd962f5
@@ -1,8 +1,7 @@
 #!/bin/sh
 #
 
 # note xinit needs full server path
-XSERVER=/usr/bin/Xipaq
 if [ -f /usr/bin/Xfbdev ]; then
   XSERVER=/usr/bin/Xfbdev
 fi
@@ -12,9 +11,6 @@ fi
 if [ -f /usr/bin/Xorg ]; then
   XSERVER=/usr/bin/Xorg
 fi
-if [ -f /usr/bin/Xomap ]; then
-  XSERVER=/usr/bin/Xomap
-fi
 
 . /etc/profile
 
@@ -104,15 +100,27 @@ case `module_id` in
         "Compulab CM-x270")
                 modprobe mbxfb
                 ARGS="$ARGS -fb /dev/fb1" ;;
-        "GTA01" | "GTA02")
+        "GTA01")
                 if [ `screen_width` -gt 330 ] ; then
                      DPI=285
                 else
                      DPI=140
                 fi 
                 ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" ;;
+       "GTA02")
+                if [ `screen_width` -gt 330 ] ; then
+                     DPI=285
+                else 
+                     DPI=140
+                fi 
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" 
+                XSERVER=/usr/bin/Xglamo ;;
+	"Nokia N770")
+                ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
+                XSERVER=/usr/bin/Xomap ;;
         "Nokia N800")
-                ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
+                ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
+                XSERVER=/usr/bin/Xomap ;;
         "Motorola Ezx Platform")
                 ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;;
         *)
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	4abf1bd215ad1d5f7d4b8b4c52e6e2d28eb829a4
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	1348fb70d489f2643a4d5de2587579265505ceeb
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r21"
+PR = "r22"
 
 SRC_URI = "\
   file://Xdefaults \