From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../recipes-graphics/wayland/weston-init.bbappend | 2 +-
.../recipes-graphics/wayland/weston-init/init | 18 ++++++++++++++++++
.../recipes-graphics/wayland/weston/wayland_env.sh | 1 +
.../recipes-graphics/wayland/weston_1.6.0.bbappend | 2 +-
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 1b427fe..0d76e3b 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,3 +1,3 @@
-PR_append = "-arago1"
+PR_append = "-arago2"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/init
b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
index cf02490..834de4d 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init/init
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
@@ -41,6 +41,24 @@ case "$1" in
fi
openvt -s weston
+
+ # Handle touchscreen calibration
+ if [ ! -e /dev/input/touchscreen0 ] ; then
+ exit 0
+ fi
+
+ if [ ! -f $WS_CALUDEV_FILE ] ; then
+ echo -n "Calibrating touchscreen (first time only)"
+ sleep 1
+ CAL_VALUES=`weston-calibrator|cut -c21-`
+ echo 'SUBSYSTEM=="input", ENV{WL_CALIBRATION}="'$CAL_VALUES'"' >
$WS_CALUDEV_FILE
+ echo "."
+ udevadm control --reload
+ udevadm trigger
+ killproc weston
+ sleep 1
+ openvt -s weston
+ fi
;;
stop)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
b/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
index 788024f..a0e3b90 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/wayland_env.sh
@@ -5,3 +5,4 @@
export XDG_CONFIG_HOME=/etc/
export XDG_RUNTIME_DIR=/run/user/root
export WAYLAND_DISPLAY=wayland-0
+export WS_CALUDEV_FILE=/etc/udev/rules.d/ws-calibrate.rules
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
b/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
index 5d39575..e636ffd 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.6.0.bbappend
@@ -1,7 +1,7 @@
# When configured for fbdev compositor, make it the default
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor
WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
-PR_append = "-arago0"
+PR_append = "-arago1"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
--
2.1.2
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
