* not compatible with xserver-1.10 ABI * elfe is not compatible with EmulateRightButton option too
Signed-off-by: Martin Jansa <[email protected]> --- conf/machine/om-gta01.conf | 1 - conf/machine/om-gta02.conf | 1 - recipes/tasks/task-x11.bb | 2 +- .../xserver-xorg-conf/om-gta01/xorg.conf | 3 +-- .../xserver-xorg-conf/om-gta02/xorg.conf | 3 +-- recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index d952ad7..d14b0fd 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -21,7 +21,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-fbdev \ xf86-input-keyboard \ diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index d7a968a..033190c 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -23,7 +23,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" XSERVER ?= "xserver-xorg \ - xf86-input-tslib \ xf86-input-evdev \ xf86-video-glamo \ xf86-input-keyboard \ diff --git a/recipes/tasks/task-x11.bb b/recipes/tasks/task-x11.bb index 1021bfb..107f0d1 100644 --- a/recipes/tasks/task-x11.bb +++ b/recipes/tasks/task-x11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b SECTION = "x11/server" LICENSE = "MIT" PV = "1.0" -PR = "r7" +PR = "r8" # WORK IN PROGRESS diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf index e957e41..edb5e0e 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf @@ -32,9 +32,8 @@ EndSection Section "InputDevice" Identifier "Touchscreen" - Driver "tslib" + Driver "evdev" Option "Device" "/dev/input/event1" - Option "EmulateRightButton" "1" EndSection Section "ServerFlags" diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf index 8b116fc..de6ed1c 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf +++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf @@ -38,9 +38,8 @@ EndSection Section "InputDevice" Identifier "Touchscreen" - Driver "tslib" + Driver "evdev" Option "Device" "/dev/input/event1" - Option "EmulateRightButton" "1" EndSection Section "ServerFlags" diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 5de24be..7cc8a5d 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r46" +PR = "r47" SRC_URI = "file://xorg.conf" -- 1.7.5.rc3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
