From patchwork Wed May 24 18:11:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24413 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 877E2C77B73 for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.1266.1684951889047863910 for ; Wed, 24 May 2023 11:11:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=JZy81JiK; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBO7x020818; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=FulnHRnXe9Tkh6BoVmYP1Z5SYPJnf0xz9yE46y5fWs8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=JZy81JiKsvidWzULBGaixybfQggibwrHr2GHCuLeZ9RjlZrOfwQcEcEzKWCCrInjZ 1g9UasE+MhwrLULecOWO3nrv5QW+SHCh32mU/Cg0YTfAVuH8MLav+uw63rHHSvn8++ ds7q3WChDNl4sn20z2ZcxPob8pRe182cUFZoYoME= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBO7j009187 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq0005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 1/7] weston-init: drop all the old append logic Date: Wed, 24 May 2023 13:11:16 -0500 Message-ID: <20230524181122.35202-2-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14462 From: Randolph Sapp First step in non-root weston. Drop the following files: - weston-init/init - weston-init/runWeston - weston-init/ti43x/weston.ini - weston-init/wayland_env.sh We previously had some append logic to remove the systemd-service because people were only updating the sysVinit script, and the sysVinit script was updated to include touch screen calibration logic. Now we can drop this as weston now has it's own calibration routine per user. In addition to this, this append file also introduced a runWeston wrapper and a wayland_env script to setup environment variables for the root user weston instance, all of which is now unnecessary as root weston is generally not a good idea. This append now only serves to offer a new weston.ini file to the existing weston-init package with the hooks for libinput to create and apply touchscreen calibrations for individual users. Signed-off-by: Randolph Sapp --- .../wayland/weston-init.bbappend | 22 +-- .../recipes-graphics/wayland/weston-init/init | 129 ------------------ .../wayland/weston-init/runWeston | 39 ------ .../wayland/weston-init/ti43x/weston.ini | 16 --- .../wayland/weston-init/wayland_env.sh | 12 -- .../wayland/weston-init/weston.ini | 4 + 6 files changed, 7 insertions(+), 215 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-init/init delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend index 28e7ae39..a73b669d 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend @@ -2,22 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago12" -SRC_URI:append = " \ - file://runWeston \ - file://wayland_env.sh \ - file://weston.ini \ -" - -do_install:append() { - install -d ${D}${bindir} - install -m 755 ${WORKDIR}/runWeston ${D}${bindir} - rm -rf ${D}${systemd_system_unitdir} - - install -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/ -} - -FILES:${PN}:remove = "${systemd_system_unitdir}/weston.service ${systemd_system_unitdir}/weston.socket" -FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini" -SYSTEMD_SERVICE:${PN}:remove = "weston.service weston.socket" +#SRC_URI:append = " \ +# file://weston.ini \ +#" diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/init b/meta-arago-distro/recipes-graphics/wayland/weston-init/init deleted file mode 100644 index fa3f0372..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/init +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -killproc() { - all_pids=`/bin/pidof $1` - - # busybox pidof doesn't ommit the current pid - # as this script is called weston on the target - # in thinlinux with a busybox based utility load - # later killproc operations end up killing this - # script. - for pid in $all_pids - do - if [ "$pid" != "$$" ]; then - kill_pids+=$pid - fi - done - - [ "$kill_pids" != "" ] && kill $kill_pids -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - - # Weston for some reason dies if these environment variables are set - unset WAYLAND_DISPLAY - - # This is all a nasty hack - if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/root - fi - - if [ ! -d "$XDG_RUNTIME_DIR" ] ; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - echo "Starting Weston" - - if [ ! -d "/dev/input" ]; then - echo "Waiting for input device..." - killproc weston - sleep 3 - fi - - openvt -c 4 -f runWeston - - # If there's no touchscreen device available, done - if [ ! -e /dev/input/touchscreen0 ] ; then - exit 0 - fi - - # If it was already calibrated, done - if [ -f "$WS_CALUDEV_FILE" ] ; then - exit 0 - fi - - # Check if SD card is mounted - mount | grep /run/media/mmcblk0p1 | grep vfat > /dev/null 2>&1 - if [ "$?" = "0" ] ; then - SD_MOUNTED="1" - else - SD_MOUNTED="0" - fi - - # Check if SD card has a calibration rules file - SD_CALUDEV_FILE=/run/media/mmcblk0p1/ws-calibrate.rules - if [ "$SD_MOUNTED" = "1" -a -f "$SD_CALUDEV_FILE" ] ; then - # Copy it over to udev location - cp "$SD_CALUDEV_FILE" "$WS_CALUDEV_FILE" - else - # Run a calibration app and save output to udev rules - echo "Calibrating touchscreen (first time only)" - echo - echo "*** To continue, please complete the touchscreen calibration" - echo -n "*** by touching the crosshairs on the LCD screen" - sleep 2 - CAL_VALUES=`weston-calibrator|cut -c21-` - echo 'SUBSYSTEM=="input", ENV{WL_CALIBRATION}="'$CAL_VALUES'"' > $WS_CALUDEV_FILE - echo "." - # Copy it back to SD - if [ "$SD_MOUNTED" = "1" ] ; then - cp "$WS_CALUDEV_FILE" "$SD_CALUDEV_FILE" - fi - fi - - # Reload and re-run udev rules and restart weston - udevadm control --reload - udevadm trigger - killproc weston - sleep 2 - openvt -c 4 -f runWeston - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston b/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston deleted file mode 100644 index aed5d5f9..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/runWeston +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -clear -cat << EOF - - - - - - - - - - - - - - - - - Please wait... - - - - - - - - - - - - - - - -EOF - -weston --idle-time=0 >> /var/log/weston.log 2>&1 diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini deleted file mode 100644 index 8a9dd998..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/ti43x/weston.ini +++ /dev/null @@ -1,16 +0,0 @@ -[core] -require-input=false - -[shell] -locking=false -animation=zoom -panel-position=top -startup-animation=fade - -[screensaver] -# Uncomment path to disable screensaver -#path=@libexecdir@/weston-screensaver - -[output] -name=HDMI-A-1 -mode=1024x768 diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh b/meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh deleted file mode 100644 index 50979b30..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/wayland_env.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -### Wayland Environment Variables ### - -export XDG_CONFIG_HOME=/etc/ -export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir -export WS_CALUDEV_FILE=/etc/udev/rules.d/ws-calibrate.rules - -if ! test -d "${XDG_RUNTIME_DIR}"; then - mkdir -p "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" -fi diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini index c0ae9f92..4cc2683a 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini @@ -1,4 +1,5 @@ [core] +idle-time=0 require-input=false [shell] @@ -7,6 +8,9 @@ animation=zoom panel-position=top startup-animation=fade +[libinput] +touchscreen_calibrator=true + [screensaver] # Uncomment path to disable screensaver #path=@libexecdir@/weston-screensaver From patchwork Wed May 24 18:11:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24412 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81C10C77B7A for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.1298.1684951892041190758 for ; Wed, 24 May 2023 11:11:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=GPHEBnv2; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOFW099629; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=XhZP6tkDDZUvuX5OKZORjQW2jhWgbLbFEo357j81a0c=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=GPHEBnv2GI/S3UUkXqkrYeGvbMC5/xqXo9HkXGdBrlNoEvwKHdoZ2yajh08bN96TS FP1zofwIqMKIUopVZBuDSOQZcEI92Y8JQ/anyC/scES5YjSVsXH04+aXyHub5eRBkj 6gTx3Mz8Jt9Qmn5RIlVh5S0igNMi5DppA/6oD2o8= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBO7k009187 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq1005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 2/7] weston: drop Fix-touch-screen-crash patch Date: Wed, 24 May 2023 13:11:17 -0500 Message-ID: <20230524181122.35202-3-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14468 From: Randolph Sapp Drop the fix touchscreen crash patch as this is for an older version of weston and it seems like they completely reworked the way the handle touch events, adding checks for out of bounds events and extra handling for NULL window focus events. Signed-off-by: Randolph Sapp --- ...-weston-Fix-touch-screen-crash-issue.patch | 39 ------------------- .../wayland/weston_10.0.2.bbappend | 1 - 2 files changed, 40 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0004-weston-Fix-touch-screen-crash-issue.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0004-weston-Fix-touch-screen-crash-issue.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0004-weston-Fix-touch-screen-crash-issue.patch deleted file mode 100644 index 4849d5b6..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston/0004-weston-Fix-touch-screen-crash-issue.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 60250e9dc57fe56148c8a24bba107bce8a873fb4 Mon Sep 17 00:00:00 2001 -From: Karthik Ramanan -Date: Mon, 12 Mar 2018 10:56:28 +0530 -Subject: [PATCH 4/4] weston: Fix touch screen crash issue - -Touch screen operation causes the weston to crash with segment fault sometimes. -The crash occurs when the coordinate (x,y) passed to the weston input module -is outside the view window, hence the weston compositor is not able to pick -up a display view and there is no code to detect this condition at function -notify_touch(). - -Upstream status: pending - -Signed-off-by: Eric Ruei -Signed-off-by: Karthik Ramanan ---- - libweston/input.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libweston/input.c b/libweston/input.c -index 4fedc55..bcb2f28 100644 ---- a/libweston/input.c -+++ b/libweston/input.c -@@ -2185,6 +2185,12 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id, - * until all touch points are up again. */ - if (touch->num_tp == 1) { - ev = weston_compositor_pick_view(ec, x, y, &sx, &sy); -+ if (!ev) -+ { -+ weston_log("notify_touch: weston_compositor_pick_view(%d, %d) failed to find a view!\n", -+ wl_fixed_to_int(x), wl_fixed_to_int(y)); -+ return; -+ } - weston_touch_set_focus(touch, ev); - } else if (!touch->focus) { - /* Unexpected condition: We have non-initial touch but --- -1.9.1 - diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend index b1b7d26a..16ed6e67 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -5,7 +5,6 @@ PR:append = ".arago1" # file://0002-weston-Allow-visual_id-to-be-0.patch SRC_URI += " \ file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ - file://0004-weston-Fix-touch-screen-crash-issue.patch \ file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ " From patchwork Wed May 24 18:11:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24416 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDA93C7EE39 for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.1297.1684951892001139585 for ; Wed, 24 May 2023 11:11:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=tm1opurv; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOZ0099638; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=Y9QOhDLuBgwR/OCTnZJepeMS2cenhS14xgfMKjuX734=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tm1opurvXFglUFZUenol9mELgT5Nuc0OX4/KGyvjKdXBGAYtlqt5wiyf+HaKhv7Nd kev0Jz78n/3maaUPZUrwaHBt4Y9RvF598oU33VT/Hx93K2nVinW0PZre1gUhpsY8FD fwn8SiBbvD4qYX4iVHm5LSe+uICWisDrWF0bL1wA= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBO9Q008290 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq2005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 3/7] weston: drop allow-visual_id-to-be-0 patch Date: Wed, 24 May 2023 13:11:18 -0500 Message-ID: <20230524181122.35202-4-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14467 From: Randolph Sapp Weston 10 now checks to see if eglGetConfigAttrib returns anything before handling the actual EGL_NATIVE_VISUAL_ID value. Signed-off-by: Randolph Sapp --- .../0002-weston-Allow-visual_id-to-be-0.patch | 34 ------------------- .../wayland/weston_10.0.2.bbappend | 1 - 2 files changed, 35 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch deleted file mode 100644 index a354d947..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5695eab02bb88318bf99d568b6d0e4592d5f9981 Mon Sep 17 00:00:00 2001 -From: Karthik Ramanan -Date: Mon, 12 Mar 2018 10:47:02 +0530 -Subject: [PATCH 2/4] weston: Allow visual_id to be 0 - -The inquiry of visual id from egl API eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID) -is an optional feature. The visual id will be set to 0 if this feature is -not supported. Therefore, the return condition @function match_config_to_visual() -should be (id == visual_id || id == 0) instead of (id == visual_id) - -Upstream status: Pending - -Signed-off-by: Eric Ruei -Signed-off-by: Karthik Ramanan ---- - libweston/gl-renderer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c -index c6091af..9299dc6 100644 ---- a/libweston/gl-renderer.c -+++ b/libweston/gl-renderer.c -@@ -2575,7 +2575,7 @@ match_config_to_visual(EGLDisplay egl_display, - &id)) - continue; - -- if (id == visual_id) -+ if (id == visual_id || id == 0) - return i; - } - --- -1.9.1 - diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend index 16ed6e67..dd67eec1 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago1" -# file://0002-weston-Allow-visual_id-to-be-0.patch SRC_URI += " \ file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \ From patchwork Wed May 24 18:11:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24414 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9504EC7EE2E for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.1295.1684951889376582183 for ; Wed, 24 May 2023 11:11:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Pkr/A0/a; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOCH099634; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=xSVD0ImIr65o5Fhvd9jIA6lrlIoOsWgbS+vjMEqaYeg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Pkr/A0/aLVHPN+yNgOOsq0ZjhpiJh7wJsWPauPENCLG1O7IYU4IHRDEzfga5bc3XJ cUsuFoeM2jy3L1VraMArxcHIazN7NcLf+gwjAw+FGmkG3eCz3gmGh/kTTUGL6NlSEi cvHP9QeOB1Vk9UJEoz1I11MbhU8ofr2CylNeRXsg= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBOhW124223 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq3005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 4/7] weston: add notice about select-plane patch Date: Wed, 24 May 2023 13:11:19 -0500 Message-ID: <20230524181122.35202-5-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14464 From: Randolph Sapp The select-plane patch has been accepted upstream as commit 94afcbcdc3f1b1cfc050da242c9c70009b007fc6. Add a notice to remind users to remove that patch when we get there. Signed-off-by: Randolph Sapp --- .../recipes-graphics/wayland/weston_10.0.2.bbappend | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend index dd67eec1..989bc28c 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -2,8 +2,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago1" +# Drop 0001-backend-drm-Select-plane-based-on-current-attached-C.patch once we +# get past version 11.0.1 or commit 94afcbcdc3f1b1cfc050da242c9c70009b007fc6 +# upstream + SRC_URI += " \ file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ " + From patchwork Wed May 24 18:11:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24417 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CD7CC7EE31 for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.1269.1684951891951777795 for ; Wed, 24 May 2023 11:11:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=qNdGTa7A; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBO7D020824; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=04FfX5G+nkaRgtadJU19GyxvZuVucKVFl/Ic/7NUDpo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=qNdGTa7AhgmkdEkKNdNgMh9Z7/WI1VgKlbsfwwUJ8nRYWruhKgZLg4mzer6ujqEWf 5rnRdQX8M/J+3Pf26oLQEPOSjwJlVR3fBcASJcQkI0LY7JAKuL6p+p0ND3U4AtEvrj wTuW0ipc5OOhhGTv55hvW8e/A+YdjQgqSRS9nQU0= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBOUR067934 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq4005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 5/7] weston: add weston user to the render group Date: Wed, 24 May 2023 13:11:20 -0500 Message-ID: <20230524181122.35202-6-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14465 From: Randolph Sapp The weston user must be added to the render group to use dri render devices. Signed-off-by: Randolph Sapp --- .../recipes-graphics/wayland/weston_10.0.2.bbappend | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend index 989bc28c..edc1bebd 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -12,3 +12,8 @@ SRC_URI += " \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ " +# required for weston user to interact with the render devices +inherit extrausers +EXTRA_USERS_PARAMS = " \ + usermod -aG render weston; \ +" From patchwork Wed May 24 18:11:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24415 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 958EAC7EE32 for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.1270.1684951892083345854 for ; Wed, 24 May 2023 11:11:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=SZiSPwQ3; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOcN032083; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=wRpyno7jgmt2UL9uSlMcWEr9yF3THcf4d1xybePs38g=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SZiSPwQ3oqNmiKOOg45FYiCq4F63v3lD4b/UxmQLpdwEV/uoPfEUBG9GrjySoBzKT TRa0QDZbi6zRETMc/7CIReJEmWDIelyNslT+Fje800zVxbyrMdY5gRQVQ3xj+V+bPl 0XpJXdd2fuS7CiFDhf8JleUUM29qxehd3psvGs94= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBOhX124223 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq5005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 6/7] weston: drop the fix-virtual-keyboard-display-issue patch Date: Wed, 24 May 2023 13:11:21 -0500 Message-ID: <20230524181122.35202-7-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14469 From: Randolph Sapp Weston 10 changed the way it handles focus grabbing. This shouldn't be relevant anymore. Signed-off-by: Randolph Sapp --- ...al-keyboard-display-issue-for-QT5-ap.patch | 41 ------------------- .../wayland/weston_10.0.2.bbappend | 1 - 2 files changed, 42 deletions(-) delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch deleted file mode 100644 index 32901db9..00000000 --- a/meta-arago-distro/recipes-graphics/wayland/weston/0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8034bc1862bbebb332e91917c6458ef8efb5b54e Mon Sep 17 00:00:00 2001 -From: Eric Ruei -Date: Fri, 8 Mar 2019 18:49:07 -0500 -Subject: [PATCH] weston: Fix virtual keyboard display issue for QT5 - application - -The virtual keyboard does pop up as expected, however, it will never hide -even when the application is terminated. This problem is due to the order -of the text APIs( text_input_activate and test_input_show_input_panel) are -invoked in QT5 and a potential bug of the API implementation. The virtual -keyboard works as expected if the test_input_show_input_panel() is invoked -prior to the test_input_activate() as most of the weston sample applications -do. However, the problem will show up if that order is reversed and the reason -why is that the current_panel is not set in this case and hence this panel -cannot be hidden. - -It is required to set the current_panel to the text_input when the input_panel -becomes visible at the first time. - -Upstream status: Pending - -Signed-off-by: Eric Ruei ---- - compositor/text-backend.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/compositor/text-backend.c b/compositor/text-backend.c -index 664c36f..b610dfb 100644 ---- a/compositor/text-backend.c -+++ b/compositor/text-backend.c -@@ -349,6 +349,7 @@ text_input_show_input_panel(struct wl_client *client, - text_input->surface); - wl_signal_emit(&ec->update_input_panel_signal, - &text_input->cursor_rectangle); -+ text_input->manager->current_text_input = text_input; - } - } - --- -1.9.1 - diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend index edc1bebd..698ff03e 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -7,7 +7,6 @@ PR:append = ".arago1" # upstream SRC_URI += " \ - file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \ file://0001-Revert-require-GL_EXT_unpack_subimage-commit.patch \ " From patchwork Wed May 24 18:11:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 24411 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82F33C7EE2D for ; Wed, 24 May 2023 18:11:33 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web10.1294.1684951889169035623 for ; Wed, 24 May 2023 11:11:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=ozhkzRk3; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOIu032085; Wed, 24 May 2023 13:11:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684951884; bh=UTSaShfp35SQJi4vbOCDX5SIRpaMV7thKInHbgq6xy0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ozhkzRk3PWp7KbTTGEpfxH/Q2k5h0RfpwEIosTgn8diwOdzjgreiGftL0sN0NMU+F lX4eXsgWC++lwdt4Z6wU99mcdQuTcLgtJPo6CI+U9NFKUIu6YS/jlyEB6+1+jUiEwF JS051CUoT7VDOKr4oAwCTQqF1+cc6O8MMZa2nKfM= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34OIBO9R008290 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 May 2023 13:11:24 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 24 May 2023 13:11:24 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 24 May 2023 13:11:24 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34OIBOq6005029; Wed, 24 May 2023 13:11:24 -0500 From: To: , , , CC: , Randolph Sapp Subject: [arago][kirkstone][PATCH 7/7] weston-init: add a simple touchscreen calibration check Date: Wed, 24 May 2023 13:11:22 -0500 Message-ID: <20230524181122.35202-8-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524181122.35202-1-rs@ti.com> References: <20230524181122.35202-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 24 May 2023 18:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14463 From: Randolph Sapp The old touchscreen calibration script created a generic UDEV rule for all touch devices that applied the LIBINPUT_CALIBRATION_MATRIX of the last calibrated display. This attempts to replace that to an extent. This script executes at the start of Weston and if it detects a touch input device, uses Weston's built in touchscreen calibrator and touchscreen calibrator interface to apply the current calibration without restarting Weston. This script does not attempt to make these calibration values persistent. If a user wants calibration values to persist for all Weston users they should add the calibration to /etc/default/weston using the LIBINPUT_CALIBRATION_MATRIX variable themselves. The script will bypass calibration if it detects this variable is already set. Signed-off-by: Randolph Sapp --- .../recipes-graphics/wayland/weston-init.bbappend | 13 ++++++++++--- .../wayland/weston-init/weston-launch-calibrator.sh | 13 +++++++++++++ .../recipes-graphics/wayland/weston-init/weston.ini | 4 ++++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston-init/weston-launch-calibrator.sh diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend index a73b669d..4d5db58c 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend @@ -2,6 +2,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PR:append = ".arago12" -#SRC_URI:append = " \ -# file://weston.ini \ -#" +SRC_URI:append = " \ + file://weston.ini \ + file://weston-launch-calibrator.sh \ +" + +do_install:append() { + install -Dm755 weston-launch-calibrator.sh ${D}/${bindir}/weston-launch-calibrator +} + +FILES:${PN}:append = "${bindir}/weston-launch-calibrator" diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-launch-calibrator.sh b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-launch-calibrator.sh new file mode 100644 index 00000000..45863ecd --- /dev/null +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-launch-calibrator.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -e /dev/input/touchscreen0 ]; then + echo "Touch screen detected..." + if [ -n "$LIBINPUT_CALIBRATION_MATRIX" ]; then + echo "Calibration matrix already present, skipping calibration..." + else + echo "Calibrating touchscreen..." + exec weston-calibrator + fi +else + echo "Touch screen not detected, skipping calibration..." +fi diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini index 4cc2683a..b9610fa8 100644 --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston.ini @@ -11,6 +11,10 @@ startup-animation=fade [libinput] touchscreen_calibrator=true +[autolaunch] +# launch the calibrator on startup if a touchscreen is detected +path=/usr/bin/weston-launch-calibrator + [screensaver] # Uncomment path to disable screensaver #path=@libexecdir@/weston-screensaver