summaryrefslogtreecommitdiff
path: root/recipes/xserver-common
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-07-21 12:59:17 +0200
committerKoen Kooi <koen@openembedded.org>2009-07-21 12:59:17 +0200
commit484b1126352695a3d369b2e967a6abbd00419602 (patch)
treeb24f195cc601ffbe8e8b3c26af935210f48ae9fc /recipes/xserver-common
parente6b2e6a8261123efc703026956a999f100540e5d (diff)
xserver-common: handle tslib -mouse globally so every device can use full Xorg if wanted
Diffstat (limited to 'recipes/xserver-common')
-rw-r--r--recipes/xserver-common/files/ts-handling-cleanup.diff66
-rw-r--r--recipes/xserver-common/xserver-common_1.25.bb3
2 files changed, 68 insertions, 1 deletions
diff --git a/recipes/xserver-common/files/ts-handling-cleanup.diff b/recipes/xserver-common/files/ts-handling-cleanup.diff
new file mode 100644
index 0000000000..ab6ab075ba
--- /dev/null
+++ b/recipes/xserver-common/files/ts-handling-cleanup.diff
@@ -0,0 +1,66 @@
+--- /tmp/Xserver 2009-07-21 12:53:26.000000000 +0200
++++ xserver-common-1.25/X11/Xserver 2009-07-21 12:53:41.000000000 +0200
+@@ -53,13 +53,13 @@
+ ARGS="-br -pn $INPUT_EXTRA_ARGS"
+
+ # use ucb 1x00 touchscreen if present
+-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
++if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ] && [ "$XSERVER" != "Xorg" ] ; then
+ ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+ fi
+
+ # kdrive 1.4 onwards needs -mouse args
+ # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+-if [ -e "$TSLIB_TSDEVICE" ] ; then
++if [ -e "$TSLIB_TSDEVICE" ] && [ "$XSERVER" != "Xorg" ] ; then
+ ARGS="$ARGS -mouse tslib"
+ else
+ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then
+@@ -97,7 +97,7 @@
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
+ "TI-OSK")
+- ARGS="$ARGS -dpi 100 -mouse tslib" ;;
++ ARGS="$ARGS -dpi 100 " ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE},10,1" ;;
+ "HTC Universal")
+@@ -105,13 +105,13 @@
+ "HTC Tornado")
+ ARGS="$ARGS -dpi 100 -hide-cursor" ;;
+ "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK")
+- ARGS="$ARGS -mouse tslib -dpi 100 -rgba bgr -screen 240x320" ;;
++ ARGS="$ARGS -dpi 100 -rgba bgr -screen 240x320" ;;
+ "Generic OMAP1510/1610/1710" | "Nokia N770")
+- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;;
+ "Nokia N800")
+- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;;
+ "Nokia RX-44")
+- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;;
++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;;
+ "GTA01" )
+ ARGS="$ARGS -dpi 285"
+ if [ "$XSERVER" != "Xorg" ] ; then
+@@ -132,16 +132,16 @@
+ fi
+ ;;
+ "Boundary Devices Neon board")
+- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} "
+ ;;
+ "Hoeft&Wessel HW90350")
+- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} "
+ ;;
+ "Hoeft&Wessel HW90250")
+- ARGS="$ARGS -dpi 100 -screen 240x320@90 -mouse tslib"
++ ARGS="$ARGS -dpi 100 -screen 240x320@90 "
+ ;;
+ "MINI2440")
+- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib"
++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} "
+ ;;
+ # This is a fallback for PCs
+ "")
diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb
index 9db0c2a8d2..ac1f758ef4 100644
--- a/recipes/xserver-common/xserver-common_1.25.bb
+++ b/recipes/xserver-common/xserver-common_1.25.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "all"
@@ -12,6 +12,7 @@ inherit gpe
SRC_URI_append = " file://setDPI.sh \
file://89xdgautostart.sh \
file://avoid-rotated-server.patch;patch=1 \
+ file://ts-handling-cleanup.diff;patch=1 \
"
do_install_append() {