diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/xserver-common/files/kdrive-1.4-fixes.patch | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/xserver-common/files/kdrive-1.4-fixes.patch')
| -rw-r--r-- | packages/xserver-common/files/kdrive-1.4-fixes.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch deleted file mode 100644 index 25562b5218..0000000000 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nurd xserver-common-1.22.old/X11/Xinit.d/12keymap xserver-common-1.22/X11/Xinit.d/12keymap ---- xserver-common-1.22.old/X11/Xinit.d/12keymap 2008-02-07 16:53:16.000000000 +0100 -+++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-05-04 17:30:48.278316443 +0200 -@@ -2,6 +2,9 @@ - - MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` - -+# since kdrive 1.4 there is no default keymap in server -+xmodmap - </etc/X11/default.xmodmap -+ - case $MACHINE in - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - xmodmap - < /etc/X11/shepherd.xmodmap -diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver ---- xserver-common-1.22.old/X11/Xserver 2008-03-04 17:41:41.000000000 +0100 -+++ xserver-common-1.22/X11/Xserver 2008-05-04 17:31:04.388313190 +0200 -@@ -53,10 +53,14 @@ - ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" - fi - --# use usb mouse if present -+# kdrive 1.4 onwards needs -mouse args - # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically --if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then -- ARGS="$ARGS -mouse /dev/input/mice" -+if [ -e "$TSLIB_TSDEVICE" ] ; then -+ ARGS="$ARGS -mouse tslib" -+else -+ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then -+ ARGS="$ARGS -mouse mouse" -+ fi - fi - - # start off server in conventional location. -@@ -103,8 +107,7 @@ - "Nokia RX-44") - ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; - "GTA01" ) -- #we set 100 dpi for the time being, should the -dpi 285 -- ARGS="$ARGS -dpi 100 -screen 480x640" ;; -+ ARGS="$ARGS -dpi 285 -screen 480x640" ;; - "Motorola Ezx Platform") - ARGS="$ARGS -dpi 170 -screen 240x320" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") -@@ -130,4 +133,6 @@ - fi - esac - -+echo "tslib: $TSLIB_TSDEVICE" -+echo "exec $XSERVER $ARGS $*" - exec $XSERVER $ARGS $* |