[oe-commits] org.oe.dev merge of '13230c328dd36efab674e56c004cc0813e282791'
pH5 commit
openembedded-commits at lists.openembedded.org
Sat Sep 29 20:03:31 UTC 2007
merge of '13230c328dd36efab674e56c004cc0813e282791'
and '2e2e83df3f2d7c5eaea7ab84b89fe681a0267e54'
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 15229ab84af71a34403f54089ad2e85c85172e7e
ViewMTN: http://monotone.openembedded.org/revision/info/15229ab84af71a34403f54089ad2e85c85172e7e
Files:
1
packages/dbus/dbus.inc
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
Diffs:
#
# mt diff -r13230c328dd36efab674e56c004cc0813e282791 -r15229ab84af71a34403f54089ad2e85c85172e7e
#
#
#
# patch "packages/dbus/dbus.inc"
# from [bfd39772030ae6d6797ac756a85c23d5cd2951de]
# to [99bc6403667999918152e271de0cd7e541c54305]
#
============================================================
--- packages/dbus/dbus.inc bfd39772030ae6d6797ac756a85c23d5cd2951de
+++ packages/dbus/dbus.inc 99bc6403667999918152e271de0cd7e541c54305
@@ -10,9 +10,8 @@ SRC_URI = "http://freedesktop.org/softwa
file://cross.patch;patch=1 \
file://tmpdir.patch;patch=1 \
file://dbus-1.init \
- ${SRC_URI_EXTRA}"
+ "
-
inherit autotools pkgconfig update-rc.d gettext
INITSCRIPT_NAME = "dbus-1"
#
# mt diff -r2e2e83df3f2d7c5eaea7ab84b89fe681a0267e54 -r15229ab84af71a34403f54089ad2e85c85172e7e
#
#
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [1c3a844d711693e511e4b402611d0e873e14eb45]
# to [6017bd2df863067517e85e25f563e54f38953bf2]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [98a4fb4f6cccc8cf6cf2d49433a3a0094153ad57]
# to [1e3ac3df8b80313d192e4b3b31e1228b4154186f]
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 1c3a844d711693e511e4b402611d0e873e14eb45
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 6017bd2df863067517e85e25f563e54f38953bf2
@@ -15,12 +15,6 @@ fi
if [ -f /usr/bin/Xomap ]; then
XSERVER=/usr/bin/Xomap
fi
-if [ -f /usr/bin/Xw100 ]; then
- XSERVER=/usr/bin/Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
- XSERVER=/usr/bin/Ximageon
-fi
. /etc/profile
@@ -64,7 +58,9 @@ case `module_id` in
"HP iPAQ H5400" | "HP iPAQ H2200")
ARGS="$ARGS -dpi 100 -rgba rgb" ;;
"HP iPAQ HX4700")
- ARGS="$ARGS -dpi 200" ;;
+ ARGS="$ARGS -dpi 200"
+ IMAGEON="w3220"
+ ;;
"Ramses")
# What is this "vt2" in aid of?
ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
@@ -74,7 +70,9 @@ case `module_id` in
*Collie)
ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+ ARGS="$ARGS -dpi 200 -rgba rgb"
+ IMAGEON="w100"
+ ;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
"Simpad")
@@ -91,21 +89,30 @@ case `module_id` in
ARGS="$ARGS -rgba vrgb" ;;
"Compulab CM-x270")
modprobe mbxfb
- ARGS="$ARGS -fb /dev/fb1" ;;
+ ARGS="$ARGS -fb /dev/fb1" ;;
"GTA01" | "GTA02")
ARGS="$ARGS -dpi 285 -screen 480x640" ;;
"Nokia N800")
ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
"Motorola Ezx Platform")
ARGS="$ARGS -dpi 170 -screen 240x320" ;;
- *)
- # It is a device we do not know about, in which case we force
- # kdrive to use the current framebuffer geometry -- otherwise
- # it will default to trying to achieve 1024x768
- S=`fallback_screen_arg`
- ARGS="$ARGS -screen $S" ;;
+ *)
+ # It is a device we do not know about, in which case we force
+ # kdrive to use the current framebuffer geometry -- otherwise
+ # it will default to trying to achieve 1024x768
+ S=`fallback_screen_arg`
+ ARGS="$ARGS -screen $S" ;;
esac
+if [ ! -z "$IMAGEON" ]; then
+ if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=/usr/bin/Xw100
+ fi
+ if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=/usr/bin/Ximageon
+ fi
+fi
+
DISPLAY=':0'
exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 98a4fb4f6cccc8cf6cf2d49433a3a0094153ad57
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 1e3ac3df8b80313d192e4b3b31e1228b4154186f
@@ -15,12 +15,6 @@ fi
if [ -f /usr/bin/Xomap ]; then
XSERVER=/usr/bin/Xomap
fi
-if [ -f /usr/bin/Xw100 ]; then
- XSERVER=/usr/bin/Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
- XSERVER=/usr/bin/Ximageon
-fi
. /etc/profile
@@ -64,7 +58,9 @@ case `module_id` in
"HP iPAQ H5400" | "HP iPAQ H2200")
ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
"HP iPAQ HX4700")
- ARGS="$ARGS -br -dpi 200" ;;
+ ARGS="$ARGS -br -dpi 200"
+ IMAGEON="w3220"
+ ;;
"Ramses")
# What is this "vt2" in aid of?
ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
@@ -72,10 +68,11 @@ case `module_id` in
*Poodle)
ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
*Collie)
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270"
- ;;
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+ ARGS="$ARGS -br -dpi 200 -rgba rgb"
+ IMAGEON="w100"
+ ;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
"Simpad")
@@ -89,7 +86,7 @@ case `module_id` in
"HTC Universal")
ARGS="$ARGS -br -dpi 225 -screen 480x640 at 270" ;;
"ARM-IntegratorCP" | "ARM-Versatile PB")
- ARGS="$ARGS -br -rgba vrgb" ;;
+ ARGS="$ARGS -br -rgba vrgb" ;;
"Compulab CM-x270")
modprobe mbxfb
ARGS="$ARGS -br -fb /dev/fb1" ;;
@@ -100,13 +97,22 @@ case `module_id` in
"Nokia N800")
ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
*)
- # It is a device we do not know about, in which case we force
+ # It is a device we do not know about, in which case we force
# kdrive to use the current framebuffer geometry -- otherwise
- # it will default to trying to achieve 1024x768
- S=`fallback_screen_arg`
- ARGS="$ARGS -screen $S" ;;
+ # it will default to trying to achieve 1024x768
+ S=`fallback_screen_arg`
+ ARGS="$ARGS -screen $S" ;;
esac
+if [ ! -z "$IMAGEON" ]; then
+ if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=/usr/bin/Xw100
+ fi
+ if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=/usr/bin/Ximageon
+ fi
+fi
+
DISPLAY=':0'
exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
More information about the Openembedded-commits
mailing list