disapproval of revision '14b0e60c903b363f1a9e66d94b672fa4698fa706'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9b6f61358e380ed0984a30832cb72ee2eb6033db
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9b6f61358e380ed0984a30832cb72ee2eb6033db
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:
#
# mt diff -r14b0e60c903b363f1a9e66d94b672fa4698fa706 -r9b6f61358e380ed0984a30832cb72ee2eb6033db
#
#
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver"
# from [4f68087bab33a8806229c061aa719c9e47a35ce5]
# to [d2388d51184156d1aec429601b0199f1af934529]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [9fbbdcc16162f2d85c5e242cedae66826eed2134]
# to [5bd12bd7ec1767db6e23bcbccdbbc6991a9eb7f2]
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver 4f68087bab33a8806229c061aa719c9e47a35ce5
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver d2388d51184156d1aec429601b0199f1af934529
@@ -44,7 +44,7 @@ export USER=root
export USER=root
-ARGS=" -pn"
+ARGS=" -br -pn"
# use ucb 1x00 touchscreen if present
if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
@@ -60,44 +60,44 @@ case `module_id` in
# start off server in conventional location.
case `module_id` in
"HP iPAQ H3100" | "HP iPAQ H3800")
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
- ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
+ ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
"HP iPAQ H5400" | "HP iPAQ H2200")
- ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
"HP iPAQ HX4700")
- ARGS="$ARGS -br -dpi 200" ;;
+ ARGS="$ARGS -dpi 200" ;;
"Ramses")
# What is this "vt2" in aid of?
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
# both 'Sharp-Collie' and just 'Collie' have been reported
*Poodle)
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
*Collie)
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270"
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"
;;
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+ ARGS="$ARGS -dpi 200 -rgba rgb" ;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
+ ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
"Simpad")
- ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
"Generic OMAP1510/1610/1710")
- ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;;
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
"Cellon C8000 Board")
- ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;;
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
"HTC Universal")
- ARGS="$ARGS -br -dpi 225 -screen 480x640 at 270" ;;
+ ARGS="$ARGS -dpi 225 -screen 480x640 at 270" ;;
"ARM-IntegratorCP" | "ARM-Versatile PB")
- ARGS="$ARGS -br -rgba vrgb" ;;
+ ARGS="$ARGS -rgba vrgb" ;;
"Compulab CM-x270")
modprobe mbxfb
- ARGS="$ARGS -br -fb /dev/fb1"
+ ARGS="$ARGS -fb /dev/fb1"
;;
- "GTA01" | "GTA02")
- ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ "GTA01")
+ ARGS="$ARGS -dpi 285 -screen 480x640" ;;
"Nokia N800")
- ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
*)
# Its a device we dont know about - in which case force
# kdrive to use the current framebuffer geometry otherwise
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 9fbbdcc16162f2d85c5e242cedae66826eed2134
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 5bd12bd7ec1767db6e23bcbccdbbc6991a9eb7f2
@@ -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 = "r15"
+PR = "r14"
SRC_URI = "file://etc"
S = ${WORKDIR}