diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 01:15:37 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 01:15:37 +0000 |
| commit | da397c84a954c5ec18c636151b370b677b2189e8 (patch) | |
| tree | 24abc8609ccbc1eac6b677db11afd1dca57a0143 | |
| parent | d73912773767cbd0f9ca33a1f5e8ae92ef729443 (diff) | |
Xserver: remove -br from the common options and add it for most devices
xserver-kdrive-common: bump PR
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver | 38 | ||||
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver index e59460f3b0..efed60b2ad 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver @@ -44,7 +44,7 @@ module_id() { export USER=root -ARGS=" -br -pn" +ARGS=" -pn" # use ucb 1x00 touchscreen if present if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then @@ -60,44 +60,44 @@ fi # start off server in conventional location. case `module_id` in "HP iPAQ H3100" | "HP iPAQ H3800") - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;; "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@270" ;; + ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@270" ;; "HP iPAQ H5400" | "HP iPAQ H2200") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; "HP iPAQ HX4700") - ARGS="$ARGS -dpi 200" ;; + ARGS="$ARGS -br -dpi 200" ;; "Ramses") # What is this "vt2" in aid of? - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;; # both 'Sharp-Collie' and just 'Collie' have been reported *Poodle) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; *Collie) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -dpi 200 -rgba rgb" ;; + ARGS="$ARGS -br -dpi 200 -rgba rgb" ;; "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") - ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;; + ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;; "Simpad") - ARGS="$ARGS -dpi 100 -rgba rgb" ;; + ARGS="$ARGS -br -dpi 100 -rgba rgb" ;; "Generic OMAP1510/1610/1710") - ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; + ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;; "Cellon C8000 Board") - ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;; + ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;; "HTC Universal") - ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; + ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") - ARGS="$ARGS -rgba vrgb" ;; + ARGS="$ARGS -br -rgba vrgb" ;; "Compulab CM-x270") modprobe mbxfb - ARGS="$ARGS -fb /dev/fb1" + ARGS="$ARGS -br -fb /dev/fb1" ;; - "GTA01") - ARGS="$ARGS -dpi 285 -screen 480x640" ;; + "GTA01" | "GTA02") + ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;; "Nokia N800") - ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;; + ARGS="$ARGS -br -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 diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 9d9b577766..a67f9ed9a1 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r14" +PR = "r15" SRC_URI = "file://etc" S = ${WORKDIR} |