From a8478f2106a1fa6b5fe05f9267acec2e10b72718 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 12 Sep 2019 14:42:25 -0300 Subject: [PATCH] Revert "weston: Enable touchscreen calibrator" This reverts commit a89461ee40b590dcffcff3c6a5b61d9e294a16e8. --- ...-argb8888-as-gbm-default-on-mscale-8.patch | 6 ++-- ...ibrator-Advertise-the-touchscreen-ca.patch | 30 ------------------- recipes-graphics/wayland/weston_5.0.0.imx.bb | 1 - 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch diff --git a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch b/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch index 75589d3b..e951ce12 100644 --- a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch +++ b/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch @@ -1,4 +1,4 @@ -From 186ec0c80410b2120b8f31c211cb44a836c84522 Mon Sep 17 00:00:00 2001 +From 4ab82e531d01c3c1f45a4f099d145cde2890a0d5 Mon Sep 17 00:00:00 2001 From: Haihua Hu Date: Wed, 4 Jul 2018 16:05:20 +0800 Subject: [PATCH] weston.ini: using argb8888 as gbm default on mscale 850D @@ -22,5 +22,5 @@ Index: git/weston.ini.in #use-g2d=1 +gbm-format=argb8888 - [libinput] - touchscreen_calibrator=true + #[output] + #name=HDMI-A-1 diff --git a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch deleted file mode 100644 index 7ea07ed6..00000000 --- a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 46843c8681ddafbea6f491b7af4de6529e93f5bd Mon Sep 17 00:00:00 2001 -From: Jun Zhu -Date: Sun, 30 Sep 2018 15:31:26 +0800 -Subject: [PATCH] weston-touch-calibrator: Advertise the touchscreen calibrator - interface to all clients. [YOCIMX-2963] - -Set touchscreen_calibrator to true in the section "libinput" of the configure file - /etc/xdg/weston/weston.ini. -Otherwise, it will report that the new-added interface "weston-touch-calibration" cannot be found. - -Signed-off-by: Jun Zhu - ---- - weston.ini.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/weston.ini.in b/weston.ini.in -index 83dd56e..6e20e11 100644 ---- a/weston.ini.in -+++ b/weston.ini.in -@@ -3,6 +3,9 @@ - idle-time=0 - #use-g2d=1 - -+[libinput] -+touchscreen_calibrator=true -+ - #[output] - #name=HDMI-A-1 - #mode=1920x1080@60 diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_5.0.0.imx.bb index 7649893b..032972fa 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_5.0.0.imx.bb @@ -14,7 +14,6 @@ SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=http file://0001-make-error-portable.patch \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ - file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \ " # Use argb8888 as gbm-format for i.MX8MQ only SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \ -- 2.40.1